@acorex/platform 21.0.0-next.71 → 21.0.0-next.73

package/contracts/README.md

@@ -0,0 +1,3 @@
+# @acorex/platform/contracts
+
+Secondary entry point of `@acorex/platform`. It can be used by importing from `@acorex/platform/contracts`.

package/fesm2022/acorex-platform-auth.mjs

@@ -39,6 +39,60 @@ class AXPApplicationDefaultLoader {
     }
 }
 
+//#region ---- Datasource keys ----
+/** Platform auth datasource registry names. */
+const AXPPlatformAuthDataSourceKeys = {
+    PermissionDefinitions: 'platform-permission-definitions',
+};
+//#endregion
+
+class AXPUnauthorizedError extends Error {
+    constructor(message, data) {
+        super(message);
+        this.data = data;
+        this.name = 'AXPUnauthorizedError';
+    }
+}
+class AXPUnauthenticatedError extends Error {
+    constructor(message, data) {
+        super(message);
+        this.data = data;
+        this.name = 'AXPUnauthenticatedError';
+    }
+}
+
+class AXPSessionContext {
+    get user() {
+        return this._user;
+    }
+    get tenant() {
+        return this._tenant;
+    }
+    get application() {
+        return this._application;
+    }
+    constructor(context) {
+        this._user = null;
+        this._tenant = null;
+        this._application = null;
+        this._user = context.user;
+        this._tenant = context.tenant;
+        this._application = context.application;
+    }
+}
+var AXPSessionStatus;
+(function (AXPSessionStatus) {
+    AXPSessionStatus["Authenticated"] = "authenticated";
+    AXPSessionStatus["Unauthenticated"] = "unauthenticated";
+    AXPSessionStatus["Unauthorized"] = "unauthorized";
+    AXPSessionStatus["Authorized"] = "authorized";
+    AXPSessionStatus["Expired"] = "expired";
+    AXPSessionStatus["SignedOut"] = "signedOut";
+})(AXPSessionStatus || (AXPSessionStatus = {}));
+
+//#region ---- Contracts barrel ----
+//#endregion
+
 const AXP_TENANT_LOADER = new InjectionToken('AXP_TENANT_LOADER', {
     providedIn: 'root',
     factory: () => {
@@ -149,21 +203,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                 type: Input
             }] } });
 
