@memberjunction/ng-auth-services 5.0.0 → 5.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberjunction/ng-auth-services",
-  "version": "5.0.0",
+  "version": "5.2.0",
   "description": "MemberJunction Explorer: Authentication Services",
   "main": "./dist/public-api.js",
   "typings": "./dist/public-api.d.ts",
@@ -30,8 +30,8 @@
     "@okta/okta-auth-js": "^7.14.1"
   },
   "dependencies": {
-    "@memberjunction/core": "5.0.0",
-    "@memberjunction/global": "5.0.0",
+    "@memberjunction/core": "5.2.0",
+    "@memberjunction/global": "5.2.0",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1"
   },

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

@@ -1,18 +0,0 @@
-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>;
-    refresh(): Promise<Observable<any>>;
-    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>;
-}
-//# sourceMappingURL=mjexplorer-auth0-provider.service.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"mjexplorer-auth0-provider.service.d.ts","sourceRoot":"","sources":["../../src/lib/mjexplorer-auth0-provider.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAW,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAE,UAAU,EAAM,MAAM,MAAM,CAAC;;AAEtC,qBAGa,eAAgB,SAAQ,UAAU;IAE1B,IAAI,EAAE,WAAW;gBAAjB,IAAI,EAAE,WAAW;IAO3B,KAAK,CAAC,OAAO,CAAC,EAAE,GAAG,GAAG,GAAG;IAIrB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvB,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAK1C,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC;IAIvD,eAAe;IAIf,aAAa,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAI/C,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;yCAlCnC,eAAe;6CAAf,eAAe;CAsC3B"}

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

@@ -1,45 +0,0 @@
-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 {
-    auth;
-    constructor(auth) {
-        super();
-        this.auth = auth;
-        this.auth.isAuthenticated$.subscribe((loggedIn) => {
-            this.setAuthenticated(loggedIn);
-        });
-    }
-    login(options) {
-        this.auth.loginWithRedirect(options);
-    }
-    async logout() {
-        this.auth.logout({ logoutParams: { returnTo: document.location.origin } });
-    }
-    async refresh() {
-        await this.auth.getAccessTokenSilently();
-        return this.auth.idTokenClaims$;
-    }
-    async getUser() {
-        return this.auth.user$;
-    }
-    async isAuthenticated() {
-        return this.auth.isAuthenticated$;
-    }
-    async getUserClaims() {
-        return this.auth.idTokenClaims$;
-    }
-    checkExpiredTokenError(error) {
-        return error?.includes('jwt expired');
-    }
-    static ɵfac = function MJAuth0Provider_Factory(t) { return new (t || MJAuth0Provider)(i0.ɵɵinject(i1.AuthService)); };
-    static ɵ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); })();
-//# sourceMappingURL=mjexplorer-auth0-provider.service.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"mjexplorer-auth0-provider.service.js","sourceRoot":"","sources":["../../src/lib/mjexplorer-auth0-provider.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;;;AAO5D,MAAM,OAAO,eAAgB,SAAQ,UAAU;IAE1B;IAAnB,YAAmB,IAAiB;QAClC,KAAK,EAAE,CAAC;QADS,SAAI,GAAJ,IAAI,CAAa;QAElC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,EAAE;YAChD,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;IACL,CAAC;IAEQ,KAAK,CAAC,OAAa;QAC1B,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAEM,KAAK,CAAC,MAAM;QACjB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAC7E,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,MAAM,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;QACzC,OAAO,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,OAAO;QACX,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,OAAO,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,OAAO,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC;IAClC,CAAC;IAED,sBAAsB,CAAC,KAAa;QAClC,OAAO,KAAK,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC;IACxC,CAAC;yEApCU,eAAe;gEAAf,eAAe,WAAf,eAAe,mBAFd,MAAM;;iFAEP,eAAe;cAH3B,UAAU;eAAC;gBACV,UAAU,EAAE,MAAM;aACnB"}

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

@@ -1,24 +0,0 @@
-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>;
-    refresh(): Promise<Observable<any>>;
-    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>;
-}
-//# sourceMappingURL=mjexplorer-msal-provider.service.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"mjexplorer-msal-provider.service.d.ts","sourceRoot":"","sources":["../../src/lib/mjexplorer-msal-provider.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAmB,UAAU,EAA2F,MAAM,MAAM,CAAC;AAC5I,OAAO,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,EAAE,WAAW,EAAwB,MAAM,oBAAoB,CAAC;;AAIvE,qBAGa,cAAe,SAAQ,UAAU;IAKzB,IAAI,EAAE,WAAW;IAAE,OAAO,CAAC,oBAAoB;IAHlE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAuB;IACpD,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAuC;gBAE9D,IAAI,EAAE,WAAW,EAAU,oBAAoB,EAAE,oBAAoB;YAK1E,cAAc;YAcd,iBAAiB;IAMhB,KAAK,CAAC,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAgBpC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAOvB,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAS1C,OAAO,IAAI,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAKtC,eAAe;IAKf,aAAa,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAwB/C,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;yCAhGnC,cAAc;6CAAd,cAAc;CAoG1B"}

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

@@ -1,108 +0,0 @@
-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 {
-    auth;
-    msalBroadcastService;
-    _destroying$ = new Subject();
-    _initializationCompleted$ = new BehaviorSubject(false);
-    constructor(auth, msalBroadcastService) {
-        super();
-        this.auth = auth;
-        this.msalBroadcastService = msalBroadcastService;
-        this.initializeMSAL();
-    }
-    async initializeMSAL() {
-        await 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
-    async ensureInitialized() {
-        if (!this._initializationCompleted$.value) {
-            await firstValueFrom(this._initializationCompleted$.pipe(filter(done => done), take(1)));
-        }
-    }
-    async login(options) {
-        await 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);
-            }
-        });
-    }
-    async logout() {
-        await this.ensureInitialized();
-        this.auth.logoutRedirect().subscribe(() => {
-            window.location.reload();
-        });
-    }
-    async refresh() {
-        await this.ensureInitialized();
-        const silentRequest = {
-            scopes: ['User.Read', 'email', 'profile'],
-            cacheLookupPolicy: CacheLookupPolicy.RefreshTokenAndNetwork,
-        };
-        return from(this.auth.instance.acquireTokenSilent(silentRequest));
-    }
-    async getUser() {
-        await this.ensureInitialized();
-        return this.auth.instance.getActiveAccount();
-    }
-    async isAuthenticated() {
-        await this.ensureInitialized();
-        return of(this.auth.instance.getActiveAccount() != null);
-    }
-    async getUserClaims() {
-        await 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));
-                }
-                this.authenticated = false;
-                return throwError(error);
-            }));
-        }
-        else {
-            return from(this.auth.instance.acquireTokenSilent(silentRequest));
-        }
-    }
-    checkExpiredTokenError(error) {
-        return error?.trim().toLowerCase().includes('you need to be authorized to perform');
-    }
-    static ɵfac = function MJMSALProvider_Factory(t) { return new (t || MJMSALProvider)(i0.ɵɵinject(i1.MsalService), i0.ɵɵinject(i1.MsalBroadcastService)); };
-    static ɵ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); })();
-//# sourceMappingURL=mjexplorer-msal-provider.service.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"mjexplorer-msal-provider.service.js","sourceRoot":"","sources":["../../src/lib/mjexplorer-msal-provider.service.ts"],"names":[],"mappings":"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"}