@bravobit/bb-foundation 0.23.6 → 0.24.0

package/fesm2020/bravobit-bb-foundation-auth.mjs

@@ -2,8 +2,8 @@ import * as i0 from '@angular/core';
 import { InjectionToken, Injectable, Optional, Inject, Directive, Input, APP_INITIALIZER, NgModule } from '@angular/core';
 import * as i3 from '@angular/common/http';
 import { HttpContextToken, HttpContext, HttpErrorResponse, HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
-import { shareReplay, tap, map, distinctUntilChanged, switchMap, catchError, filter, take, finalize } from 'rxjs/operators';
-import { firstValueFrom, BehaviorSubject, of, Subscription, combineLatest, first, throwError } from 'rxjs';
+import { shareReplay, tap, map, distinctUntilChanged, catchError, filter, take, switchMap, finalize } from 'rxjs/operators';
+import { firstValueFrom, BehaviorSubject, of, Subscription, first, throwError } from 'rxjs';
 import * as i5 from '@angular/platform-browser';
 import { makeStateKey } from '@angular/platform-browser';
 import * as i2$1 from '@angular/router';
@@ -205,6 +205,13 @@ class AuthSession {
         // Init methods.
         this.restoreFromStorage();
     }
+    get snapshot() {
+        return {
+            user: this._user$.getValue(),
+            accessToken: this.accessToken,
+            refreshToken: this.refreshToken
+        };
+    }
     get accessToken() {
         return this.isTokenValid(this._accessTokenPayload)
             ? this._accessTokenString
@@ -361,7 +368,7 @@ class Auth {
     async signIn(provider, as) {
         const { accessToken, refreshToken, user, ...result } = await provider.authenticate(this._httpClient);
         // Check if the role matches.
-        const role = this._config?.permissions?.getRole?.(user) ?? user?.role ?? null;
+        const role = user?.role ?? null;
         if (as && !as.includes(role)) {
             throw new Error('Invalid role.');
         }
@@ -509,7 +516,7 @@ class Auth {
                 clearTimeout?.(this._refreshHandler);
                 this._refreshHandler = null;
             }
-            this._refreshHandler = setTimeout?.(() => this.autoRefresh(), cappedTiming);
+            this._refreshHandler = window?.setTimeout?.(() => this.autoRefresh(), cappedTiming);
         }
         catch {
             // Just ignore it.
@@ -535,9 +542,9 @@ class Auth {
             .join('/');
     }
 }
-Auth.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: Auth, deps: [{ token: i1.Storage }, { token: i0.Injector }, { token: i2.Platform }, { token: i3.HttpClient }, { token: AuthConfig, optional: true }, { token: i5.TransferState, optional: true }, { token: i6.HttpConfig, optional: true }, { token: AUTH_REDIRECT_HANDLER, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
-Auth.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: Auth });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: Auth, decorators: [{
+Auth.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.10", ngImport: i0, type: Auth, deps: [{ token: i1.Storage }, { token: i0.Injector }, { token: i2.Platform }, { token: i3.HttpClient }, { token: AuthConfig, optional: true }, { token: i5.TransferState, optional: true }, { token: i6.HttpConfig, optional: true }, { token: AUTH_REDIRECT_HANDLER, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
+Auth.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.10", ngImport: i0, type: Auth });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.10", ngImport: i0, type: Auth, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: i1.Storage }, { type: i0.Injector }, { type: i2.Platform }, { type: i3.HttpClient }, { type: AuthConfig, decorators: [{
                     type: Optional
@@ -577,9 +584,9 @@ class BbAuthenticated extends AbstractAuthDirective {
         this._subscription?.unsubscribe();
     }
 }
-BbAuthenticated.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: BbAuthenticated, deps: [{ token: Auth }, { token: i0.TemplateRef }, { token: i0.ViewContainerRef }], target: i0.ɵɵFactoryTarget.Directive });
-BbAuthenticated.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.2", type: BbAuthenticated, selector: "[bbAuthenticated]", inputs: { bbAuthenticatedElse: "bbAuthenticatedElse" }, usesInheritance: true, ngImport: i0 });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: BbAuthenticated, decorators: [{
+BbAuthenticated.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.10", ngImport: i0, type: BbAuthenticated, deps: [{ token: Auth }, { token: i0.TemplateRef }, { token: i0.ViewContainerRef }], target: i0.ɵɵFactoryTarget.Directive });
+BbAuthenticated.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.10", type: BbAuthenticated, selector: "[bbAuthenticated]", inputs: { bbAuthenticatedElse: "bbAuthenticatedElse" }, usesInheritance: true, ngImport: i0 });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.10", ngImport: i0, type: BbAuthenticated, decorators: [{
             type: Directive,
             args: [{
                     selector: '[bbAuthenticated]'
@@ -588,149 +595,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImpor
                 type: Input
             }] } });
 
-class Permissions {
-    constructor(_auth, _config) {
-        this._auth = _auth;
-        this._config = _config;
-        // Data.
-        this._permissionHandler = this._config?.permissions ?? null;
-    }
-    has(value, options) {
-        const requiredPermissions = this.getRequiredPermissions(value);
-        if (requiredPermissions?.length <= 0) {
-            return of(false);
-        }
-        return this._auth.user.pipe(map(user => {
-            if (user === null || user === undefined || !this._permissionHandler) {
-                return false;
-            }
-            const mode = options?.mode ?? 'and';
-            switch (mode) {
-                case 'or':
-                    return this.verifyModeOr(requiredPermissions, user);
-                case 'and':
-                default:
-                    return this.verifyModeAnd(requiredPermissions, user);
-            }
-        }), distinctUntilChanged());
-    }
-    verifyModeAnd(permissions, user) {
-        for (const permission of permissions) {
-            const verified = this._permissionHandler.verifyForUser(permission, user);
-            if (!verified) {
-                return false;
-            }
-        }
-        return true;
-    }
-    verifyModeOr(permissions, user) {
-        for (const permission of permissions) {
-            const verified = this._permissionHandler.verifyForUser(permission, user);
-            if (verified) {
-                return true;
-            }
-        }
-        return false;
-    }
-    getRequiredPermissions(value) {
-        return Array.isArray(value)
-            ? value
-            : [value];
-    }
-}
-Permissions.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: Permissions, deps: [{ token: Auth }, { token: AuthConfig, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
-Permissions.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: Permissions });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: Permissions, decorators: [{
-            type: Injectable
-        }], ctorParameters: function () { return [{ type: Auth }, { type: AuthConfig, decorators: [{
-                    type: Optional
-                }] }]; } });
-
-class BbPermission extends AbstractAuthDirective {
-    constructor(_permissions, _templateRef, _viewContainerRef) {
-        super(_templateRef, _viewContainerRef);
-        this._permissions = _permissions;
-        this._templateRef = _templateRef;
-        this._viewContainerRef = _viewContainerRef;
-        // Data.
-        this._permission$ = new BehaviorSubject([]);
-        this._mode$ = new BehaviorSubject('and');
-        // Subscriptions.
-        this._subscription = new Subscription();
-    }
-    set bbPermission(value) {
-        const permissions = Array.isArray(value) ? value : [value];
-        this._permission$.next(permissions);
-        this.updateView();
-    }
-    set bbPermissionElse(templateRef) {
-        this.assertTemplate('bbPermissionElse', templateRef);
-        this.elseTemplateRef = templateRef;
-        this.updateView();
-    }
-    set bbPermissionMode(mode) {
-        this._mode$.next(mode);
-    }
-    ngOnInit() {
-        const check$ = combineLatest([this._permission$, this._mode$]).pipe(switchMap(([permissions, mode]) => this._permissions.has(permissions, { mode })), distinctUntilChanged());
-        const subscription = check$.subscribe(valid => {
-            this.valid = valid;
-            this.updateView();
-        });
-        this._subscription.add(subscription);
-    }
-    ngOnDestroy() {
-        this._subscription?.unsubscribe();
-    }
-}
-BbPermission.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: BbPermission, deps: [{ token: Permissions }, { token: i0.TemplateRef }, { token: i0.ViewContainerRef }], target: i0.ɵɵFactoryTarget.Directive });
-BbPermission.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.2", type: BbPermission, selector: "[bbPermission]", inputs: { bbPermission: "bbPermission", bbPermissionElse: "bbPermissionElse", bbPermissionMode: "bbPermissionMode" }, usesInheritance: true, ngImport: i0 });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: BbPermission, decorators: [{
-            type: Directive,
-            args: [{
-                    selector: '[bbPermission]'
-                }]
-        }], ctorParameters: function () { return [{ type: Permissions }, { type: i0.TemplateRef }, { type: i0.ViewContainerRef }]; }, propDecorators: { bbPermission: [{
-                type: Input
-            }], bbPermissionElse: [{
-                type: Input
-            }], bbPermissionMode: [{
-                type: Input
-            }] } });
-
-class AppPermissions {
-    constructor(_data) {
-        this._data = _data;
-    }
-    verify(permission, role) {
-        if ((typeof ngDevMode === 'undefined' || ngDevMode) && !this._data?.[role]) {
-            console?.warn?.(`Current permissions do not include role: "${role}".`);
-        }
-        const availablePermissions = this._data?.[role] ?? [];
-        return availablePermissions.includes(permission);
-    }
-    verifyForUser(permission, data) {
-        const role = this.getRole(data);
-        return this.verify(permission, role);
-    }
-    getRole(data) {
-        return data?.['role'] ?? null;
-    }
-    static forRoles(data) {
-        const permissions = Object.keys(data) ?? [];
-        const roles = permissions.reduce((previous, current) => ([
-            ...previous,
-            ...(data?.[current] ?? [])
-        ]), []);
-        const uniqueRoles = [...new Set(roles)];
-        const formattedData = uniqueRoles.reduce((previous, current) => {
-            const rolePermissions = permissions.filter(permission => data?.[permission]?.includes(current));
-            return { ...previous, [current]: rolePermissions };
-        }, {});
-        return new AppPermissions(formattedData);
-    }
-}
-
 class BbAnonymousGuard {
     constructor(_auth, _router, _config, _handler) {
         this._auth = _auth;
@@ -760,9 +624,9 @@ class BbAnonymousGuard {
         return this.canActivate(childRoute, state);
     }
 }
-BbAnonymousGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: BbAnonymousGuard, deps: [{ token: Auth }, { token: i2$1.Router }, { token: AuthConfig, optional: true }, { token: AUTH_REDIRECT_HANDLER, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
-BbAnonymousGuard.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: BbAnonymousGuard, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: BbAnonymousGuard, decorators: [{
+BbAnonymousGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.10", ngImport: i0, type: BbAnonymousGuard, deps: [{ token: Auth }, { token: i2$1.Router }, { token: AuthConfig, optional: true }, { token: AUTH_REDIRECT_HANDLER, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
+BbAnonymousGuard.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.10", ngImport: i0, type: BbAnonymousGuard, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.10", ngImport: i0, type: BbAnonymousGuard, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -808,9 +672,9 @@ class BbAuthenticatedGuard {
         return this.canActivate(childRoute, state);
     }
 }
-BbAuthenticatedGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: BbAuthenticatedGuard, deps: [{ token: Auth }, { token: i2$1.Router }, { token: AuthConfig, optional: true }, { token: AUTH_REDIRECT_HANDLER, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
-BbAuthenticatedGuard.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: BbAuthenticatedGuard, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: BbAuthenticatedGuard, decorators: [{
+BbAuthenticatedGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.10", ngImport: i0, type: BbAuthenticatedGuard, deps: [{ token: Auth }, { token: i2$1.Router }, { token: AuthConfig, optional: true }, { token: AUTH_REDIRECT_HANDLER, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
+BbAuthenticatedGuard.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.10", ngImport: i0, type: BbAuthenticatedGuard, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.10", ngImport: i0, type: BbAuthenticatedGuard, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -824,61 +688,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImpor
                     args: [AUTH_REDIRECT_HANDLER]
                 }] }]; } });
 
-class BbPermissionGuard {
-    constructor(_router, _permissions, _config, _handler) {
-        this._router = _router;
-        this._permissions = _permissions;
-        this._config = _config;
-        this._handler = _handler;
-    }
-    canActivate(snapshot, state) {
-        const permission = snapshot?.data?.['permission'] ?? null;
-        const permission$ = this.parsePermission(permission);
-        return permission$.pipe(map(valid => {
-            if (valid) {
-                return true;
-            }
-            if (this._handler) {
-                return this._handler.onPermissionDenied(snapshot, state);
-            }
-            const nextUrl = this._config?.redirects?.permissionDenied ?? null;
-            if (!nextUrl) {
-                return false;
-            }
-            const commands = Array.isArray(nextUrl) ? nextUrl : [nextUrl];
-            return valid ? true : this._router.createUrlTree(commands);
-        }));
-    }
-    canActivateChild(childRoute, state) {
-        return this.canActivate(childRoute, state);
-    }
-    parsePermission(data) {
-        if ((typeof ngDevMode === 'undefined' || ngDevMode) && (data === undefined || data === null)) {
-            console?.warn?.(`No "data.permission" property was passed.`);
-            return of(false);
-        }
-        if (Array.isArray(data) || typeof data === 'string') {
-            return this._permissions.has(data);
-        }
-        return this._permissions.has(data?.value, data?.options);
-    }
-}
-BbPermissionGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: BbPermissionGuard, deps: [{ token: i2$1.Router }, { token: Permissions }, { token: AuthConfig, optional: true }, { token: AUTH_REDIRECT_HANDLER, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
-BbPermissionGuard.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: BbPermissionGuard, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: BbPermissionGuard, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }], ctorParameters: function () { return [{ type: i2$1.Router }, { type: Permissions }, { type: AuthConfig, decorators: [{
-                    type: Optional
-                }] }, { type: undefined, decorators: [{
-                    type: Optional
-                }, {
-                    type: Inject,
-                    args: [AUTH_REDIRECT_HANDLER]
-                }] }]; } });
-
 class AuthInterceptor {
     constructor(_auth, _config) {
         this._auth = _auth;
@@ -952,25 +761,20 @@ class AuthInterceptor {
         return of(null);
     }
 }
-AuthInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthInterceptor, deps: [{ token: Auth }, { token: AuthConfig, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
-AuthInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthInterceptor });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthInterceptor, decorators: [{
+AuthInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.10", ngImport: i0, type: AuthInterceptor, deps: [{ token: Auth }, { token: AuthConfig, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
+AuthInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.10", ngImport: i0, type: AuthInterceptor });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.10", ngImport: i0, type: AuthInterceptor, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: Auth }, { type: AuthConfig, decorators: [{
                     type: Optional
                 }] }]; } });
 
