Throw on duplicate parameter

martincostello · martincostello · commit dafdb7078360 · 2024-03-22T12:41:26.000Z
Copy the pattern from `OAuthHandler.BuildChallengeUrl()`. See https://github.com/dotnet/aspnetcore/blob/ec293ee75c0c022370951a459b188fa81ec8b7c3/src/Security/Authentication/OAuth/src/OAuthHandler.cs#L331-L334.
diff --git a/src/AspNet.Security.OAuth.Alipay/AlipayAuthenticationHandler.cs b/src/AspNet.Security.OAuth.Alipay/AlipayAuthenticationHandler.cs
@@ -214,12 +214,9 @@ protected override string BuildChallengeUrl([NotNull] AuthenticationProperties p
             ["redirect_uri"] = redirectUri,
         };
 
-        if (Options.AdditionalAuthorizationParameters.Count > 0)
+        foreach (var additionalParameter in Options.AdditionalAuthorizationParameters)
         {
-            foreach (var parameter in Options.AdditionalAuthorizationParameters)
-            {
-                parameters[parameter.Key] = parameter.Value;
-            }
+            parameters.Add(additionalParameter.Key, additionalParameter.Value);
         }
 
         if (Options.UsePkce)
diff --git a/src/AspNet.Security.OAuth.Deezer/DeezerAuthenticationHandler.cs b/src/AspNet.Security.OAuth.Deezer/DeezerAuthenticationHandler.cs
@@ -98,12 +98,9 @@ protected override string BuildChallengeUrl([NotNull] AuthenticationProperties p
             ["perms"] = scopes,
         };
 
-        if (Options.AdditionalAuthorizationParameters.Count > 0)
+        foreach (var additionalParameter in Options.AdditionalAuthorizationParameters)
         {
-            foreach (var parameter in Options.AdditionalAuthorizationParameters)
-            {
-                parameters[parameter.Key] = parameter.Value;
-            }
+            parameters.Add(additionalParameter.Key, additionalParameter.Value);
         }
 
         if (Options.UsePkce)
diff --git a/src/AspNet.Security.OAuth.Line/LineAuthenticationHandler.cs b/src/AspNet.Security.OAuth.Line/LineAuthenticationHandler.cs
@@ -42,12 +42,9 @@ protected override async Task<OAuthTokenResponse> ExchangeCodeAsync([NotNull] OA
             ["client_secret"] = Options.ClientSecret,
         };
 
-        if (Options.AdditionalAuthorizationParameters.Count > 0)
+        foreach (var additionalParameter in Options.AdditionalAuthorizationParameters)
         {
-            foreach (var parameter in Options.AdditionalAuthorizationParameters)
-            {
-                tokenRequestParameters[parameter.Key] = parameter.Value;
-            }
+            tokenRequestParameters.Add(additionalParameter.Key, additionalParameter.Value);
         }
 
         // PKCE https://tools.ietf.org/html/rfc7636#section-4.5, see BuildChallengeUrl
diff --git a/src/AspNet.Security.OAuth.Mixcloud/MixcloudAuthenticationHandler.cs b/src/AspNet.Security.OAuth.Mixcloud/MixcloudAuthenticationHandler.cs
@@ -38,12 +38,9 @@ protected override string BuildChallengeUrl([NotNull] AuthenticationProperties p
             ["response_type"] = "code",
         };
 
-        if (Options.AdditionalAuthorizationParameters.Count > 0)
+        foreach (var additionalParameter in Options.AdditionalAuthorizationParameters)
         {
-            foreach (var parameter in Options.AdditionalAuthorizationParameters)
-            {
-                parameters[parameter.Key] = parameter.Value;
-            }
+            parameters.Add(additionalParameter.Key, additionalParameter.Value);
         }
 
         if (Options.UsePkce)
diff --git a/src/AspNet.Security.OAuth.Shopify/ShopifyAuthenticationHandler.cs b/src/AspNet.Security.OAuth.Shopify/ShopifyAuthenticationHandler.cs
@@ -116,12 +116,9 @@ protected override string BuildChallengeUrl([NotNull] AuthenticationProperties p
             ["redirect_uri"] = redirectUri,
         };
 
