@memberjunction/ng-auth-services 0.9.56 → 0.9.64

package/dist/lib/mjexplorer-auth-base.service.d.ts

@@ -1,15 +1,15 @@
-import { Observable } from 'rxjs';
-import * as i0 from "@angular/core";
-export declare abstract class MJAuthBase {
-    authenticated: boolean;
-    constructor();
-    abstract login(options?: any): any;
-    abstract logout(): any;
-    abstract isAuthenticated(): any;
-    abstract getUser(): any;
-    abstract getUserClaims(): Observable<any>;
-    abstract checkExpiredTokenError(error: string): boolean;
-    protected setAuthenticated(value: boolean): void;
-    static ɵfac: i0.ɵɵFactoryDeclaration<MJAuthBase, never>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<MJAuthBase>;
-}
+import { Observable } from 'rxjs';
+import * as i0 from "@angular/core";
+export declare abstract class MJAuthBase {
+    authenticated: boolean;
+    constructor();
+    abstract login(options?: any): Promise<any>;
+    abstract logout(): Promise<any>;
+    abstract isAuthenticated(): Promise<any>;
+    abstract getUser(): Promise<any>;
+    abstract getUserClaims(): Promise<Observable<any>>;
+    abstract checkExpiredTokenError(error: string): boolean;
+    protected setAuthenticated(value: boolean): void;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MJAuthBase, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<MJAuthBase>;
+}

package/dist/lib/mjexplorer-auth-base.service.js

@@ -1,18 +1,18 @@
-import { Injectable } from '@angular/core';
-import * as i0 from "@angular/core";
-export class MJAuthBase {
-    constructor() {
-        this.authenticated = false;
-    }
-    setAuthenticated(value) {
-        this.authenticated = value;
-    }
-}
-MJAuthBase.ɵfac = function MJAuthBase_Factory(t) { return new (t || MJAuthBase)(); };
-MJAuthBase.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: MJAuthBase, factory: MJAuthBase.ɵfac, providedIn: 'root' });
-(function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(MJAuthBase, [{
-        type: Injectable,
-        args: [{
-                providedIn: 'root'
-            }]
-    }], function () { return []; }, null); })();
+import { Injectable } from '@angular/core';
+import * as i0 from "@angular/core";
+export class MJAuthBase {
+    constructor() {
+        this.authenticated = false;
+    }
+    setAuthenticated(value) {
+        this.authenticated = value;
+    }
+}
+MJAuthBase.ɵfac = function MJAuthBase_Factory(t) { return new (t || MJAuthBase)(); };
+MJAuthBase.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: MJAuthBase, factory: MJAuthBase.ɵfac, providedIn: 'root' });
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(MJAuthBase, [{
+        type: Injectable,
+        args: [{
+                providedIn: 'root'
+            }]
+    }], () => [], null); })();

package/dist/lib/mjexplorer-auth0-provider.service.d.ts

@@ -1,16 +1,16 @@
-import { MJAuthBase } from './mjexplorer-auth-base.service';
-import { AuthService, User } from '@auth0/auth0-angular';
-import { Observable } from 'rxjs';
-import * as i0 from "@angular/core";
-export declare class MJAuth0Provider extends MJAuthBase {
-    auth: AuthService;
-    constructor(auth: AuthService);
-    login(options?: any): any;
-    logout(): void;
-    getUser(): Observable<User | null | undefined>;
-    isAuthenticated(): Observable<boolean>;
-    getUserClaims(): Observable<any>;
-    checkExpiredTokenError(error: string): boolean;
-    static ɵfac: i0.ɵɵFactoryDeclaration<MJAuth0Provider, never>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<MJAuth0Provider>;
-}
+import { MJAuthBase } from './mjexplorer-auth-base.service';
+import { AuthService, User } from '@auth0/auth0-angular';
+import { Observable } from 'rxjs';
+import * as i0 from "@angular/core";
+export declare class MJAuth0Provider extends MJAuthBase {
+    auth: AuthService;
+    constructor(auth: AuthService);
+    login(options?: any): any;
+    logout(): Promise<void>;
+    getUser(): Promise<Observable<User | null | undefined>>;
+    isAuthenticated(): Promise<Observable<boolean>>;
+    getUserClaims(): Promise<Observable<any>>;
+    checkExpiredTokenError(error: string): boolean;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MJAuth0Provider, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<MJAuth0Provider>;
+}

