@dereekb/dbx-firebase 7.3.0 → 7.4.0

package/fesm2020/dereekb-dbx-firebase.mjs

@@ -1,4 +1,4 @@
-import { urlWithoutParameters, cachedGetter, addToSet, removeFromSet, filterMaybeValues, mapIterable, asArray, excludeValuesFromArray, containsStringAnyCase, addToSetCopy, forEachKeyValue, readableError, isMaybeSo, firstValue } from '@dereekb/util';
+import { urlWithoutParameters, AUTH_ADMIN_ROLE, cachedGetter, addToSet, removeFromSet, filterMaybeValues, mapIterable, asArray, excludeValuesFromArray, containsStringAnyCase, addToSetCopy, forEachKeyValue, readableError, isMaybeSo, firstValue } from '@dereekb/util';
 import * as i0 from '@angular/core';
 import { InjectionToken, Injectable, Inject, Optional, Component, Input, Directive, EventEmitter, Output, NgModule, Injector, forwardRef, Host } from '@angular/core';
 import { getToken, initializeAppCheck, ReCaptchaV3Provider } from 'firebase/app-check';
@@ -185,6 +185,9 @@ const DEFAULT_DBX_FIREBASE_AUTH_SERVICE_DELEGATE = {
     },
     isOnboarded(dbxFirebaseAuthService) {
         return dbxFirebaseAuthService.authUserState$.pipe(map((x) => x === 'user'));
+    },
+    isAdminInAuthRoleSet(authRoleSet) {
+        return authRoleSet.has(AUTH_ADMIN_ROLE);
     }
 };
 // MARK: Service
@@ -214,6 +217,7 @@ class DbxFirebaseAuthService {
         this.authRoles$ = delegate.authRolesObs(this);
         this.isOnboarded$ = delegate.isOnboarded(this);
         this._authRoleClaimsService = delegate.authRoleClaimsService;
+        this.isAdminInAuthRoleSet = delegate.isAdminInAuthRoleSet;
     }
     rolesForClaims(claims) {
         let result;
@@ -227,7 +231,15 @@ class DbxFirebaseAuthService {
         return result;
     }
     getAuthContextInfo() {
-        return firstValueFrom(this.authUser$).then((user) => (user ? new DbxFirebaseAuthContextInfo(this, user) : undefined));
+        return firstValueFrom(this.authUser$).then((user) => this.loadAuthContextInfoForUser(user));
+    }
+    async loadAuthContextInfoForUser(user) {
+        let result;
+        if (user) {
+            const jwtToken = await user.getIdTokenResult();
+            result = new DbxFirebaseAuthContextInfo(this, user, jwtToken);
+        }
+        return result;
     }
     logInWithGoogle() {
         return this.logInWithPopup(new GoogleAuthProvider());
@@ -282,19 +294,31 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.2", ngImpor
  * FirebaseAuthContextInfo implementation from DbxFirebaseAuthService.
  */
 class DbxFirebaseAuthContextInfo {
-    constructor(service, user) {
+    constructor(service, user, jwtToken) {
         this.service = service;
         this.user = user;
+        this.jwtToken = jwtToken;
         this._token = cachedGetter(() => firebaseAuthTokenFromUser(this.user));
+        this._roles = cachedGetter(() => this.service.rolesForClaims(this.getClaims()));
+        this._isAdmin = cachedGetter(() => this.service.isAdminInAuthRoleSet(this._roles()));
     }
     get uid() {
         return this.user.uid;
     }
+    isAdmin() {
+        return this._isAdmin();
+    }
+    getClaims() {
+        return this.jwtToken.claims;
+    }
+    getAuthRoles() {
+        return this._roles();
+    }
     loadClaims() {
-        return this.user.getIdTokenResult().then((x) => x.claims);
+        return Promise.resolve(this.getClaims());
     }
     loadAuthRoles() {
-        return this.loadClaims().then((x) => this.service.rolesForClaims(x));
+        return Promise.resolve(this.getAuthRoles());
     }
     get token() {
         return this._token();
@@ -1401,6 +1425,7 @@ function defaultDbxFirebaseAuthServiceDelegateWithClaimsService(config) {
         authUserStateObs: DEFAULT_DBX_FIREBASE_AUTH_SERVICE_DELEGATE.authUserStateObs,
         authRolesObs: authRolesObsWithClaimsService(config),
         isOnboarded: DEFAULT_DBX_FIREBASE_AUTH_SERVICE_DELEGATE.isOnboarded,
+        isAdminInAuthRoleSet: config.isAdminInAuthRoleSet ?? DEFAULT_DBX_FIREBASE_AUTH_SERVICE_DELEGATE.isAdminInAuthRoleSet,
         authRoleClaimsService: config.claimsService
     };
 }