Merge pull request #184 from CommunityToolkit/revert-183-add-sources-arg

Revert "Add optional Scopes parameter to BaseProvider"
CommunityToolkit · Feb 15, 2022 · 15513b1 · 15513b1
2 parents 42f6b75 + bac18c5
commit 15513b1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/CommunityToolkit.Authentication.Msal/MsalProvider.cs b/CommunityToolkit.Authentication.Msal/MsalProvider.cs
@@ -171,10 +171,9 @@ public override async Task SignOutAsync()
  }
 
  /// <inheritdoc/>
- public override Task<string> GetTokenAsync(bool silentOnly = false, string[] scopes = null)
+ public override Task<string> GetTokenAsync(bool silentOnly = false)
  {
- var withScopes = scopes ?? this.Scopes;
- return this.GetTokenWithScopesAsync(withScopes, silentOnly);
+ return this.GetTokenWithScopesAsync(Scopes, silentOnly);
  }
 
  /// <summary>

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

diff --git a/CommunityToolkit.Authentication/BaseProvider.cs b/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, string[] scopes = null);
+ public abstract Task<string> GetTokenAsync(bool silentOnly = false);
 
  /// <inheritdoc />
  public abstract Task SignInAsync();

diff --git a/CommunityToolkit.Authentication/IProvider.cs b/CommunityToolkit.Authentication/IProvider.cs
@@ -39,9 +39,8 @@ 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, string[] scopes = null);
+ Task<string> GetTokenAsync(bool silentOnly = false);
 
  /// <summary>
  /// Sign in the user.

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