@bravobit/bb-foundation 0.53.5 → 0.54.0

package/auth/lib/auth.session.d.ts

@@ -6,8 +6,9 @@ export declare class AuthSession {
     private readonly _storage;
     private readonly _accessTokenStorageKey;
     private readonly _refreshTokenStorageKey;
-    private readonly _userStorageKey;
+    private readonly _authenticatedStorageKey;
     private readonly _strategy;
+    private _authenticated;
     private _accessTokenString;
     private _refreshTokenString;
     private _accessTokenPayload;
@@ -38,9 +39,12 @@ export declare class AuthSession {
     clear(): void;
     private restoreFromStorage;
     private persistTokensInStorage;
-    private persistUserInStorage;
-    private setAccessToken;
-    private setRefreshToken;
+    private persistAuthenticatedInStorage;
+    private setAuthenticated;
+    private cacheAccessToken;
+    private cacheRefreshToken;
+    private cacheAuthenticated;
     private generateKey;
     private isTokenValid;
+    private getNextYearDate;
 }

package/auth/lib/interfaces/config.interface.d.ts

@@ -16,7 +16,6 @@ export interface AuthConfig {
     };
     setRedirectOnFailedAuth?: boolean;
     interceptActing?: boolean;
-    bootstrap?: boolean;
     providers?: string[];
     autoRefresh?: boolean;
 }

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