-class AXPUnauthorizedError extends Error {
-    constructor(message, data) {
-        super(message);
-        this.data = data;
-        this.name = 'AXPUnauthorizedError';
-    }
-}
-class AXPUnauthenticatedError extends Error {
-    constructor(message, data) {
-        super(message);
-        this.data = data;
-        this.name = 'AXPUnauthenticatedError';
-    }
-}
-
 const AXPFeatureGuard = (route, state) => {
     const sessionService = inject(AXPSessionService);
     const requiredFeatures = route.data['requiredFeature'];
@@ -205,35 +244,6 @@ class AXPPermissionDefaultLoader {
  */
 const AXP_PERMISSION_CHECKER = new InjectionToken('AXP_PERMISSION_CHECKER');
 
-class AXPSessionContext {
-    get user() {
-        return this._user;
-    }
-    get tenant() {
-        return this._tenant;
-    }
-    get application() {
-        return this._application;
-    }
-    constructor(context) {
-        this._user = null;
-        this._tenant = null;
-        this._application = null;
-        this._user = context.user;
-        this._tenant = context.tenant;
-        this._application = context.application;
-    }
-}
-var AXPSessionStatus;
-(function (AXPSessionStatus) {
-    AXPSessionStatus["Authenticated"] = "authenticated";
-    AXPSessionStatus["Unauthenticated"] = "unauthenticated";
-    AXPSessionStatus["Unauthorized"] = "unauthorized";
-    AXPSessionStatus["Authorized"] = "authorized";
-    AXPSessionStatus["Expired"] = "expired";
-    AXPSessionStatus["SignedOut"] = "signedOut";
-})(AXPSessionStatus || (AXPSessionStatus = {}));
-
 class AXPSessionService {
     constructor() {
         this.eventService = inject(AXPBroadcastEventService);
@@ -274,6 +284,13 @@ class AXPSessionService {
             return this.isAuthenticated$;
         }), shareReplay(1));
         this.isAuthorized$ = this.status$.pipe(map((status) => status === AXPSessionStatus.Authorized), shareReplay(1));
+        /** Waits for session restore to finish, then emits whether the session is fully authorized. */
+        this.isAuthorizedWithLoading$ = this.isLoading$.pipe(switchMap((loading) => {
+            if (loading) {
+                return this.isLoading$.pipe(filter((isLoading) => !isLoading), switchMap(() => this.isAuthorized$));
+            }
+            return this.isAuthorized$;
+        }), shareReplay(1));
     }
     static { this.SESSION_KEY = 'AXP_SESSION'; }
     get user() {
@@ -366,6 +383,7 @@ class AXPSessionService {
                     tenant: result.data?.tenant,
                     expiresIn: result.data?.expiresIn,
                     idToken: result.data?.idToken ?? null,
+                    locked: false,
                 });
                 await this.loadPermissions();
                 await this.loadFeatures();
@@ -525,15 +543,10 @@ class AXPSessionService {
         }, 100);
     }
     setSession(tokens) {
+        const existing = this.getSessionData() ?? {};
         const sessionData = {
-            accessToken: tokens.accessToken,
-            refreshToken: tokens.refreshToken,
-            strategy: tokens.strategy,
-            user: tokens.user,
-            application: tokens.application,
-            tenant: tokens.tenant,
-            expiresIn: tokens.expiresIn,
-            idToken: tokens.idToken,
+            ...existing,
+            ...tokens,
         };
         // Update subjects
         if (tokens.user) {
@@ -547,6 +560,18 @@ class AXPSessionService {
         }
         localStorage.setItem(AXPSessionService.SESSION_KEY, JSON.stringify(sessionData));
     }
+    /** Whether the client lock overlay should remain active after reload. */
+    isLocked() {
+        return this.getSessionData()?.locked === true;
+    }
+    /** Persists client lock state inside {@link AXPSessionService.SESSION_KEY}. */
+    setLocked(locked) {
+        const existing = this.getSessionData();
+        if (!existing) {
+            return;
+        }
+        this.setSession({ locked });
+    }
     setStrategy(strategy) {
         const sessionData = this.getSessionData();
         const newSessionData = { ...sessionData, strategy };
@@ -704,12 +729,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
 const AXPPermissionGuard = (route, state) => {
     const sessionService = inject(AXPSessionService);
     const permissionKeys = route.data['requiredPermission'];
-    return sessionService.isAuthorized$.pipe(first(), map((value) => {
+    return sessionService.isAuthorizedWithLoading$.pipe(first(), map((value) => {
+        debugger;
         const keys = !permissionKeys ? [] : Array.isArray(permissionKeys) ? permissionKeys : [permissionKeys];
         const hasPermission = keys.length == 0 || sessionService.authorize(...keys);
         if (!hasPermission) {
             throw new AXPUnauthorizedError(`Access denied. Required permissions: ${keys.join(', ')}. Please contact your administrator if you believe this is an error.`, {
-                redirectUrl: state.url
+                redirectUrl: state.url,
             });
         }
         return true;
@@ -921,10 +947,6 @@ function flattenPermissionDefinitions(nodes, groupPrefix) {
 }
 //#endregion
 //#region ---- Permission definitions data source ----
-/**
- * Registered permission definitions for select widgets via dataSource name {@link PERMISSION_DEFINITIONS_DATASOURCE_NAME}.
- */
-const PERMISSION_DEFINITIONS_DATASOURCE_NAME = 'platform-permission-definitions';
 /**
  * Data source definition for leaf permissions from {@link AXPPermissionDefinitionService#getGroups}.
  */
@@ -939,7 +961,7 @@ class AXPPermissionDefinitionsDataSourceDefinition {
     async items() {
         return [
             {
-                name: PERMISSION_DEFINITIONS_DATASOURCE_NAME,
+                name: AXPPlatformAuthDataSourceKeys.PermissionDefinitions,
                 title: 'Permissions',
                 source: () => new AXDataSource({
                     key: 'id',
@@ -1362,5 +1384,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { AXPAuthGuard, AXPAuthModule, AXPAuthStrategy, AXPAuthStrategyRegistryService, AXPFeatureDirective, AXPFeatureGuard, AXPLoginChallengeComponentBase, AXPLoginChallengeProvider, AXPPermissionDefinitionBuilder, AXPPermissionDefinitionGroupBuilder, AXPPermissionDefinitionProviderContext, AXPPermissionDefinitionService, AXPPermissionDefinitionsDataSourceDefinition, AXPPermissionDirective, AXPPermissionEvaluatorScopeProvider, AXPPermissionGuard, AXPSessionContext, AXPSessionService, AXPSessionStatus, AXPUnauthenticatedError, AXPUnauthorizedError, AXP_APPLICATION_LOADER, AXP_FEATURE_CHECKER, AXP_FEATURE_LOADER, AXP_LOGIN_CHALLENGE_PROVIDER, AXP_PERMISSION_CHECKER, AXP_PERMISSION_DEFINITION_PROVIDER, AXP_PERMISSION_LOADER, AXP_TENANT_LOADER, JwtUtil, PERMISSION_DEFINITIONS_DATASOURCE_NAME, PkceUtil, TimeUtil, initializeAppState };
+export { AXPAuthGuard, AXPAuthModule, AXPAuthStrategy, AXPAuthStrategyRegistryService, AXPFeatureDirective, AXPFeatureGuard, AXPLoginChallengeComponentBase, AXPLoginChallengeProvider, AXPPermissionDefinitionBuilder, AXPPermissionDefinitionGroupBuilder, AXPPermissionDefinitionProviderContext, AXPPermissionDefinitionService, AXPPermissionDefinitionsDataSourceDefinition, AXPPermissionDirective, AXPPermissionEvaluatorScopeProvider, AXPPermissionGuard, AXPPlatformAuthDataSourceKeys, AXPSessionContext, AXPSessionService, AXPSessionStatus, AXPUnauthenticatedError, AXPUnauthorizedError, AXP_APPLICATION_LOADER, AXP_FEATURE_CHECKER, AXP_FEATURE_LOADER, AXP_LOGIN_CHALLENGE_PROVIDER, AXP_PERMISSION_CHECKER, AXP_PERMISSION_DEFINITION_PROVIDER, AXP_PERMISSION_LOADER, AXP_TENANT_LOADER, JwtUtil, PkceUtil, TimeUtil, initializeAppState };
 //# sourceMappingURL=acorex-platform-auth.mjs.map