huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Blazor][Wasm] Expose login mode option for AAD and AAD B2C Authentication (#23694) 

* Adds a login mode option via MSAL provider options and updates the AuthenticationService.ts to use the new setting
This commit is contained in:
Chris Sainty 2020-07-08 12:26:33 +01:00 committed by GitHub
parent 37a4457150
commit b8c5193562
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Components/WebAssembly/Authentication.Msal/src/Interop/AuthenticationService.ts
View File

@ -47,7 +47,8 @@ interface AuthorizeService {
interface AuthorizeServiceConfiguration extends Msal.Configuration { interface AuthorizeServiceConfiguration extends Msal.Configuration {
defaultAccessTokenScopes: string[]; defaultAccessTokenScopes: string[];
additionalScopesToConsent: string[] additionalScopesToConsent: string[];
loginMode: string;
} }
class MsalAuthorizeService implements AuthorizeService { class MsalAuthorizeService implements AuthorizeService {
@ -142,18 +143,26 @@ class MsalAuthorizeService implements AuthorizeService {
} }
async signInCore(request: Msal.AuthenticationParameters): Promise<Msal.AuthResponse | Msal.AuthError | undefined> { async signInCore(request: Msal.AuthenticationParameters): Promise<Msal.AuthResponse | Msal.AuthError | undefined> {
try { if (this._settings.loginMode.toLowerCase() === "redirect") {
return await this._msalApplication.loginPopup(request); try {
} catch (e) { this._msalApplication.loginRedirect(request);
// If the user explicitly cancelled the pop-up, avoid performing a redirect. } catch (e) {
if (this.isMsalError(e) && e.errorCode !== ClientAuthErrorMessage.userCancelledError.code) { return e;
try { }
this._msalApplication.loginRedirect(request); } else {
} catch (e) { try {
return await this._msalApplication.loginPopup(request);
} catch (e) {
// If the user explicitly cancelled the pop-up, avoid performing a redirect.
if (this.isMsalError(e) && e.errorCode !== ClientAuthErrorMessage.userCancelledError.code) {
try {
this._msalApplication.loginRedirect(request);
} catch (e) {
return e;
}
} else {
return e; return e;
} }
} else {
return e;
} }
} }
} }

7
src/Components/WebAssembly/Authentication.Msal/src/Models/MsalProviderOptions.cs
View File

@ -14,7 +14,7 @@ namespace Microsoft.Authentication.WebAssembly.Msal.Models
/// <summary> /// <summary>
/// Gets or sets the <see cref="MsalAuthenticationOptions"/> to use for authentication operations. /// Gets or sets the <see cref="MsalAuthenticationOptions"/> to use for authentication operations.
/// </summary> /// </summary>
[JsonPropertyName("auth")] [JsonPropertyName("auth")]
public MsalAuthenticationOptions Authentication { get; set; } = new MsalAuthenticationOptions public MsalAuthenticationOptions Authentication { get; set; } = new MsalAuthenticationOptions
{ {
RedirectUri = "authentication/login-callback", RedirectUri = "authentication/login-callback",
@ -43,5 +43,10 @@ namespace Microsoft.Authentication.WebAssembly.Msal.Models
/// Use this parameter to request consent for scopes for other resources. /// Use this parameter to request consent for scopes for other resources.
/// </remarks> /// </remarks>
public IList<string> AdditionalScopesToConsent { get; set; } = new List<string>(); public IList<string> AdditionalScopesToConsent { get; set; } = new List<string>();
/// <summary>
/// Gets or sets the login mode that is used when initiating the sign-in flow.
/// </summary>
public string LoginMode { get; set; } = "popup";
} }
} }