@tstdl/base 0.90.37 → 0.90.39

package/authentication/authentication.api.d.ts

@@ -42,8 +42,8 @@ export declare const authenticationApiDefinition: {
             resource: string;
             method: "POST";
             parameters: ObjectSchema<{
-                data: unknown;
                 subject: string;
+                data: unknown;
             }>;
             result: ObjectSchema<TokenPayloadBase>;
             credentials: true;
@@ -137,8 +137,8 @@ export declare function getAuthenticationApiDefinition<AdditionalTokenPayload ex
             resource: string;
             method: "POST";
             parameters: ObjectSchema<{
-                data: AuthenticationData;
                 subject: string;
+                data: AuthenticationData;
             }>;
             result: ObjectSchema<TokenPayload<AdditionalTokenPayload>>;
             credentials: true;
@@ -230,8 +230,8 @@ export declare function getAuthenticationApiEndpointsDefinition<AdditionalTokenP
         resource: string;
         method: "POST";
         parameters: ObjectSchema<{
-            data: AuthenticationData;
             subject: string;
+            data: AuthenticationData;
         }>;
         result: ObjectSchema<TokenPayload<AdditionalTokenPayload>>;
         credentials: true;

package/authentication/authentication.api.js

@@ -53,8 +53,8 @@ export function getAuthenticationApiEndpointsDefinition(additionalTokenPayloadSc
             resource: 'impersonate',
             method: 'POST',
             parameters: explicitObject({
-                data: authenticationDataSchema,
-                subject: string()
+                subject: string(),
+                data: authenticationDataSchema
             }),
             result: tokenResultSchema,
             credentials: true,

package/authentication/client/authentication.service.d.ts

@@ -10,7 +10,7 @@ export declare class AuthenticationClientService<AdditionalTokenPayload extends
     private readonly tokenUpdateBus;
     private readonly loggedOutBus;
     private readonly forceRefreshToken;
-    private readonly refreshLock;
+    private readonly lock;
     private readonly logger;
     private readonly disposeToken;
     readonly error$: import("rxjs").Observable<Error>;
@@ -29,6 +29,8 @@ export declare class AuthenticationClientService<AdditionalTokenPayload extends
     readonly loggedOut$: import("rxjs").Observable<void>;
     private get authenticationData();
     private set authenticationData(value);
+    private get impersonatorAuthenticationData();
+    private set impersonatorAuthenticationData(value);
     get definedToken(): TokenPayload<AdditionalTokenPayload>;
     get definedSubject(): string;
     get definedSessionId(): string;
@@ -43,6 +45,8 @@ export declare class AuthenticationClientService<AdditionalTokenPayload extends
     logout(): Promise<void>;
     requestRefresh(data?: AuthenticationData): void;
     refresh(data?: AuthenticationData): Promise<void>;
+    impersonate(subject: string, data?: AuthenticationData): Promise<void>;
+    unimpersonate(data?: AuthenticationData): Promise<void>;
     initResetSecret(subject: string, data: AdditionalInitSecretResetData): Promise<void>;
     resetSecret(token: string, newSecret: string): Promise<void>;
     checkSecret(secret: string): Promise<SecretCheckResult>;

package/authentication/client/authentication.service.js

@@ -30,6 +30,7 @@ import { assertDefinedPass, isDefined, isNullOrUndefined, isString, isUndefined
 import { AUTHENTICATION_API_CLIENT, INITIAL_AUTHENTICATION_DATA } from './tokens.js';
 const tokenStorageKey = 'AuthenticationService:token';
 const authenticationDataStorageKey = 'AuthenticationService:authentication-data';
+const impersonatorAuthenticationDataStorageKey = 'AuthenticationService:impersonator-authentication-data';
 const tokenUpdateBusName = 'AuthenticationService:tokenUpdate';
 const loggedOutBusName = 'AuthenticationService:loggedOut';
 const refreshLockResource = 'AuthenticationService:refresh';
@@ -39,7 +40,7 @@ let AuthenticationClientService = class AuthenticationClientService {
     tokenUpdateBus = inject((MessageBus), tokenUpdateBusName);
     loggedOutBus = inject((MessageBus), loggedOutBusName);
     forceRefreshToken = new CancellationToken();
-    refreshLock = inject(Lock, refreshLockResource, { optional: true });
+    lock = inject(Lock, refreshLockResource);
     logger = inject(Logger, 'AuthenticationService');
     disposeToken = new CancellationToken();
     error$ = this.errorSubject.asObservable();
@@ -69,6 +70,19 @@ let AuthenticationClientService = class AuthenticationClientService {
             localStorage.setItem(authenticationDataStorageKey, json);
         }
     }
+    get impersonatorAuthenticationData() {
+        const data = localStorage.getItem(impersonatorAuthenticationDataStorageKey);
+        return isNullOrUndefined(data) ? undefined : JSON.parse(data);
+    }
+    set impersonatorAuthenticationData(data) {
+        if (isUndefined(data)) {
+            localStorage.removeItem(impersonatorAuthenticationDataStorageKey);
+        }
+        else {
+            const json = JSON.stringify(data);
+            localStorage.setItem(impersonatorAuthenticationDataStorageKey, json);
+        }
+    }
     get definedToken() {
         return assertDefinedPass(this.token(), 'No token available.');
     }
@@ -144,6 +158,35 @@ let AuthenticationClientService = class AuthenticationClientService {
             throw error;
         }
     }
+    async impersonate(subject, data) {
+        await this.lock.use(10000, true, async () => {
+            this.impersonatorAuthenticationData = this.authenticationData;
+            this.authenticationData = data;
+            try {
+                const token = await this.client.impersonate({ subject, data: data });
+                this.setNewToken(token);
+            }
+            catch (error) {
+                await this.handleRefreshError(error);
+                throw error;
+            }
+        });
+    }
+    async unimpersonate(data) {
+        await this.lock.use(10000, true, async () => {
+            const newData = data ?? this.impersonatorAuthenticationData;
+            try {
+                const token = await this.client.unimpersonate({ data: newData });
+                this.authenticationData = newData;
+                this.impersonatorAuthenticationData = undefined;
+                this.setNewToken(token);
+            }
+            catch (error) {
+                await this.handleRefreshError(error);
+                throw error;
+            }
+        });
+    }
     async initResetSecret(subject, data) {
         await this.client.initSecretReset({ subject, data });
     }
@@ -180,12 +223,7 @@ let AuthenticationClientService = class AuthenticationClientService {
     async refreshLoop() {
         while (this.disposeToken.isUnset) {
             try {
-                if (isDefined(this.refreshLock)) {
-                    await this.refreshLock.use(0, false, async () => this.refreshLoopIteration());
-                }
-                else {
-                    await this.refreshLoopIteration();
-                }
+                await this.lock.use(0, false, async () => this.refreshLoopIteration());
                 await firstValueFrom(race([timer(2500), this.disposeToken, this.forceRefreshToken]));
             }
             catch {

package/authentication/server/helper.d.ts

@@ -7,7 +7,7 @@ import type { RefreshToken, SecretResetToken, Token } from '../models/index.js';
  * @param cookieName (default "authorization")
  * @returns token string
  */
-export declare function tryGetAuthorizationTokenStringFromRequest(request: HttpServerRequest, cookieName?: string, forceCookie?: boolean): string | undefined;
+export declare function tryGetAuthorizationTokenStringFromRequest(request: HttpServerRequest, cookieName?: string, fromCookieOnly?: boolean): string | undefined;
 export declare function tryGetTokenFromRequest<AdditionalTokenPayload extends Record = Record<never>>(request: HttpServerRequest, tokenVersion: number, secret: string | BinaryData): Promise<Token<AdditionalTokenPayload> | undefined>;
 export declare function getTokenFromRequest<AdditionalTokenPayload extends Record = Record<never>>(request: HttpServerRequest, tokenVersion: number, secret: string | BinaryData): Promise<Token<AdditionalTokenPayload>>;
 export declare function getTokenFromString<AdditionalTokenPayload extends Record = Record<never>>(tokenString: string, tokenVersion: number, secret: string | BinaryData): Promise<Token<AdditionalTokenPayload>>;

package/authentication/server/helper.js

@@ -9,8 +9,8 @@ import { isArray, isDefined, isUndefined } from '../../utils/type-guards.js';
  * @param cookieName (default "authorization")
  * @returns token string
  */
-export function tryGetAuthorizationTokenStringFromRequest(request, cookieName = 'authorization', forceCookie = false) {
-    const authorizationHeaders = forceCookie ? undefined : request.headers.tryGet('Authorization');
+export function tryGetAuthorizationTokenStringFromRequest(request, cookieName = 'authorization', fromCookieOnly = false) {
+    const authorizationHeaders = (fromCookieOnly || (cookieName.toLocaleLowerCase() != 'authorization')) ? undefined : request.headers.tryGet('Authorization');
     const authorizationString = (isArray(authorizationHeaders) ? authorizationHeaders[0] : authorizationHeaders)
         ?? request.cookies.tryGet(cookieName);
     if (isDefined(authorizationString)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.90.37",
+  "version": "0.90.39",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"