-const DECLARATIONS_EXPORTS = [
-    BbAuthenticated,
-    BbPermission
-];
 class AuthModule {
     static forRoot(config) {
         return {
             ngModule: AuthModule,
             providers: [
                 Auth,
-                Permissions,
                 { provide: AuthConfig, useValue: config },
                 { provide: HTTP_INTERCEPTORS, useClass: AuthInterceptor, multi: true },
                 { useFactory: initializeAuth, provide: APP_INITIALIZER, deps: [Auth], multi: true }
@@ -978,17 +782,15 @@ class AuthModule {
         };
     }
 }
-AuthModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-AuthModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.2.2", ngImport: i0, type: AuthModule, declarations: [BbAuthenticated,
-        BbPermission], imports: [HttpClientModule], exports: [BbAuthenticated,
-        BbPermission] });
-AuthModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthModule, imports: [HttpClientModule] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.2", ngImport: i0, type: AuthModule, decorators: [{
+AuthModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.10", ngImport: i0, type: AuthModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+AuthModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.2.10", ngImport: i0, type: AuthModule, declarations: [BbAuthenticated], imports: [HttpClientModule], exports: [BbAuthenticated] });
+AuthModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.2.10", ngImport: i0, type: AuthModule, imports: [HttpClientModule] });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.10", ngImport: i0, type: AuthModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [HttpClientModule],
-                    declarations: [...DECLARATIONS_EXPORTS],
-                    exports: [...DECLARATIONS_EXPORTS]
+                    declarations: [BbAuthenticated],
+                    exports: [BbAuthenticated]
                 }]
         }] });
 function initializeAuth(auth) {
@@ -999,5 +801,5 @@ function initializeAuth(auth) {
  * Generated bundle index. Do not edit.
  */
 
-export { AUTH_REDIRECT_HANDLER, AppPermissions, Auth, AuthConfig, AuthEmailProvider, AuthModule, AuthSession, AuthVerifyProvider, BbAnonymousGuard, BbAuthenticated, BbAuthenticatedGuard, BbPermission, BbPermissionGuard, JwtHelper, Permissions, USE_AUTHORIZATION, initializeAuth };
+export { AUTH_REDIRECT_HANDLER, Auth, AuthConfig, AuthEmailProvider, AuthModule, AuthSession, AuthVerifyProvider, BbAnonymousGuard, BbAuthenticated, BbAuthenticatedGuard, JwtHelper, USE_AUTHORIZATION, initializeAuth };
 //# sourceMappingURL=bravobit-bb-foundation-auth.mjs.map