Updating wwwAuthenticateParsing to handle v2.0 (#4610)

trwalke · trwalke · web-flow · commit 8b4973936d6e · 2024-02-06T00:51:29.000-08:00
Co-authored-by: trwalke &lt;trwalke@microsoft.com&gt;
diff --git a/src/client/Microsoft.Identity.Client/WwwAuthenticateParameters.cs b/src/client/Microsoft.Identity.Client/WwwAuthenticateParameters.cs
@@ -420,14 +420,14 @@ internal static WwwAuthenticateParameters CreateWwwAuthenticateParameters(IDicti
 
             if (values.TryGetValue("authorization_uri", out string value))
             {
-                wwwAuthenticateParameters.Authority = value.Replace("/oauth2/authorize", string.Empty);
+                wwwAuthenticateParameters.Authority = value.Replace("/v2.0", string.Empty).Replace("/oauth2/authorize", string.Empty);
             }
 
             if (string.IsNullOrEmpty(wwwAuthenticateParameters.Authority))
             {
                 if (values.TryGetValue("authorization", out value))
                 {
-                    wwwAuthenticateParameters.Authority = value.Replace("/oauth2/authorize", string.Empty);
+                    wwwAuthenticateParameters.Authority = value.Replace("/v2.0", string.Empty).Replace("/oauth2/authorize", string.Empty);
                 }
             }
 
diff --git a/tests/Microsoft.Identity.Test.Unit/WwwAuthenticateParametersTests.cs b/tests/Microsoft.Identity.Test.Unit/WwwAuthenticateParametersTests.cs
@@ -44,6 +44,10 @@ public class WwwAuthenticateParametersTests
         [DataRow("client_id=00000003-0000-0000-c000-000000000000", "authority=\"https://login.microsoftonline.com/common\"")]
         [DataRow("resource_id=00000003-0000-0000-c000-000000000000", "authorization=\"https://login.microsoftonline.com/common/oauth2/authorize\"")]
         [DataRow("resource=00000003-0000-0000-c000-000000000000", "authorization=\"https://login.microsoftonline.com/common/oauth2/authorize\"")]
+        [DataRow("resource=00000003-0000-0000-c000-000000000000", "authorization_uri=\"https://login.microsoftonline.com/common/v2.0/oauth2/authorize\"")]
+        [DataRow("resource=00000003-0000-0000-c000-000000000000", "authorization_uri=\"https://login.microsoftonline.com/common/oauth2/v2.0/authorize\"")]
+        [DataRow("resource=00000003-0000-0000-c000-000000000000", "authorization=\"https://login.microsoftonline.com/common/v2.0/oauth2/authorize\"")]
+        [DataRow("resource=00000003-0000-0000-c000-000000000000", "authorization=\"https://login.microsoftonline.com/common/oauth2/v2.0/authorize\"")]
         public void CreateWwwAuthenticateResponse(string resource, string authorizationUri)
         {
             // Arrange

Original file line number	Diff line number	Diff line change
`@@ -420,14 +420,14 @@ internal static WwwAuthenticateParameters CreateWwwAuthenticateParameters(IDicti`
`420`	`420`
`421`	`421`	`if (values.TryGetValue("authorization_uri", out string value))`
`422`	`422`	`{`
`423`		`- wwwAuthenticateParameters.Authority = value.Replace("/oauth2/authorize", string.Empty);`
	`423`	`+ wwwAuthenticateParameters.Authority = value.Replace("/v2.0", string.Empty).Replace("/oauth2/authorize", string.Empty);`
`424`	`424`	`}`
`425`	`425`
`426`	`426`	`if (string.IsNullOrEmpty(wwwAuthenticateParameters.Authority))`
`427`	`427`	`{`
`428`	`428`	`if (values.TryGetValue("authorization", out value))`
`429`	`429`	`{`
`430`		`- wwwAuthenticateParameters.Authority = value.Replace("/oauth2/authorize", string.Empty);`
	`430`	`+ wwwAuthenticateParameters.Authority = value.Replace("/v2.0", string.Empty).Replace("/oauth2/authorize", string.Empty);`
`431`	`431`	`}`
`432`	`432`	`}`
`433`	`433`