package/dist/lib/mjexplorer-auth0-provider.service.js

@@ -1,39 +1,56 @@
-import { Injectable } from '@angular/core';
-import { MJAuthBase } from './mjexplorer-auth-base.service';
-import * as i0 from "@angular/core";
-import * as i1 from "@auth0/auth0-angular";
-export class MJAuth0Provider extends MJAuthBase {
-    constructor(auth) {
-        super();
-        this.auth = auth;
-        this.auth.isAuthenticated$.subscribe((loggedIn) => {
-            this.setAuthenticated(loggedIn);
-        });
-    }
-    login(options) {
-        this.auth.loginWithRedirect(options);
-    }
-    logout() {
-        this.auth.logout({ logoutParams: { returnTo: document.location.origin } });
-    }
-    getUser() {
-        return this.auth.user$;
-    }
-    isAuthenticated() {
-        return this.auth.isAuthenticated$;
-    }
-    getUserClaims() {
-        return this.auth.idTokenClaims$;
-    }
-    checkExpiredTokenError(error) {
-        return error === null || error === void 0 ? void 0 : error.includes('jwt expired');
-    }
-}
-MJAuth0Provider.ɵfac = function MJAuth0Provider_Factory(t) { return new (t || MJAuth0Provider)(i0.ɵɵinject(i1.AuthService)); };
-MJAuth0Provider.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: MJAuth0Provider, factory: MJAuth0Provider.ɵfac, providedIn: 'root' });
-(function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(MJAuth0Provider, [{
-        type: Injectable,
-        args: [{
-                providedIn: 'root'
-            }]
-    }], function () { return [{ type: i1.AuthService }]; }, null); })();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { Injectable } from '@angular/core';
+import { MJAuthBase } from './mjexplorer-auth-base.service';
+import * as i0 from "@angular/core";
+import * as i1 from "@auth0/auth0-angular";
+export class MJAuth0Provider extends MJAuthBase {
+    constructor(auth) {
+        super();
+        this.auth = auth;
+        this.auth.isAuthenticated$.subscribe((loggedIn) => {
+            this.setAuthenticated(loggedIn);
+        });
+    }
+    login(options) {
+        this.auth.loginWithRedirect(options);
+    }
+    logout() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.auth.logout({ logoutParams: { returnTo: document.location.origin } });
+        });
+    }
+    getUser() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.auth.user$;
+        });
+    }
+    isAuthenticated() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.auth.isAuthenticated$;
+        });
+    }
+    getUserClaims() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.auth.idTokenClaims$;
+        });
+    }
+    checkExpiredTokenError(error) {
+        return error === null || error === void 0 ? void 0 : error.includes('jwt expired');
+    }
+}
+MJAuth0Provider.ɵfac = function MJAuth0Provider_Factory(t) { return new (t || MJAuth0Provider)(i0.ɵɵinject(i1.AuthService)); };
+MJAuth0Provider.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: MJAuth0Provider, factory: MJAuth0Provider.ɵfac, providedIn: 'root' });
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(MJAuth0Provider, [{
+        type: Injectable,
+        args: [{
+                providedIn: 'root'
+            }]
+    }], () => [{ type: i1.AuthService }], null); })();

package/dist/lib/mjexplorer-msal-provider.service.d.ts

