Merge branch 'master' into jmprieur/removingUis

# Conflicts:
#	Microsoft.Identity.Web/AuthorizeForScopesAttribute.cs

Author: Tiago Brenck

Microsoft.Identity.Web/AuthorizeForScopesAttribute.cs

@@ -46,6 +46,7 @@ public class AuthorizeForScopesAttribute : ExceptionFilterAttribute
         public override void OnException(ExceptionContext context)
         {
             MsalUiRequiredException msalUiRequiredException = context.Exception as MsalUiRequiredException;
+
             if (msalUiRequiredException == null)
             {
                 msalUiRequiredException = context.Exception?.InnerException as MsalUiRequiredException;
@@ -55,6 +56,9 @@ public override void OnException(ExceptionContext context)
             {
                 if (CanBeSolvedByReSignInOfUser(msalUiRequiredException))
                 {
+                    // Do not re-use the attribute param Scopes. For more info: https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/issues/273
+                    string[] scopes = null;
+
                     // the users cannot provide both scopes and ScopeKeySection at the same time
                     if (!string.IsNullOrWhiteSpace(ScopeKeySection) && Scopes != null && Scopes.Length > 0)
                     {
@@ -72,10 +76,13 @@ public override void OnException(ExceptionContext context)
                             throw new InvalidOperationException($"The {nameof(ScopeKeySection)} is provided but the IConfiguration instance is not present in the services collection");
                         }
 
-                        Scopes = new string[] { configuration.GetValue<string>(ScopeKeySection) };
+                        scopes = new string[] { configuration.GetValue<string>(ScopeKeySection) };
                     }
 
-                    var properties = BuildAuthenticationPropertiesForIncrementalConsent(Scopes, msalUiRequiredException, context.HttpContext);
+                    else
+                        scopes = Scopes;
+
+                    var properties = BuildAuthenticationPropertiesForIncrementalConsent(scopes, msalUiRequiredException, context.HttpContext);
                     context.Result = new ChallengeResult(properties);
                 }
             }
@@ -91,7 +98,7 @@ private bool CanBeSolvedByReSignInOfUser(MsalUiRequiredException ex)
             // InMemoryCache, the cache could be empty if the server was restarted. This is why
             // the null_user exception is thrown.
 
-            return ex.ErrorCode.ContainsAny(new [] { MsalError.UserNullError, MsalError.InvalidGrantError });
+            return ex.ErrorCode.ContainsAny(new[] { MsalError.UserNullError, MsalError.InvalidGrantError });
         }
 
         /// <summary>
@@ -102,16 +109,16 @@ private bool CanBeSolvedByReSignInOfUser(MsalUiRequiredException ex)
         /// <param name="context">current http context in the pipeline</param>
         /// <returns>AuthenticationProperties</returns>
         private AuthenticationProperties BuildAuthenticationPropertiesForIncrementalConsent(
-            string[] scopes, 
-            MsalUiRequiredException ex, 
+            string[] scopes,
+            MsalUiRequiredException ex,
             HttpContext context)
         {
             var properties = new AuthenticationProperties();
 
             // Set the scopes, including the scopes that ADAL.NET / MSAL.NET need for the token cache
             string[] additionalBuiltInScopes =
-                {OidcConstants.ScopeOpenId, 
-                OidcConstants.ScopeOfflineAccess, 
+                {OidcConstants.ScopeOpenId,
+                OidcConstants.ScopeOfflineAccess,
                 OidcConstants.ScopeProfile};
             properties.SetParameter<ICollection<string>>(OpenIdConnectParameterNames.Scope,
                                                          scopes.Union(additionalBuiltInScopes).ToList());

Microsoft.Identity.Web/Microsoft.Identity.Web.csproj

@@ -56,6 +56,6 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.1" />
-    <PackageReference Include="Microsoft.Identity.Client" Version="4.8.0" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="4.8.1" />
   </ItemGroup>
 </Project>