@@ -137,8 +137,10 @@ class AuthSession {
     _storage;
     _accessTokenStorageKey;
     _refreshTokenStorageKey;
-    _userStorageKey;
+    _authenticatedStorageKey;
     _strategy;
+    // Authenticated.
+    _authenticated = false;
     // Token strings.
     _accessTokenString = null;
     _refreshTokenString = null;
@@ -154,7 +156,7 @@ class AuthSession {
         // Setting up the readonly storage keys.
         this._accessTokenStorageKey = this.generateKey(applicationId, 'au_act');
         this._refreshTokenStorageKey = this.generateKey(applicationId, 'au_rft');
-        this._userStorageKey = this.generateKey(applicationId, 'au_usr');
+        this._authenticatedStorageKey = this.generateKey(applicationId, 'au_usr');
         // Setting up the storage.
         this._storage = options?.storage ?? null;
         this._strategy = options?.strategy ?? null;
@@ -188,17 +190,14 @@ class AuthSession {
         return this._refreshTokenPayload ?? null;
     }
     authenticated() {
-        if (this._strategy === 'httpOnlyCookie') {
-            return !!this.snapshot?.user;
-        }
-        return this.isTokenValid(this._accessTokenPayload) || this.isTokenValid(this._refreshTokenPayload);
+        return this._authenticated;
     }
     setTokens(accessToken, refreshToken, persist = true) {
         if (this._strategy === 'httpOnlyCookie') {
             return;
         }
-        this.setAccessToken(accessToken);
-        this.setRefreshToken(refreshToken);
+        this.cacheAccessToken(accessToken);
+        this.cacheRefreshToken(refreshToken);
         if (persist) {
             this.persistTokensInStorage();
         }
@@ -206,7 +205,7 @@ class AuthSession {
     setUser(user, persist = true) {
         this._user$.next(user ?? null);
         if (persist) {
-            this.persistUserInStorage();
+            this.setAuthenticated(!!user);
         }
     }
     clear() {
@@ -217,18 +216,15 @@ class AuthSession {
         if (!this._storage) {
             return;
         }
+        const authenticated = this._storage.get(this._authenticatedStorageKey);
+        this.setAuthenticated(!!authenticated);
         if (this._strategy === 'browserStorage') {
             // Set the access token.
             const accessToken = this._storage.get(this._accessTokenStorageKey);
-            this.setAccessToken(accessToken);
+            this.cacheAccessToken(accessToken);
             // Set the refresh token.
             const refreshToken = this._storage.get(this._refreshTokenStorageKey);
-            this.setRefreshToken(refreshToken);
-        }
-        // Set the user if we have any correct token payloads.
-        if ((this._accessTokenPayload || this._refreshTokenPayload) || this._strategy === 'httpOnlyCookie') {
-            const user = this._storage.get(this._userStorageKey);
-            this._user$.next(user ?? null); // Note: just settings here instead of setUser() because of syncing to the storage.
+            this.cacheRefreshToken(refreshToken);
         }
     }
     persistTokensInStorage() {
@@ -254,28 +250,37 @@ class AuthSession {
             this._storage.remove(this._refreshTokenStorageKey);
         }
     }
-    persistUserInStorage() {
+    persistAuthenticatedInStorage() {
         if (!this._storage) {
             return;
         }
-        const user = this._user$.getValue();
-        if (!user) {
-            return this._storage.remove(this._userStorageKey);
+        if (this._authenticated) {
+            const expires = this.refreshTokenPayload?.expiresAt
+                ?? this.accessTokenPayload?.expiresAt
+                ?? this.getNextYearDate();
+            this._storage.set(this._authenticatedStorageKey, this._authenticated, { expires });
+        }
+        else {
+            this._storage.remove(this._authenticatedStorageKey);
         }
-        const date = new Date();
-        date.setFullYear(date.getFullYear() + 1);
-        this._storage.set(this._userStorageKey, user, {
-            expires: new Date(date.getTime())
-        });
     }
-    setAccessToken(value) {
+    setAuthenticated(value, persist = true) {
+        this.cacheAuthenticated(value);
+        if (persist) {
+            this.persistAuthenticatedInStorage();
+        }
+    }
+    cacheAccessToken(value) {
         this._accessTokenString = value ?? null;
         this._accessTokenPayload = this._jwt.decode(this._accessTokenString);
     }
-    setRefreshToken(value) {
+    cacheRefreshToken(value) {
         this._refreshTokenString = value ?? null;
         this._refreshTokenPayload = this._jwt.decode(this._refreshTokenString);
     }
+    cacheAuthenticated(value) {
+        this._authenticated = !!value;
+    }
     generateKey(applicationId, key) {
         return [applicationId, key].join('_');
     }
@@ -285,6 +290,11 @@ class AuthSession {
         }
         return token?.expiresAt?.getTime() > Date.now();
     }
+    getNextYearDate() {
+        const date = new Date();
+        date.setFullYear(date.getFullYear() + 1);
+        return date;
+    }
 }
 
 class Auth {
@@ -318,11 +328,6 @@ class Auth {
         this.user = this.session.user;
     }
     async initialize() {
-        // Check if the app should bootstrap the authentication.
-        const shouldBootstrap = this._config?.bootstrap ?? true;
-        if (!shouldBootstrap) {
-            return this.handleAutoRefreshing();
-        }
         // Only retrieve from the server when we are actually authenticated.
         if (!this.session.authenticated()) {
             return;
@@ -529,10 +534,10 @@ class Auth {
             .filter(item => !!item)
             .join('/');
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.1", ngImport: i0, type: Auth, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.1", ngImport: i0, type: Auth, providedIn: 'root' });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.3", ngImport: i0, type: Auth, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.3", ngImport: i0, type: Auth, providedIn: 'root' });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.1", ngImport: i0, type: Auth, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.3", ngImport: i0, type: Auth, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -595,10 +600,10 @@ class BbAuthenticated {
         }
     }
     static ngAcceptInputType_bbAuthenticatedElse;
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.1", ngImport: i0, type: BbAuthenticated, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "19.2.1", type: BbAuthenticated, isStandalone: true, selector: "ng-template[bbAuthenticated]", inputs: { bbAuthenticatedElse: "bbAuthenticatedElse" }, ngImport: i0 });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.3", ngImport: i0, type: BbAuthenticated, deps: [], target: i0.ɵɵFactoryTarget.Directive });
+    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "19.2.3", type: BbAuthenticated, isStandalone: true, selector: "ng-template[bbAuthenticated]", inputs: { bbAuthenticatedElse: "bbAuthenticatedElse" }, ngImport: i0 });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.1", ngImport: i0, type: BbAuthenticated, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.3", ngImport: i0, type: BbAuthenticated, decorators: [{
             type: Directive,
             args: [{
                     selector: 'ng-template[bbAuthenticated]'
@@ -663,10 +668,10 @@ class BbAnonymous {
         }
     }
     static ngAcceptInputType_bbAnonymousElse;
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.1", ngImport: i0, type: BbAnonymous, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "19.2.1", type: BbAnonymous, isStandalone: true, selector: "ng-template[bbAnonymous]", inputs: { bbAnonymousElse: "bbAnonymousElse" }, ngImport: i0 });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.3", ngImport: i0, type: BbAnonymous, deps: [], target: i0.ɵɵFactoryTarget.Directive });
+    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "19.2.3", type: BbAnonymous, isStandalone: true, selector: "ng-template[bbAnonymous]", inputs: { bbAnonymousElse: "bbAnonymousElse" }, ngImport: i0 });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.1", ngImport: i0, type: BbAnonymous, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.3", ngImport: i0, type: BbAnonymous, decorators: [{
             type: Directive,
             args: [{
                     selector: 'ng-template[bbAnonymous]'
@@ -751,10 +756,10 @@ class Acting {
         const active$ = this._userId$.pipe(map(item => !!item), distinctUntilChanged());
         return combineLatestMap({ active: active$, user: this._auth.user });
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.1", ngImport: i0, type: Acting, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.1", ngImport: i0, type: Acting, providedIn: 'root' });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.3", ngImport: i0, type: Acting, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.3", ngImport: i0, type: Acting, providedIn: 'root' });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.1", ngImport: i0, type: Acting, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.3", ngImport: i0, type: Acting, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -776,10 +781,10 @@ class ActingInterceptor {
         });
         return next.handle(modified);
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.1", ngImport: i0, type: ActingInterceptor, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.1", ngImport: i0, type: ActingInterceptor });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.3", ngImport: i0, type: ActingInterceptor, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.3", ngImport: i0, type: ActingInterceptor });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.1", ngImport: i0, type: ActingInterceptor, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.3", ngImport: i0, type: ActingInterceptor, decorators: [{
             type: Injectable
         }] });
 
