Skip to content

Added scopes parameter to IProvider.GetTokenAsync #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shweaver-MSFT merged 1 commit into from
Jun 11, 2021
Merged

Added scopes parameter to IProvider.GetTokenAsync #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions CommunityToolkit.Authentication.Msal/MsalProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,15 +119,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)
{
var tokenScopes = scopes ?? Scopes;

AuthenticationResult authResult = null;
try
{
var account = _account ?? (await Client.GetAccountsAsync()).FirstOrDefault();
if (account != null)
{
authResult = await Client.AcquireTokenSilent(Scopes, account).ExecuteAsync();
authResult = await Client.AcquireTokenSilent(tokenScopes, account).ExecuteAsync();
}
}
catch (MsalUiRequiredException)
Expand All @@ -143,7 +145,7 @@ public override async Task<string> GetTokenAsync(bool silentOnly = false)
{
try
{
authResult = await Client.AcquireTokenInteractive(Scopes).WithPrompt(Prompt.SelectAccount).ExecuteAsync();
authResult = await Client.AcquireTokenInteractive(tokenScopes).WithPrompt(Prompt.SelectAccount).ExecuteAsync();
}
catch
{
Expand Down
28 changes: 14 additions & 14 deletions CommunityToolkit.Authentication.Uwp/WindowsProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ 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)
{
var internetConnectionProfile = NetworkInformation.GetInternetConnectionProfile();
if (internetConnectionProfile == null)
Expand All @@ -181,8 +181,10 @@ public override async Task<string> GetTokenAsync(bool silentOnly = false)

try
{
var tokenScopes = scopes ?? _scopes;

// Attempt to authenticate silently.
var authResult = await AuthenticateSilentAsync();
var authResult = await AuthenticateSilentAsync(tokenScopes);

// Authenticate with user interaction as appropriate.
if (authResult?.ResponseStatus != WebTokenRequestStatus.Success)
Expand All @@ -194,7 +196,7 @@ public override async Task<string> GetTokenAsync(bool silentOnly = false)
}

// Attempt to authenticate interactively.
authResult = await AuthenticateInteractiveAsync();
authResult = await AuthenticateInteractiveAsync(tokenScopes);
}

if (authResult?.ResponseStatus == WebTokenRequestStatus.Success)
Expand Down Expand Up @@ -223,7 +225,6 @@ public override async Task<string> GetTokenAsync(bool silentOnly = false)
{
}

await SignOutAsync();
return null;
}

Expand Down Expand Up @@ -330,7 +331,7 @@ private async Task SetAccountAsync(WebAccount account)
State = ProviderState.SignedIn;
}

private async Task<WebTokenRequestResult> AuthenticateSilentAsync()
private async Task<WebTokenRequestResult> AuthenticateSilentAsync(string[] scopes)
{
try
{
Expand All @@ -351,7 +352,7 @@ private async Task<WebTokenRequestResult> AuthenticateSilentAsync()
if (account != null)
{
// Prepare a request to get a token.
var webTokenRequest = GetWebTokenRequest(account.WebAccountProvider);
var webTokenRequest = GetWebTokenRequest(account.WebAccountProvider, _webAccountProviderConfig.ClientId, scopes);
authResult = await WebAuthenticationCoreManager.GetTokenSilentlyAsync(webTokenRequest, account);
}

Expand All @@ -363,7 +364,7 @@ private async Task<WebTokenRequestResult> AuthenticateSilentAsync()
}
}

private async Task<WebTokenRequestResult> AuthenticateInteractiveAsync()
private async Task<WebTokenRequestResult> AuthenticateInteractiveAsync(string[] scopes)
{
try
{
Expand All @@ -374,14 +375,14 @@ private async Task<WebTokenRequestResult> AuthenticateInteractiveAsync()
{
// We already have the account.
var webAccountProvider = account.WebAccountProvider;
var webTokenRequest = GetWebTokenRequest(webAccountProvider);
var webTokenRequest = GetWebTokenRequest(webAccountProvider, _webAccountProviderConfig.ClientId, scopes);
authResult = await WebAuthenticationCoreManager.RequestTokenAsync(webTokenRequest, account);
}
else
{
// We don't have an account. Prompt the user to provide one.
var webAccountProvider = await ShowAccountSettingsPaneAndGetProviderAsync();
var webTokenRequest = GetWebTokenRequest(webAccountProvider);
var webTokenRequest = GetWebTokenRequest(webAccountProvider, _webAccountProviderConfig.ClientId, scopes);
authResult = await WebAuthenticationCoreManager.RequestTokenAsync(webTokenRequest);
}

Expand Down Expand Up @@ -498,14 +499,13 @@ async void OnAccountCommandsRequested(AccountsSettingsPane sender, AccountsSetti
}
}

private WebTokenRequest GetWebTokenRequest(WebAccountProvider provider)
private WebTokenRequest GetWebTokenRequest(WebAccountProvider provider, string clientId, string[] scopes)
{
string clientId = _webAccountProviderConfig.ClientId;
string scopes = string.Join(',', _scopes);
string scopesString = string.Join(',', scopes);

WebTokenRequest webTokenRequest = clientId != null
? new WebTokenRequest(provider, scopes, clientId)
: new WebTokenRequest(provider, scopes);
? new WebTokenRequest(provider, scopesString, clientId)
: new WebTokenRequest(provider, scopesString);

webTokenRequest.Properties.Add(GraphResourcePropertyKey, GraphResourcePropertyValue);

Expand Down
4 changes: 2 additions & 2 deletions CommunityToolkit.Authentication/BaseProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ public BaseProvider()
/// <inheritdoc />
public abstract Task AuthenticateRequestAsync(HttpRequestMessage request);

/// <inheritdoc/>
public abstract Task<string> GetTokenAsync(bool silentOnly = false);
/// <inheritdoc />
public abstract Task<string> GetTokenAsync(bool silentOnly = false, string[] scopes = null);

/// <inheritdoc />
public abstract Task SignInAsync();
Expand Down
3 changes: 2 additions & 1 deletion CommunityToolkit.Authentication/IProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">Additional scopes to request access for.</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.
Expand Down
2 changes: 1 addition & 1 deletion CommunityToolkit.Authentication/MockProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public override 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>");
}
Expand Down