@@ -1,19 +1,22 @@
-import { MJAuthBase } from './mjexplorer-auth-base.service';
-import { Observable } from 'rxjs';
-import { MsalBroadcastService, MsalService } from '@azure/msal-angular';
-import { AccountInfo } from '@azure/msal-common';
-import * as i0 from "@angular/core";
-export declare class MJMSALProvider extends MJAuthBase {
-    auth: MsalService;
-    private msalBroadcastService;
-    private readonly _destroying$;
-    constructor(auth: MsalService, msalBroadcastService: MsalBroadcastService);
-    login(options?: any): Promise<any>;
-    logout(): void;
-    getUser(): AccountInfo | null;
-    isAuthenticated(): Observable<boolean>;
-    getUserClaims(): Observable<any>;
-    checkExpiredTokenError(error: string): boolean;
-    static ɵfac: i0.ɵɵFactoryDeclaration<MJMSALProvider, never>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<MJMSALProvider>;
-}
+import { MJAuthBase } from './mjexplorer-auth-base.service';
+import { Observable } from 'rxjs';
+import { MsalBroadcastService, MsalService } from '@azure/msal-angular';
+import { AccountInfo } from '@azure/msal-common';
+import * as i0 from "@angular/core";
+export declare class MJMSALProvider extends MJAuthBase {
+    auth: MsalService;
+    private msalBroadcastService;
+    private readonly _destroying$;
+    private readonly _initializationCompleted$;
+    constructor(auth: MsalService, msalBroadcastService: MsalBroadcastService);
+    private initializeMSAL;
+    private ensureInitialized;
+    login(options?: any): Promise<any>;
+    logout(): Promise<void>;
+    getUser(): Promise<AccountInfo | null>;
+    isAuthenticated(): Promise<Observable<boolean>>;
+    getUserClaims(): Promise<Observable<any>>;
+    checkExpiredTokenError(error: string): boolean;
+    static ɵfac: i0.ɵɵFactoryDeclaration<MJMSALProvider, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<MJMSALProvider>;
+}

package/dist/lib/mjexplorer-msal-provider.service.js

