@acorex-platform/framework-client 0.0.61 → 0.0.63

package/fesm2022/acorex-platform-framework-client-auth.mjs

@@ -4,9 +4,9 @@ import { map, BehaviorSubject, shareReplay, defaultIfEmpty, switchMap, filter, d
 import { AXPDebugService, AXPBroadcastEventService, AXP_SESSION_SERVICE, AXP_EXPRESSION_EVALUATOR_SCOPE_PROVIDER, provideAppStartUpTask, AXP_APP_STARTUP_PRIORITY } from '@acorex-platform/framework-client/core';
 import { Router } from '@angular/router';
 import { isEmpty } from 'lodash-es';
+import { coerceUnknownToTrimmedString, runtimeQueryCollectionData, runtimeQueryObjectData, runtimeCommandPayloadData } from '@acorex-platform/framework-shared/core';
 import { AXPCommandService, AXPQueryService } from '@acorex-platform/framework-client/runtime';
 import { AUTH_LOGOUT_DEFAULT, AUTH_REFRESH_DEFAULT, AUTH_UPDATE_SESSION_DEFAULT, AUTH_LIST_OWN_DEVICE_SESSIONS_DEFAULT, AUTH_TERMINATE_OWN_DEVICE_SESSION_DEFAULT, AUTH_LIST_PROVIDERS_DEFAULT } from '@acorex-platform/framework-shared/runtime';
-import { runtimeQueryCollectionData, runtimeQueryObjectData, runtimeCommandPayloadData } from '@acorex-platform/framework-shared/core';
 
 const AXP_APPLICATION_LOADER = new InjectionToken('AXP_APPLICATION_LOADER', {
     providedIn: 'root',
@@ -555,6 +555,25 @@ function isDefinitiveAuthRefreshFailure(error) {
 }
 //#endregion
 
+//#region ----- Imports -----
+//#endregion
+//#region ----- Session actor ids -----
+/**
+ * Session contracts type actor ids as strings. Hosts may still send numeric ids.
+ * Returns the same reference when `id` is already a non-empty trimmed string.
+ */
+function normalizeSessionActorId(actor) {
+    if (actor == null) {
+        return actor;
+    }
+    const id = coerceUnknownToTrimmedString(actor.id);
+    if (!id || actor.id === id) {
+        return actor;
+    }
+    return { ...actor, id };
+}
+//#endregion
+
 //#region ----- Soft restore authorization status -----
 /**
  * After soft restore: keep identity without promoting to Authorized when
@@ -982,7 +1001,6 @@ class AXPSessionService {
         this.clearCatalogCaches();
         this.permissionsSubject.next([]);
         this.featuresSubject.next([]);
-        this.currentUserSubject.next(result.data.user);
         this.setSession({
             strategy,
             user: result.data.user,
@@ -1051,7 +1069,6 @@ class AXPSessionService {
                     this.featuresSubject.next([]);
                     this.invalidateAccessPolicyCache();
                 }
-                this.currentUserSubject.next(result.data.user);
                 this.setSession({
                     strategy: strategyName,
                     user: result.data.user,
@@ -1381,24 +1398,29 @@ class AXPSessionService {
         this.status.next(AXPSessionStatus.Authenticated);
     }
     setSession(partial) {
-        const existing = this.getSessionData() ?? { strategy: partial.strategy ?? 'user-pass' };
+        const existing = this.getSessionData() ?? {
+            strategy: partial.strategy ?? 'user-pass',
+        };
         const sessionData = {
             ...existing,
             ...partial,
             strategy: partial.strategy ?? existing.strategy ?? 'user-pass',
+            user: normalizeSessionActorId('user' in partial ? partial.user : existing.user),
+            tenant: normalizeSessionActorId('tenant' in partial ? partial.tenant : existing.tenant),
+            application: normalizeSessionActorId('application' in partial ? partial.application : existing.application),
         };
         // Never persist tokens in browser storage — HttpOnly cookies are authoritative.
         delete sessionData.accessToken;
         delete sessionData.refreshToken;
         delete sessionData.idToken;
         if (partial.user) {
-            this.currentUserSubject.next(partial.user);
+            this.currentUserSubject.next(sessionData.user ?? null);
         }
         if ('tenant' in partial) {
-            this.currentTenantSubject.next(partial.tenant ?? null);
+            this.currentTenantSubject.next(sessionData.tenant ?? null);
         }
         if ('application' in partial) {
-            this.currentApplicationSubject.next(partial.application ?? null);
+            this.currentApplicationSubject.next(sessionData.application ?? null);
         }
         localStorage.setItem(AXPSessionService.SESSION_KEY, JSON.stringify(sessionData));
     }
@@ -1434,7 +1456,12 @@ class AXPSessionService {
             const sessionDataString = localStorage.getItem(AXPSessionService.SESSION_KEY);
             if (sessionDataString) {
                 const sessionData = JSON.parse(sessionDataString);
-                return sessionData;
+                return {
+                    ...sessionData,
+                    user: normalizeSessionActorId(sessionData.user),
+                    tenant: normalizeSessionActorId(sessionData.tenant),
+                    application: normalizeSessionActorId(sessionData.application),
+                };
             }
             else {
                 return null;