@tstdl/base 0.93.144 → 0.93.145

package/authentication/authentication.api.d.ts

@@ -126,6 +126,9 @@ export declare const authenticationApiDefinition: {
         timestamp: {
             resource: string;
             result: import("../schema/index.js").NumberSchema;
+            data: {
+                [dontWaitForValidToken]: boolean;
+            };
         };
     };
 };
@@ -248,6 +251,9 @@ export declare function getAuthenticationApiDefinition<AdditionalTokenPayload ex
         timestamp: {
             resource: string;
             result: import("../schema/index.js").NumberSchema;
+            data: {
+                [dontWaitForValidToken]: boolean;
+            };
         };
     };
 };
@@ -365,6 +371,9 @@ export declare function getAuthenticationApiEndpointsDefinition<AdditionalTokenP
     timestamp: {
         resource: string;
         result: import("../schema/index.js").NumberSchema;
+        data: {
+            [dontWaitForValidToken]: boolean;
+        };
     };
 };
 export {};

package/authentication/authentication.api.js

@@ -147,6 +147,9 @@ export function getAuthenticationApiEndpointsDefinition(additionalTokenPayloadSc
         timestamp: {
             resource: 'timestamp',
             result: number(),
+            data: {
+                [dontWaitForValidToken]: true,
+            },
         },
     };
 }

package/authentication/client/authentication.service.js

@@ -420,7 +420,7 @@ let AuthenticationClientService = class AuthenticationClientService {
                         if (stillNeedsRefresh) {
                             await this.refresh();
                         }
-                        if (this.forceRefreshRequested() && (this.token() != currentToken)) {
+                        if (this.forceRefreshRequested() && (this.token()?.jti != currentToken?.jti)) {
                             this.forceRefreshRequested.set(false);
                         }
                     });
@@ -428,7 +428,7 @@ let AuthenticationClientService = class AuthenticationClientService {
                         // Lock held by another instance, wait 5 seconds or until token changes (Passive Sync)
                         const changeReason = await firstValueFrom(race([
                             timer(5000).pipe(map(() => 'timer')),
-                            this.token$.pipe(filter((t) => t != token), map(() => 'token')),
+                            this.token$.pipe(filter((t) => t?.jti != token.jti), map(() => 'token')),
                             from(this.disposeSignal),
                         ]), { defaultValue: undefined });
                         if (changeReason == 'token') {
@@ -442,7 +442,7 @@ let AuthenticationClientService = class AuthenticationClientService {
                 const delay = Math.min(maxRefreshDelay, ((currentToken?.exp ?? 0) - this.estimatedServerTimestampSeconds() - currentRefreshBufferSeconds) * millisecondsPerSecond);
                 const wakeUpSignals = [
                     from(this.disposeSignal),
-                    this.token$.pipe(filter((t) => t != currentToken)),
+                    this.token$.pipe(filter((t) => t?.jti != currentToken?.jti)),
                 ];
                 if (!forceRefresh) {
                     wakeUpSignals.push(this.forceRefreshRequested$.pipe(filter((requested) => requested)));
@@ -451,7 +451,7 @@ let AuthenticationClientService = class AuthenticationClientService {
                     await firstValueFrom(race([timer(delay), ...wakeUpSignals]), { defaultValue: undefined });
                 }
                 else {
-                    await firstValueFrom(race([timer(5000), ...wakeUpSignals]), { defaultValue: undefined });
+                    await firstValueFrom(race([timer(2500), ...wakeUpSignals]), { defaultValue: undefined });
                 }
             }
             catch (error) {
@@ -460,7 +460,7 @@ let AuthenticationClientService = class AuthenticationClientService {
                 await firstValueFrom(race([
                     timer(2500),
                     from(this.disposeSignal),
-                    this.token$.pipe(filter((t) => t != currentToken)),
+                    this.token$.pipe(filter((t) => t?.jti != currentToken?.jti)),
                     this.forceRefreshRequested$.pipe(filter((requested) => requested), skip(this.forceRefreshRequested() ? 1 : 0)),
                 ]), { defaultValue: undefined });
             }

package/authentication/client/http-client.middleware.js

@@ -1,5 +1,6 @@
-import { firstValueFrom, race, timeout } from 'rxjs';
+import { firstValueFrom, race, timeout as rxjsTimeout } from 'rxjs';
 import { HttpError } from '../../http/index.js';
+import { timeout } from '../../utils/timing.js';
 import { isDefined } from '../../utils/type-guards.js';
 import { cacheValueOrAsyncProvider } from '../../utils/value-or-provider.js';
 import { dontWaitForValidToken } from '../authentication.api.js';
@@ -19,10 +20,13 @@ export function waitForAuthenticationCredentialsMiddleware(authenticationService
                     authenticationService.validToken$,
                     request.cancellationSignal,
                 ]);
-                await firstValueFrom(race$.pipe(timeout(30000))).catch(() => undefined);
+                await firstValueFrom(race$.pipe(rxjsTimeout(30000))).catch(() => undefined);
                 if (request.cancellationSignal.isSet) {
                     break;
                 }
+                if (!authenticationService.hasValidToken && authenticationService.isLoggedIn()) {
+                    await timeout(100);
+                }
             }
         }
         await next();

package/authentication/tests/authentication.client-middleware.test.js

@@ -21,6 +21,41 @@ describe('waitForAuthenticationCredentialsMiddleware', () => {
         await middleware({ request }, next);
         expect(next).toHaveBeenCalled();
     });
+    test('should NOT wait if endpoint has dontWaitForValidToken', async () => {
+        const authenticationServiceMock = {
+            isLoggedIn: vi.fn().mockReturnValue(true),
+            hasValidToken: false,
+        };
+        const middleware = waitForAuthenticationCredentialsMiddleware(authenticationServiceMock);
+        const request = new HttpClientRequest('http://localhost');
+        request.context = {
+            endpoint: {
+                credentials: true,
+                data: {
+                    [dontWaitForValidToken]: true,
+                },
+            },
+        };
+        const next = vi.fn().mockResolvedValue(undefined);
+        await middleware({ request }, next);
+        expect(next).toHaveBeenCalled();
+    });
+    test('should NOT wait if credentials is NOT true', async () => {
+        const authenticationServiceMock = {
+            isLoggedIn: vi.fn().mockReturnValue(true),
+            hasValidToken: false,
+        };
+        const middleware = waitForAuthenticationCredentialsMiddleware(authenticationServiceMock);
+        const request = new HttpClientRequest('http://localhost');
+        request.context = {
+            endpoint: {
+                credentials: false,
+            },
+        };
+        const next = vi.fn().mockResolvedValue(undefined);
+        await middleware({ request }, next);
+        expect(next).toHaveBeenCalled();
+    });
 });
 describe('logoutOnUnauthorizedMiddleware', () => {
     test('should call logout on 401 error', async () => {

package/authentication/tests/authentication.client-service-refresh.test.js

@@ -123,4 +123,11 @@ describe('AuthenticationClientService Refresh Loop Reproduction', () => {
         // If it busy loops, this will be much higher than 1.
         expect(mockLock.tryUse.mock.calls.length).toBeLessThan(5);
     });
+    test('refresh() should call timestamp() to sync clock', async () => {
+        service = injector.resolve(AuthenticationClientService);
+        const newToken = { iat: 1000, exp: 2000, jti: 'new' };
+        mockApiClient.refresh.mockResolvedValue(newToken);
+        await service.refresh();
+        expect(mockApiClient.timestamp).toHaveBeenCalled();
+    });
 });

package/package.json

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