@@ -1,89 +1,119 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import { Injectable } from '@angular/core';
-import { MJAuthBase } from './mjexplorer-auth-base.service';
-import { Subject, catchError, filter, from, map, of, throwError } from 'rxjs';
-import { CacheLookupPolicy, InteractionRequiredAuthError, InteractionStatus } from '@azure/msal-browser';
-import { LogError } from '@memberjunction/core';
-import * as i0 from "@angular/core";
-import * as i1 from "@azure/msal-angular";
-export class MJMSALProvider extends MJAuthBase {
-    constructor(auth, msalBroadcastService) {
-        super();
-        this.auth = auth;
-        this.msalBroadcastService = msalBroadcastService;
-        this._destroying$ = new Subject();
-        this.auth.instance.setActiveAccount(this.auth.instance.getAllAccounts()[0] || null);
-        this.msalBroadcastService.inProgress$
-            .pipe(filter((status) => status === InteractionStatus.None))
-            .subscribe(() => {
-            this.setAuthenticated(this.auth.instance.getAllAccounts().length > 0);
-            this.auth.instance.setActiveAccount(this.auth.instance.getAllAccounts()[0] || null);
-        });
-    }
-    login(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const silentRequest = {
-                scopes: ['User.Read', 'email', 'profile']
-            };
-            this.auth.loginRedirect(silentRequest).subscribe({
-                next: () => {
-                    this.auth.instance.setActiveAccount(this.auth.instance.getAllAccounts()[0] || null);
-                    window.location.reload();
-                },
-                error: (error) => {
-                    LogError(error);
-                }
-            });
-        });
-    }
-    logout() {
-        this.auth.logoutRedirect().subscribe(() => {
-            window.location.reload();
-        });
-    }
-    getUser() {
-        return this.auth.instance.getActiveAccount();
-    }
-    isAuthenticated() {
-        return of(this.auth.instance.getActiveAccount() != null);
-    }
-    getUserClaims() {
-        const account = this.auth.instance.getActiveAccount();
-        const silentRequest = {
-            scopes: ['User.Read', 'email', 'profile'],
-            account: account,
-            cacheLookupPolicy: CacheLookupPolicy.RefreshTokenAndNetwork
-        };
-        if (account) {
-            return from(this.auth.instance.acquireTokenSilent(silentRequest)).pipe(map((response) => response), catchError((error) => {
-                LogError(error);
-                if (error instanceof InteractionRequiredAuthError) {
-                    return from(this.auth.instance.acquireTokenSilent(silentRequest));
-                }
-                return throwError(error);
-            }));
-        }
-        else {
-            return from(this.auth.instance.acquireTokenSilent(silentRequest));
-        }
-    }
-    checkExpiredTokenError(error) {
-        return error === null || error === void 0 ? void 0 : error.trim().toLowerCase().includes('you need to be authorized to perform');
-    }
-}
-MJMSALProvider.ɵfac = function MJMSALProvider_Factory(t) { return new (t || MJMSALProvider)(i0.ɵɵinject(i1.MsalService), i0.ɵɵinject(i1.MsalBroadcastService)); };
-MJMSALProvider.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: MJMSALProvider, factory: MJMSALProvider.ɵfac, providedIn: 'root' });
-(function () { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(MJMSALProvider, [{
-        type: Injectable,
-        args: [{
-                providedIn: 'root'
-            }]
-    }], function () { return [{ type: i1.MsalService }, { type: i1.MsalBroadcastService }]; }, null); })();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { Injectable } from '@angular/core';
+import { MJAuthBase } from './mjexplorer-auth-base.service';
+import { BehaviorSubject, Subject, catchError, filter, from, map, of, throwError, takeUntil, take, firstValueFrom } from 'rxjs';
+import { CacheLookupPolicy, InteractionRequiredAuthError, InteractionStatus } from '@azure/msal-browser';
+import { LogError } from '@memberjunction/core';
+import * as i0 from "@angular/core";
+import * as i1 from "@azure/msal-angular";
+export class MJMSALProvider extends MJAuthBase {
+    constructor(auth, msalBroadcastService) {
+        super();
+        this.auth = auth;
+        this.msalBroadcastService = msalBroadcastService;
+        this._destroying$ = new Subject();
+        this._initializationCompleted$ = new BehaviorSubject(false);
+        this.initializeMSAL();
+    }
+    initializeMSAL() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.auth.instance.initialize();
+            // After initialization logic
+            this.auth.instance.setActiveAccount(this.auth.instance.getAllAccounts()[0] || null);
+            this.msalBroadcastService.inProgress$
+                .pipe(filter((status) => status === InteractionStatus.None), takeUntil(this._destroying$))
+                .subscribe(() => {
+                this.setAuthenticated(this.auth.instance.getAllAccounts().length > 0);
+                this.auth.instance.setActiveAccount(this.auth.instance.getAllAccounts()[0] || null);
+            });
+            this._initializationCompleted$.next(true); // Signal initialization complete
+        });
+    }
+    // Ensure methods wait for initialization
+    ensureInitialized() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this._initializationCompleted$.value) {
+                yield firstValueFrom(this._initializationCompleted$.pipe(filter(done => done), take(1)));
+            }
+        });
+    }
+    login(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.ensureInitialized();
+            const silentRequest = {
+                scopes: ['User.Read', 'email', 'profile']
+            };
+            this.auth.loginRedirect(silentRequest).subscribe({
+                next: () => {
+                    this.auth.instance.setActiveAccount(this.auth.instance.getAllAccounts()[0] || null);
+                    window.location.reload();
+                },
+                error: (error) => {
+                    LogError(error);
+                }
+            });
+        });
+    }
+    logout() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.ensureInitialized();
+            this.auth.logoutRedirect().subscribe(() => {
+                window.location.reload();
+            });
+        });
+    }
+    getUser() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.ensureInitialized();
+            return this.auth.instance.getActiveAccount();
+        });
+    }
+    isAuthenticated() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.ensureInitialized();
+            return of(this.auth.instance.getActiveAccount() != null);
+        });
+    }
+    getUserClaims() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.ensureInitialized();
+            const account = this.auth.instance.getActiveAccount();
+            const silentRequest = {
+                scopes: ['User.Read', 'email', 'profile'],
+                account: account,
+                cacheLookupPolicy: CacheLookupPolicy.RefreshTokenAndNetwork
+            };
+            if (account) {
+                return from(this.auth.instance.acquireTokenSilent(silentRequest)).pipe(map((response) => response), catchError((error) => {
+                    LogError(error);
+                    if (error instanceof InteractionRequiredAuthError) {
+                        return from(this.auth.instance.acquireTokenSilent(silentRequest));
+                    }
+                    return throwError(error);
+                }));
+            }
+            else {
+                return from(this.auth.instance.acquireTokenSilent(silentRequest));
+            }
+        });
+    }
+    checkExpiredTokenError(error) {
+        return error === null || error === void 0 ? void 0 : error.trim().toLowerCase().includes('you need to be authorized to perform');
+    }
+}
+MJMSALProvider.ɵfac = function MJMSALProvider_Factory(t) { return new (t || MJMSALProvider)(i0.ɵɵinject(i1.MsalService), i0.ɵɵinject(i1.MsalBroadcastService)); };
+MJMSALProvider.ɵprov = /*@__PURE__*/ i0.ɵɵdefineInjectable({ token: MJMSALProvider, factory: MJMSALProvider.ɵfac, providedIn: 'root' });
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(MJMSALProvider, [{
+        type: Injectable,
+        args: [{
+                providedIn: 'root'
+            }]
+    }], () => [{ type: i1.MsalService }, { type: i1.MsalBroadcastService }], null); })();