@@ -862,10 +867,10 @@ class AuthInterceptor {
         // Return the default access token.
         return this._auth.session.accessToken;
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.1", ngImport: i0, type: AuthInterceptor, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.1", ngImport: i0, type: AuthInterceptor });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.3", ngImport: i0, type: AuthInterceptor, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.3", ngImport: i0, type: AuthInterceptor });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.1", ngImport: i0, type: AuthInterceptor, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.3", ngImport: i0, type: AuthInterceptor, decorators: [{
             type: Injectable
         }] });
 
@@ -875,9 +880,6 @@ function provideAuthConfig(config) {
         { provide: HTTP_INTERCEPTORS, useClass: AuthInterceptor, multi: true },
         provideAppInitializer(() => inject(Auth).initialize())
     ];
-    if (config?.strategy === 'httpOnlyCookie' && !config?.bootstrap) {
-        throw new Error('the "bootstrap" option must be enabled when using strategy=httpOnlyCookie');
-    }
     if (config?.interceptActing) {
         providers.push({ provide: HTTP_INTERCEPTORS, useClass: ActingInterceptor, multi: true });
     }
@@ -893,11 +895,11 @@ class AuthModule {
             ]
         };
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.1", ngImport: i0, type: AuthModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-    static ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "19.2.1", ngImport: i0, type: AuthModule, imports: [BbAuthenticated], exports: [BbAuthenticated] });
-    static ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "19.2.1", ngImport: i0, type: AuthModule });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.3", ngImport: i0, type: AuthModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+    static ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "19.2.3", ngImport: i0, type: AuthModule, imports: [BbAuthenticated], exports: [BbAuthenticated] });
+    static ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "19.2.3", ngImport: i0, type: AuthModule });
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.1", ngImport: i0, type: AuthModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.3", ngImport: i0, type: AuthModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [BbAuthenticated],