Merge branch 'main' into patch-1

Author: nmetulev

CommunityToolkit.Authentication.Msal/MsalProvider.cs

@@ -171,9 +171,10 @@ public override async Task SignOutAsync()
         }
 
         /// <inheritdoc/>
-        public override Task<string> GetTokenAsync(bool silentOnly = false)
+        public override Task<string> GetTokenAsync(bool silentOnly = false, string[] scopes = null)
         {
-            return this.GetTokenWithScopesAsync(Scopes, silentOnly);
+            var withScopes = scopes ?? this.Scopes;
+            return this.GetTokenWithScopesAsync(withScopes, silentOnly);
         }
 
         /// <summary>

CommunityToolkit.Authentication.Uwp/WindowsProvider.cs

@@ -184,16 +184,17 @@ public override async Task SignOutAsync()
         }
 
         /// <inheritdoc />
-        public override async Task<string> GetTokenAsync(bool silentOnly = false)
+        public override async Task<string> GetTokenAsync(bool silentOnly = false, string[] scopes = null)
         {
             await SemaphoreSlim.WaitAsync();
 
             try
             {
-                var scopes = _scopes;
+                // use request specific scopes if not null, otherwise use class scopes
+                var authenticationScopes = scopes ?? this._scopes;
 
                 // Attempt to authenticate silently.
-                var authResult = await AuthenticateSilentAsync(scopes);
+                var authResult = await AuthenticateSilentAsync(authenticationScopes);
 
                 // Authenticate with user interaction as appropriate.
                 if (authResult?.ResponseStatus != WebTokenRequestStatus.Success)

CommunityToolkit.Authentication/BaseProvider.cs

@@ -52,7 +52,7 @@ public BaseProvider()
         public abstract Task AuthenticateRequestAsync(HttpRequestMessage request);
 
         /// <inheritdoc />
-        public abstract Task<string> GetTokenAsync(bool silentOnly = false);
+        public abstract Task<string> GetTokenAsync(bool silentOnly = false, string[] scopes = null);
 
         /// <inheritdoc />
         public abstract Task SignInAsync();

CommunityToolkit.Authentication/IProvider.cs

@@ -39,8 +39,9 @@ public interface IProvider
         /// Retrieve a token for the authenticated user.
         /// </summary>
         /// <param name="silentOnly">Determines if the acquisition should be done without prompts to the user.</param>
+        /// <param name="scopes"> Optional parameter for setting scopes specific to this token request. </param>
         /// <returns>A token string for the authenticated user.</returns>
-        Task<string> GetTokenAsync(bool silentOnly = false);
+        Task<string> GetTokenAsync(bool silentOnly = false, string[] scopes = null);
 
         /// <summary>
         /// Sign in the user.

CommunityToolkit.Authentication/MockProvider.cs

@@ -52,7 +52,7 @@ public override async Task AuthenticateRequestAsync(HttpRequestMessage request)
         }
 
         /// <inheritdoc/>
-        public override Task<string> GetTokenAsync(bool silentOnly = false)
+        public override Task<string> GetTokenAsync(bool silentOnly = false, string[] scopes = null)
         {
             return Task.FromResult("<mock-provider-token>");
         }