-        if (Options.AdditionalAuthorizationParameters.Count > 0)
+        foreach (var additionalParameter in Options.AdditionalAuthorizationParameters)
         {
-            foreach (var parameter in Options.AdditionalAuthorizationParameters)
-            {
-                parameters[parameter.Key] = parameter.Value;
-            }
+            parameters.Add(additionalParameter.Key, additionalParameter.Value);
         }
 
         if (Options.UsePkce)
diff --git a/src/AspNet.Security.OAuth.Weixin/WeixinAuthenticationHandler.cs b/src/AspNet.Security.OAuth.Weixin/WeixinAuthenticationHandler.cs
@@ -134,12 +134,9 @@ protected override string BuildChallengeUrl([NotNull] AuthenticationProperties p
             ["response_type"] = "code",
         };
 
-        if (Options.AdditionalAuthorizationParameters.Count > 0)
+        foreach (var additionalParameter in Options.AdditionalAuthorizationParameters)
         {
-            foreach (var parameter in Options.AdditionalAuthorizationParameters)
-            {
-                parameters[parameter.Key] = parameter.Value;
-            }
+            parameters.Add(additionalParameter.Key, additionalParameter.Value);
         }
 
         if (Options.UsePkce)
diff --git a/src/AspNet.Security.OAuth.WorkWeixin/WorkWeixinAuthenticationHandler.cs b/src/AspNet.Security.OAuth.WorkWeixin/WorkWeixinAuthenticationHandler.cs
@@ -110,12 +110,9 @@ protected override string BuildChallengeUrl([NotNull] AuthenticationProperties p
             ["redirect_uri"] = redirectUri,
         };
 
-        if (Options.AdditionalAuthorizationParameters.Count > 0)
+        foreach (var additionalParameter in Options.AdditionalAuthorizationParameters)
         {
-            foreach (var parameter in Options.AdditionalAuthorizationParameters)
-            {
-                parameters[parameter.Key] = parameter.Value;
-            }
+            parameters.Add(additionalParameter.Key, additionalParameter.Value);
         }
 
         if (Options.UsePkce)

Original file line number	Diff line number	Diff line change
`@@ -214,12 +214,9 @@ protected override string BuildChallengeUrl([NotNull] AuthenticationProperties p`
`214`	`214`	`["redirect_uri"] = redirectUri,`
`215`	`215`	`};`
`216`	`216`
`217`		`- if (Options.AdditionalAuthorizationParameters.Count > 0)`
	`217`	`+ foreach (var additionalParameter in Options.AdditionalAuthorizationParameters)`
`218`	`218`	`{`
`219`		`- foreach (var parameter in Options.AdditionalAuthorizationParameters)`
`220`		`- {`
`221`		`- parameters[parameter.Key] = parameter.Value;`
`222`		`- }`
	`219`	`+ parameters.Add(additionalParameter.Key, additionalParameter.Value);`
`223`	`220`	`}`
`224`	`221`
`225`	`222`	`if (Options.UsePkce)`
Original file line number	Diff line number	Diff line change
`@@ -98,12 +98,9 @@ protected override string BuildChallengeUrl([NotNull] AuthenticationProperties p`
`98`	`98`	`["perms"] = scopes,`
`99`	`99`	`};`
`100`	`100`
`101`		`- if (Options.AdditionalAuthorizationParameters.Count > 0)`
	`101`	`+ foreach (var additionalParameter in Options.AdditionalAuthorizationParameters)`
`102`	`102`	`{`
`103`		`- foreach (var parameter in Options.AdditionalAuthorizationParameters)`
`104`		`- {`
`105`		`- parameters[parameter.Key] = parameter.Value;`
`106`		`- }`
	`103`	`+ parameters.Add(additionalParameter.Key, additionalParameter.Value);`
