Skip to content
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

fix: restore provided msal public client behavior #1931

Merged
merged 1 commit into from
Nov 4, 2022
Merged

fix: restore provided msal public client behavior #1931

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
10 changes: 9 additions & 1 deletion packages/mgt-element/src/providers/IProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,22 @@ export abstract class IProvider implements AuthenticationProvider {
*/
public graph: IGraph;

/**
* Specifies if the provider has enabled support for multiple accounts
*
* @protected
* @type {boolean}
* @memberof IProvider
*/
protected isMultipleAccountDisabled: boolean = true;

/**
* Specifies if Multi account functionality is supported by the provider and enabled.
*
* @readonly
* @type {boolean}
* @memberof IProvider
*/
protected isMultipleAccountDisabled: boolean = true;
public get isMultiAccountSupportedAndEnabled(): boolean {
return false;
}
Expand Down
66 changes: 38 additions & 28 deletions packages/providers/mgt-msal2-provider/src/Msal2Provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,13 @@ export interface Msal2PublicClientApplicationConfig extends Msal2ConfigBase {
* @export
* @enum {number}
*/
// tslint:disable: completed-docs
export enum PromptType {
SELECT_ACCOUNT = 'select_account',
LOGIN = 'login',
CONSENT = 'consent'
}
// tslint:enable: completed-docs

/**
* MSAL2Provider using msal-browser to acquire tokens for authentication
Expand Down Expand Up @@ -223,6 +225,7 @@ export class Msal2Provider extends IProvider {
* @type {Configuration}
* @memberof Msal2Provider
*/
// tslint:disable-next-line: variable-name
private ms_config: Configuration;

/**
Expand Down Expand Up @@ -255,14 +258,37 @@ export class Msal2Provider extends IProvider {
public scopes: string[];

/**
*
* Enables multi account functionality if true, disables if false
*
* @private
* @type {boolean}
* @memberof Msal2Provider
*/
public isMultipleAccountEnabled: boolean = true;

/**
* Indicates if multi account functionality is disabled
*
* @protected
* @type {boolean}
* @memberof Msal2Provider
*/
protected get isMultiAccountDisabled(): boolean {
return !this.isMultipleAccountEnabled;
}

/**
* Disables or enables multi account functionality
* Uses isMultipleAccountEnabled as the backing property
* Property provided to ensure adherence to the IProvider interface
*
* @protected
* @memberof Msal2Provider
*/
protected set isMultiAccountDisabled(value: boolean) {
this.isMultipleAccountEnabled = !value;
}

/**
* Specifies if Multi account functionality is supported by the provider and enabled.
*
Expand Down Expand Up @@ -319,27 +345,11 @@ export class Msal2Provider extends IProvider {
} else {
throw new Error('clientId must be provided');
}
this.ms_config.system = msalConfig.system || {};
this.ms_config.system.iframeHashTimeout = msalConfig.system.iframeHashTimeout || 10000;
this._loginType = typeof config.loginType !== 'undefined' ? config.loginType : LoginType.Redirect;
this._loginHint = typeof config.loginHint !== 'undefined' ? config.loginHint : null;
this._sid = typeof config.sid !== 'undefined' ? config.sid : null;
this._domainHint = typeof config.domainHint !== 'undefined' ? config.domainHint : null;
this.scopes = typeof config.scopes !== 'undefined' ? config.scopes : ['user.read'];
this._publicClientApplication = new PublicClientApplication(this.ms_config);
this._prompt = typeof config.prompt !== 'undefined' ? config.prompt : PromptType.SELECT_ACCOUNT;
this.isMultipleAccountDisabled =
typeof config.isMultiAccountDisabled !== 'undefined' ? config.isMultiAccountDisabled : false;
this.graph = createFromProvider(this);
try {
const tokenResponse = await this._publicClientApplication.handleRedirectPromise();
if (tokenResponse !== null) {
this.handleResponse(tokenResponse?.account);
} else {
this.trySilentSignIn();
}
} catch (e) {
throw e;
} else if ('publicClientApplication' in config) {
if (config.publicClientApplication) {
this._publicClientApplication = config.publicClientApplication;
} else {
throw new Error('publicClientApplication must be provided');
}
} else {
throw new Error('either clientId or publicClientApplication must be provided');
Expand Down Expand Up @@ -379,7 +389,7 @@ export class Msal2Provider extends IProvider {
* @memberof Msal2Provider
*/
public async trySilentSignIn() {
let silentRequest: any = {
const silentRequest: any = {
scopes: this.scopes,
domainHint: this._domainHint
};
Expand Down Expand Up @@ -420,7 +430,7 @@ export class Msal2Provider extends IProvider {
prompt: this._prompt,
domainHint: this._domainHint
};
if (this._loginType == LoginType.Popup) {
if (this._loginType === LoginType.Popup) {
const response = await this._publicClientApplication.loginPopup(loginRequest);
this.handleResponse(response?.account);
} else {
Expand All @@ -436,7 +446,7 @@ export class Msal2Provider extends IProvider {
* @memberof Msal2Provider
*/
public getAllAccounts() {
let usernames = [];
const usernames = [];
this._publicClientApplication.getAllAccounts().forEach((account: AccountInfo) => {
usernames.push({ name: account.name, mail: account.username, id: account.homeAccountId } as IProviderAccount);
});
Expand Down Expand Up @@ -636,12 +646,12 @@ export class Msal2Provider extends IProvider {
account: logOutAccount
};
this.clearStoredAccount();
if (this._loginType == LoginType.Redirect) {
if (this._loginType === LoginType.Redirect) {
this._publicClientApplication.logoutRedirect(logOutRequest);
this.setState(ProviderState.SignedOut);
} else {
await this._publicClientApplication.logoutPopup({ ...logOutRequest });
if (this._publicClientApplication.getAllAccounts.length == 1 || !this.isMultipleAccountEnabled) {
if (this._publicClientApplication.getAllAccounts.length === 1 || !this.isMultipleAccountEnabled) {
this.setState(ProviderState.SignedOut);
} else {
this.trySilentSignIn();
Expand All @@ -659,7 +669,7 @@ export class Msal2Provider extends IProvider {
public async getAccessToken(options?: AuthenticationProviderOptions): Promise<string> {
const scopes = options ? options.scopes || this.scopes : this.scopes;
const accessTokenRequest: SilentRequest = {
scopes: scopes,
scopes,
account: this.getAccount()
};
try {
Expand Down