@azure/msal-angular 5.3.1 → 6.0.1

package/README.md

@@ -34,6 +34,7 @@ The current `@azure/msal-angular` library improves upon the previous version and
 
 ## Guides
 
+- [Upgrade Guide (v5-v6)](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-angular/docs/v5-v6-upgrade-guide.md)
 - [Upgrade Guide (v4-v5)](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-angular/docs/v4-v5-upgrade-guide.md)
 - [Upgrade Guide (v3-v4)](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-angular/docs/v3-v4-upgrade-guide.md)
 - [Upgrade Guide (v2-v3)](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-angular/docs/v2-v3-upgrade-guide.md)
@@ -47,7 +48,8 @@ At a minimum, `@azure/msal-angular` will follow the [support schedule of the mai
 
 | MSAL Angular version | MSAL support status | Supported Angular versions |
 | -------------------- | ------------------- | -------------------------- |
-| MSAL Angular v5      | Active development  | 19, 20, 21                 |
+| MSAL Angular v6      | Active development  | 22                         |
+| MSAL Angular v5      | In maintenance      | 19, 20, 21                 |
 | MSAL Angular v4      | In maintenance      | 15, 16, 17, 18, 19, 20     |
 | MSAL Angular v3      | In maintenance      | 15, 16, 17, 18             |
 | MSAL Angular v2      | In maintenance      | 9, 10, 11, 12, 13, 14      |

package/fesm2022/azure-msal-angular.mjs

@@ -9,7 +9,7 @@ import * as i4 from '@angular/router';
 
 /* eslint-disable header/header */
 const name = "@azure/msal-angular";
-const version = "5.3.1";
+const version = "6.0.1";
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -25,8 +25,9 @@ const MSAL_BROADCAST_CONFIG = new InjectionToken("MSAL_BROADCAST_CONFIG");
  * Licensed under the MIT License.
  */
 class MsalBroadcastService {
-    constructor(msalInstance, msalBroadcastConfig) {
+    constructor(msalInstance, ngZone, msalBroadcastConfig) {
         this.msalInstance = msalInstance;
+        this.ngZone = ngZone;
         this.msalBroadcastConfig = msalBroadcastConfig;
         // Make _msalSubject a ReplaySubject if configured to replay past events
         if (this.msalBroadcastConfig &&
@@ -46,15 +47,17 @@ class MsalBroadcastService {
         this._inProgress = new BehaviorSubject(InteractionStatus.Startup);
         this.inProgress$ = this._inProgress.asObservable();
         this.msalInstance.addEventCallback((message) => {
-            this._msalSubject.next(message);
-            const status = EventMessageUtils.getInteractionStatusFromEvent(message, this._inProgress.value);
-            if (status !== null) {
-                this.msalInstance
-                    .getLogger()
-                    .clone(name, version)
-                    .verbose(`BroadcastService - ${message.eventType} results in setting inProgress from ${this._inProgress.value} to ${status}`, "");
-                this._inProgress.next(status);
-            }
+            this.ngZone.run(() => {
+                this._msalSubject.next(message);
+                const status = EventMessageUtils.getInteractionStatusFromEvent(message, this._inProgress.value);
+                if (status !== null) {
+                    this.msalInstance
+                        .getLogger()
+                        .clone(name, version)
+                        .verbose(`BroadcastService - ${message.eventType} results in setting inProgress from ${this._inProgress.value} to ${status}`, "");
+                    this._inProgress.next(status);
+                }
+            });
         });
     }
     /**
@@ -65,15 +68,15 @@ class MsalBroadcastService {
             this._inProgress.next(InteractionStatus.None);
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: MsalBroadcastService, deps: [{ token: MSAL_INSTANCE }, { token: MSAL_BROADCAST_CONFIG, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: MsalBroadcastService }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.2", ngImport: i0, type: MsalBroadcastService, deps: [{ token: MSAL_INSTANCE }, { token: i0.NgZone }, { token: MSAL_BROADCAST_CONFIG, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "22.0.2", ngImport: i0, type: MsalBroadcastService }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: MsalBroadcastService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.2", ngImport: i0, type: MsalBroadcastService, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [MSAL_INSTANCE]
-                }] }, { type: undefined, decorators: [{
+                }] }, { type: i0.NgZone }, { type: undefined, decorators: [{
                     type: Optional
                 }, {
                     type: Inject,
@@ -98,14 +101,20 @@ class MsalService {
     initialize() {
         return from(this.instance.initialize());
     }
+    /**
+     * Ensures the PublicClientApplication has been initialized.
+     */
+    withInitialize(call) {
+        return from(this.instance.initialize().then(() => call()));
+    }
     acquireTokenPopup(request) {
-        return from(this.instance.acquireTokenPopup(request));
+        return this.withInitialize(() => this.instance.acquireTokenPopup(request));
     }
     acquireTokenRedirect(request) {
-        return from(this.instance.acquireTokenRedirect(request));
+        return this.withInitialize(() => this.instance.acquireTokenRedirect(request));
     }
     acquireTokenSilent(silentRequest) {
-        return from(this.instance.acquireTokenSilent(silentRequest));
+        return this.withInitialize(() => this.instance.acquireTokenSilent(silentRequest));
     }
     handleRedirectObservable(hashOrOptions) {
         // Support both legacy string parameter (hash) and new options object
@@ -127,19 +136,19 @@ class MsalService {
         }));
     }
     loginPopup(request) {
-        return from(this.instance.loginPopup(request));
+        return this.withInitialize(() => this.instance.loginPopup(request));
     }
     loginRedirect(request) {
-        return from(this.instance.loginRedirect(request));
+        return this.withInitialize(() => this.instance.loginRedirect(request));
     }
     logoutRedirect(logoutRequest) {
-        return from(this.instance.logoutRedirect(logoutRequest));
+        return this.withInitialize(() => this.instance.logoutRedirect(logoutRequest));
     }
     logoutPopup(logoutRequest) {
-        return from(this.instance.logoutPopup(logoutRequest));
+        return this.withInitialize(() => this.instance.logoutPopup(logoutRequest));
     }
     ssoSilent(request) {
-        return from(this.instance.ssoSilent(request));
+        return this.withInitialize(() => this.instance.ssoSilent(request));
     }
     /**
      * Gets logger for msal-angular.
@@ -156,10 +165,10 @@ class MsalService {
         this.logger = logger.clone(name, version);
         this.instance.setLogger(logger);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: MsalService, deps: [{ token: MSAL_INSTANCE }, { token: i3.Location }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: MsalService }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.2", ngImport: i0, type: MsalService, deps: [{ token: MSAL_INSTANCE }, { token: i3.Location }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "22.0.2", ngImport: i0, type: MsalService }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: MsalService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.2", ngImport: i0, type: MsalService, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: undefined, decorators: [{
                     type: Inject,
@@ -223,18 +232,18 @@ class MsalGuard {
         if (this.msalGuardConfig.interactionType === InteractionType.Popup) {
             this.authService
                 .getLogger()
-                .verbose("Guard - logging in by popup", authRequest.correlationId);
+                .verbose("Guard - logging in by popup", authRequest.correlationId ?? "");
             return this.authService.loginPopup(authRequest).pipe(map((response) => {
                 this.authService
                     .getLogger()
-                    .verbose("Guard - login by popup successful, can activate, setting active account", authRequest.correlationId);
+                    .verbose("Guard - login by popup successful, can activate, setting active account", authRequest.correlationId ?? "");
                 this.authService.instance.setActiveAccount(response.account);
                 return true;
             }));
         }
         this.authService
             .getLogger()
-            .verbose("Guard - logging in by redirect", authRequest.correlationId);
+            .verbose("Guard - logging in by redirect", authRequest.correlationId ?? "");
         const redirectStartPage = this.getDestinationUrl(state.url);
         return this.authService
             .loginRedirect({
@@ -371,10 +380,10 @@ class MsalGuard {
         this.authService.getLogger().verbose("Guard - canLoad", "");
         return this.activateHelper();
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: MsalGuard, deps: [{ token: MSAL_GUARD_CONFIG }, { token: MsalBroadcastService }, { token: MsalService }, { token: i3.Location }, { token: i4.Router }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: MsalGuard }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.2", ngImport: i0, type: MsalGuard, deps: [{ token: MSAL_GUARD_CONFIG }, { token: MsalBroadcastService }, { token: MsalService }, { token: i3.Location }, { token: i4.Router }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "22.0.2", ngImport: i0, type: MsalGuard }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: MsalGuard, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.2", ngImport: i0, type: MsalGuard, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: undefined, decorators: [{
                     type: Inject,
@@ -386,9 +395,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.25", ngImpo
  * Licensed under the MIT License.
  */
 class MsalInterceptor {
-    constructor(msalInterceptorConfig, authService, location, msalBroadcastService, 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
-    document) {
+    constructor(msalInterceptorConfig, authService, location, msalBroadcastService, document) {
         this.msalInterceptorConfig = msalInterceptorConfig;
         this.authService = authService;
         this.location = location;
@@ -419,11 +426,12 @@ class MsalInterceptor {
         }
         // Sets account as active account or first account
         let account;
-        if (!!this.authService.instance.getActiveAccount()) {
+        const activeAccount = this.authService.instance.getActiveAccount();
+        if (activeAccount) {
             this.authService
                 .getLogger()
                 .verbose("Interceptor - active account selected", "");
-            account = this.authService.instance.getActiveAccount();
+            account = activeAccount;
         }
         else {
             this.authService
@@ -465,7 +473,7 @@ class MsalInterceptor {
             .pipe(catchError(() => {
             this.authService
                 .getLogger()
-                .error("Interceptor - acquireTokenSilent rejected with error. Invoking interaction to resolve.", authRequest.correlationId);
+                .error("Interceptor - acquireTokenSilent rejected with error. Invoking interaction to resolve.", authRequest.correlationId ?? "");
             return this.msalBroadcastService.inProgress$.pipe(take(1), switchMap((status) => {
                 if (status === InteractionStatus.None) {
                     return this.acquireTokenInteractively(authRequest, scopes);
@@ -476,7 +484,7 @@ class MsalInterceptor {
             if (!result.accessToken) {
                 this.authService
                     .getLogger()
-                    .error("Interceptor - acquireTokenSilent resolved with null access token. Known issue with B2C tenants, invoking interaction to resolve.", authRequest.correlationId);
+                    .error("Interceptor - acquireTokenSilent resolved with null access token. Known issue with B2C tenants, invoking interaction to resolve.", authRequest.correlationId ?? "");
                 return this.msalBroadcastService.inProgress$.pipe(filter((status) => status === InteractionStatus.None), take(1), switchMap(() => this.acquireTokenInteractively(authRequest, scopes)));
             }
             return of(result);
@@ -492,12 +500,12 @@ class MsalInterceptor {
         if (this.msalInterceptorConfig.interactionType === InteractionType.Popup) {
             this.authService
                 .getLogger()
-                .verbose("Interceptor - error acquiring token silently, acquiring by popup", authRequest.correlationId);
+                .verbose("Interceptor - error acquiring token silently, acquiring by popup", authRequest.correlationId ?? "");
             return this.authService.acquireTokenPopup({ ...authRequest, scopes });
         }
         this.authService
             .getLogger()
-            .verbose("Interceptor - error acquiring token silently, acquiring by redirect", authRequest.correlationId);
+            .verbose("Interceptor - error acquiring token silently, acquiring by redirect", authRequest.correlationId ?? "");
         const redirectStartPage = window.location.href;
         this.authService.acquireTokenRedirect({
             ...authRequest,
@@ -555,7 +563,13 @@ class MsalInterceptor {
      */
     checkUrlComponents(keyComponents, endpointComponents) {
         // URL properties from https://developer.mozilla.org/en-US/docs/Web/API/URL
-        const urlProperties = ["protocol", "host", "pathname", "search", "hash"];
+        const urlProperties = [
+            "protocol",
+            "host",
+            "pathname",
+            "search",
+            "hash",
+        ];
         // Maps URL property names to the component identifiers used by matchPatternStrict.
         const componentMap = {
             protocol: "protocol",
@@ -616,6 +630,9 @@ class MsalInterceptor {
                 allMatchedScopes.push(null);
                 return;
             }
+            if (methodAndScopesArray === undefined) {
+                return;
+            }
             methodAndScopesArray.forEach((entry) => {
                 // Entry is either array of scopes or ProtectedResourceScopes object
                 if (typeof entry === "string") {
@@ -705,15 +722,15 @@ class MsalInterceptor {
         const regex = new RegExp(`^${regexBody}$`);
         return regex.test(input);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: MsalInterceptor, deps: [{ token: MSAL_INTERCEPTOR_CONFIG }, { token: MsalService }, { token: i3.Location }, { token: MsalBroadcastService }, { token: DOCUMENT }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: MsalInterceptor }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.2", ngImport: i0, type: MsalInterceptor, deps: [{ token: MSAL_INTERCEPTOR_CONFIG }, { token: MsalService }, { token: i3.Location }, { token: MsalBroadcastService }, { token: DOCUMENT }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "22.0.2", ngImport: i0, type: MsalInterceptor }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: MsalInterceptor, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.2", ngImport: i0, type: MsalInterceptor, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [MSAL_INTERCEPTOR_CONFIG]
-                }] }, { type: MsalService }, { type: i3.Location }, { type: MsalBroadcastService }, { type: undefined, decorators: [{
+                }] }, { type: MsalService }, { type: i3.Location }, { type: MsalBroadcastService }, { type: Document, decorators: [{
                     type: Inject,
                     args: [DOCUMENT]
                 }] }] });
@@ -735,10 +752,10 @@ class MsalRedirectComponent {
         this.authService.getLogger().verbose("MsalRedirectComponent activated", "");
         this.authService.handleRedirectObservable().subscribe();
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: MsalRedirectComponent, deps: [{ token: MsalService }], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.2.25", type: MsalRedirectComponent, isStandalone: false, selector: "app-redirect", ngImport: i0, template: "", isInline: true }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.2", ngImport: i0, type: MsalRedirectComponent, deps: [{ token: MsalService }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "22.0.2", type: MsalRedirectComponent, isStandalone: false, selector: "app-redirect", ngImport: i0, template: "", isInline: true }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: MsalRedirectComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.2", ngImport: i0, type: MsalRedirectComponent, decorators: [{
             type: Component,
             args: [{
                     selector: "app-redirect",
@@ -772,11 +789,11 @@ class MsalModule {
             ],
         };
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: MsalModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
-    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "19.2.25", ngImport: i0, type: MsalModule, declarations: [MsalRedirectComponent], imports: [CommonModule] }); }
-    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: MsalModule, providers: [MsalGuard, MsalBroadcastService], imports: [CommonModule] }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.2", ngImport: i0, type: MsalModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "22.0.2", ngImport: i0, type: MsalModule, declarations: [MsalRedirectComponent], imports: [CommonModule] }); }
+    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "22.0.2", ngImport: i0, type: MsalModule, providers: [MsalGuard, MsalBroadcastService], imports: [CommonModule] }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: MsalModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.2", ngImport: i0, type: MsalModule, decorators: [{
             type: NgModule,
             args: [{
                     declarations: [MsalRedirectComponent],
@@ -825,10 +842,10 @@ class MsalCustomNavigationClient extends NavigationClient {
         }
         return Promise.resolve(options.noHistory);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: MsalCustomNavigationClient, deps: [{ token: MsalService }, { token: i4.Router }, { token: i3.Location }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: MsalCustomNavigationClient }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.2", ngImport: i0, type: MsalCustomNavigationClient, deps: [{ token: MsalService }, { token: i4.Router }, { token: i3.Location }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "22.0.2", ngImport: i0, type: MsalCustomNavigationClient }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.25", ngImport: i0, type: MsalCustomNavigationClient, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.2", ngImport: i0, type: MsalCustomNavigationClient, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: MsalService }, { type: i4.Router }, { type: i3.Location }] });