`107`	`104`	`}`
`108`	`105`
`109`	`106`	`if (Options.UsePkce)`
Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,9 @@ protected override async Task<OAuthTokenResponse> ExchangeCodeAsync([NotNull] OA`
`42`	`42`	`["client_secret"] = Options.ClientSecret,`
`43`	`43`	`};`
`44`	`44`
`45`		`- if (Options.AdditionalAuthorizationParameters.Count > 0)`
	`45`	`+ foreach (var additionalParameter in Options.AdditionalAuthorizationParameters)`
`46`	`46`	`{`
`47`		`- foreach (var parameter in Options.AdditionalAuthorizationParameters)`
`48`		`- {`
`49`		`- tokenRequestParameters[parameter.Key] = parameter.Value;`
`50`		`- }`
	`47`	`+ tokenRequestParameters.Add(additionalParameter.Key, additionalParameter.Value);`
`51`	`48`	`}`
`52`	`49`
`53`	`50`	`// PKCE https://tools.ietf.org/html/rfc7636#section-4.5, see BuildChallengeUrl`
Original file line number	Diff line number	Diff line change
`@@ -38,12 +38,9 @@ protected override string BuildChallengeUrl([NotNull] AuthenticationProperties p`
`38`	`38`	`["response_type"] = "code",`
`39`	`39`	`};`
`40`	`40`
`41`		`- if (Options.AdditionalAuthorizationParameters.Count > 0)`
	`41`	`+ foreach (var additionalParameter in Options.AdditionalAuthorizationParameters)`
`42`	`42`	`{`
`43`		`- foreach (var parameter in Options.AdditionalAuthorizationParameters)`
`44`		`- {`
`45`		`- parameters[parameter.Key] = parameter.Value;`
`46`		`- }`
	`43`	`+ parameters.Add(additionalParameter.Key, additionalParameter.Value);`
`47`	`44`	`}`
`48`	`45`
`49`	`46`	`if (Options.UsePkce)`
Original file line number	Diff line number	Diff line change
`@@ -116,12 +116,9 @@ protected override string BuildChallengeUrl([NotNull] AuthenticationProperties p`
`116`	`116`	`["redirect_uri"] = redirectUri,`
`117`	`117`	`};`
`118`	`118`
`119`		`- if (Options.AdditionalAuthorizationParameters.Count > 0)`
	`119`	`+ foreach (var additionalParameter in Options.AdditionalAuthorizationParameters)`
`120`	`120`	`{`
`121`		`- foreach (var parameter in Options.AdditionalAuthorizationParameters)`
`122`		`- {`
`123`		`- parameters[parameter.Key] = parameter.Value;`
`124`		`- }`
	`121`	`+ parameters.Add(additionalParameter.Key, additionalParameter.Value);`
`125`	`122`	`}`
`126`	`123`
`127`	`124`	`if (Options.UsePkce)`
Original file line number	Diff line number	Diff line change
`@@ -134,12 +134,9 @@ protected override string BuildChallengeUrl([NotNull] AuthenticationProperties p`
`134`	`134`	`["response_type"] = "code",`
`135`	`135`	`};`
`136`	`136`
`137`		`- if (Options.AdditionalAuthorizationParameters.Count > 0)`
	`137`	`+ foreach (var additionalParameter in Options.AdditionalAuthorizationParameters)`
`138`	`138`	`{`
`139`		`- foreach (var parameter in Options.AdditionalAuthorizationParameters)`
`140`		`- {`
`141`		`- parameters[parameter.Key] = parameter.Value;`
`142`		`- }`
	`139`	`+ parameters.Add(additionalParameter.Key, additionalParameter.Value);`
`143`	`140`	`}`
`144`	`141`
`145`	`142`	`if (Options.UsePkce)`
Original file line number	Diff line number	Diff line change
`@@ -110,12 +110,9 @@ protected override string BuildChallengeUrl([NotNull] AuthenticationProperties p`
`110`	`110`	`["redirect_uri"] = redirectUri,`
`111`	`111`	`};`
`112`	`112`
`113`		`- if (Options.AdditionalAuthorizationParameters.Count > 0)`
	`113`	`+ foreach (var additionalParameter in Options.AdditionalAuthorizationParameters)`
`114`	`114`	`{`
`115`		`- foreach (var parameter in Options.AdditionalAuthorizationParameters)`
`116`		`- {`
`117`		`- parameters[parameter.Key] = parameter.Value;`
`118`		`- }`
	`115`	`+ parameters.Add(additionalParameter.Key, additionalParameter.Value);`
`119`	`116`	`}`
`120`	`117`
`121`	`118`	`if (Options.UsePkce)`