package/dist/public-api.d.ts

@@ -1,3 +1,3 @@
-export * from './lib/mjexplorer-auth-base.service';
-export * from './lib/mjexplorer-auth0-provider.service';
-export * from './lib/mjexplorer-msal-provider.service';
+export * from './lib/mjexplorer-auth-base.service';
+export * from './lib/mjexplorer-auth0-provider.service';
+export * from './lib/mjexplorer-msal-provider.service';

package/dist/public-api.js

@@ -1,6 +1,6 @@
-/*
- * Public API Surface
- */
-export * from './lib/mjexplorer-auth-base.service';
-export * from './lib/mjexplorer-auth0-provider.service';
-export * from './lib/mjexplorer-msal-provider.service';
+/*
+ * Public API Surface
+ */
+export * from './lib/mjexplorer-auth-base.service';
+export * from './lib/mjexplorer-auth0-provider.service';
+export * from './lib/mjexplorer-msal-provider.service';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberjunction/ng-auth-services",
-  "version": "0.9.56",
+  "version": "0.9.64",
   "description": "MemberJunction Explorer: Authentication Services",
   "main": "./dist/public-api.js",
   "typings": "./dist/public-api.d.ts",
@@ -15,19 +15,19 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@angular/compiler": "^15.2.0",
-    "@angular/compiler-cli": "^15.2.0"
+    "@angular/compiler": "^17.1.2",
+    "@angular/compiler-cli": "^17.1.2"
   },
   "peerDependencies": {
-    "@angular/common": "^15.2.0",
-    "@angular/core": "^15.2.0",
-    "@angular/forms": "^15.2.0",
-    "@angular/router": "^15.2.0",
+    "@angular/common": "^17.1.2",
+    "@angular/core": "^17.1.2",
+    "@angular/forms": "^17.1.2",
+    "@angular/router": "^17.1.2",
     "@auth0/auth0-angular": "^2.2.1",
-    "@azure/msal-angular": "^2.5.8"
+    "@azure/msal-angular": "^3.0.11"
   },
   "dependencies": {
-    "@memberjunction/core": "^0.9.128",
+    "@memberjunction/core": "^0.9.134",
     "tslib": "^2.3.0"
   },
   "sideEffects": false