@tstdl/base 0.93.112 → 0.93.114

package/api/server/api-request-token.provider.js

@@ -4,13 +4,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+import { InvalidTokenError } from '../../errors/invalid-token.error.js';
 import { Singleton } from '../../injector/decorators.js';
 import { isNull } from '../../utils/type-guards.js';
 export class ApiRequestTokenProvider {
     async getToken(data) {
         const token = await this.tryGetToken(data);
         if (isNull(token)) {
-            throw new Error('No token available for request');
+            throw new InvalidTokenError('No token available for request');
         }
         return token;
     }

package/authentication/client/http-client.middleware.d.ts

@@ -7,6 +7,12 @@ import type { AuthenticationClientService } from './authentication.service.js';
  * @returns A http client middleware.
  */
 export declare function waitForAuthenticationCredentialsMiddleware(authenticationServiceOrProvider: ValueOrAsyncProvider<AuthenticationClientService>): HttpClientMiddleware;
+/**
+ * A http client middleware that logs out the user if a request fails with a 401 Unauthorized error.
+ * @param authenticationServiceOrProvider The authentication service or a provider for it.
+ * @returns A http client middleware.
+ */
+export declare function logoutOnUnauthorizedMiddleware(authenticationServiceOrProvider: ValueOrAsyncProvider<AuthenticationClientService>): HttpClientMiddleware;
 /**
  * A http client middleware that adds authentication tokens to outgoing requests and extracts them from incoming responses.
  * @param authenticationServiceOrProvider The authentication service or a provider for it.

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

@@ -1,4 +1,5 @@
 import { firstValueFrom, timeout } from 'rxjs';
+import { HttpError } from '../../http/index.js';
 import { isDefined } from '../../utils/type-guards.js';
 import { cacheValueOrAsyncProvider } from '../../utils/value-or-provider.js';
 import { dontWaitForValidToken } from '../authentication.api.js';
@@ -21,6 +22,27 @@ export function waitForAuthenticationCredentialsMiddleware(authenticationService
     }
     return waitForAuthenticationCredentialsMiddleware;
 }
+/**
+ * A http client middleware that logs out the user if a request fails with a 401 Unauthorized error.
+ * @param authenticationServiceOrProvider The authentication service or a provider for it.
+ * @returns A http client middleware.
+ */
+export function logoutOnUnauthorizedMiddleware(authenticationServiceOrProvider) {
+    const getAuthenticationService = cacheValueOrAsyncProvider(authenticationServiceOrProvider);
+    async function logoutOnUnauthorizedMiddleware(_context, next) {
+        try {
+            await next();
+        }
+        catch (error) {
+            if ((error instanceof HttpError) && (error.response?.statusCode == 401)) {
+                const authenticationService = await getAuthenticationService();
+                await authenticationService.logout();
+            }
+            throw error;
+        }
+    }
+    return logoutOnUnauthorizedMiddleware;
+}
 /**
  * A http client middleware that adds authentication tokens to outgoing requests and extracts them from incoming responses.
  * @param authenticationServiceOrProvider The authentication service or a provider for it.

package/authentication/client/module.js

@@ -3,7 +3,7 @@ import { getCurrentInjector } from '../../injector/inject.js';
 import { Injector } from '../../injector/injector.js';
 import { isDefined } from '../../utils/type-guards.js';
 import { AuthenticationClientService } from './authentication.service.js';
-import { authenticationMiddleware, waitForAuthenticationCredentialsMiddleware } from './http-client.middleware.js';
+import { authenticationMiddleware, logoutOnUnauthorizedMiddleware, waitForAuthenticationCredentialsMiddleware } from './http-client.middleware.js';
 import { AUTHENTICATION_API_CLIENT, INITIAL_AUTHENTICATION_DATA } from './tokens.js';
 /**
  * Configures authentication client services.
@@ -24,6 +24,12 @@ export function configureAuthenticationClient(config, injector = getCurrentInjec
                 return waitForAuthenticationCredentialsMiddleware(authenticationService);
             },
         }, { multi: true });
+        (injector ?? Injector).register(HTTP_CLIENT_MIDDLEWARE, {
+            useFactory(_, context) {
+                const authenticationService = context.resolve(AuthenticationClientService, undefined, { forwardRef: true, forwardRefTypeHint: 'object' });
+                return logoutOnUnauthorizedMiddleware(authenticationService);
+            },
+        }, { multi: true });
         (injector ?? Injector).register(HTTP_CLIENT_MIDDLEWARE, {
             useFactory(_, context) {
                 const authenticationService = context.resolve(AuthenticationClientService, undefined, { forwardRef: true, forwardRefTypeHint: 'object' });

package/authentication/server/authentication.api-controller.d.ts

@@ -44,7 +44,7 @@ export declare class AuthenticationApiController<AdditionalTokenPayload extends
     /**
      * End a session.
      * @param request The request context.
-     * @returns 'ok' if the session was ended.
+     * @returns 'ok'
      */
     endSession({ request, getAuditor }: ApiRequestContext<AuthenticationApiDefinition<AdditionalTokenPayload, AuthenticationData, AdditionalInitSecretResetData>, 'endSession'>): Promise<ApiServerResult<AuthenticationApiDefinition<AdditionalTokenPayload, AuthenticationData, AdditionalInitSecretResetData>, 'endSession'>>;
     changeSecret({ parameters, getAuditor }: ApiRequestContext<AuthenticationApiDefinition<AdditionalTokenPayload, AuthenticationData, AdditionalInitSecretResetData>, 'changeSecret'>): Promise<ApiServerResult<AuthenticationApiDefinition<AdditionalTokenPayload, AuthenticationData, AdditionalInitSecretResetData>, 'changeSecret'>>;

package/authentication/server/authentication.api-controller.js

@@ -69,7 +69,7 @@ let AuthenticationApiController = class AuthenticationApiController {
     /**
      * End a session.
      * @param request The request context.
-     * @returns 'ok' if the session was ended.
+     * @returns 'ok'
      */
     async endSession({ request, getAuditor }) {
         let sessionId;
@@ -85,10 +85,12 @@ let AuthenticationApiController = class AuthenticationApiController {
                 sessionId = refreshToken.payload.session;
             }
             catch {
-                throw error;
+                // ignore
             }
         }
-        await this.authenticationService.endSession(sessionId, await getAuditor());
+        if (isDefined(sessionId)) {
+            await this.authenticationService.endSession(sessionId, await getAuditor());
+        }
         const result = 'ok';
         return new HttpServerResponse({
             cookies: {

package/authentication/server/helper.js

@@ -22,12 +22,15 @@ export function tryGetAuthorizationTokenStringFromRequest(request, cookieName =
     const authorizationString = (isArray(headerValue) ? headerValue[0] : headerValue)
         ?? request.cookies.tryGet(cookieName);
     if (isDefined(authorizationString)) {
-        const authorizationSchemeEnd = authorizationString.indexOf(' ');
-        const authorizationScheme = authorizationString.slice(0, authorizationSchemeEnd).trim().toLowerCase();
+        const spaceIndex = authorizationString.indexOf(' ');
+        if (spaceIndex == -1) {
+            return authorizationString;
+        }
+        const authorizationScheme = authorizationString.slice(0, spaceIndex).trim().toLowerCase();
         if (authorizationScheme != 'bearer') {
             throw new BadRequestError(`Unsupported authorization scheme "${authorizationScheme}".`);
         }
-        const authorization = authorizationString.slice(authorizationSchemeEnd).trim();
+        const authorization = authorizationString.slice(spaceIndex).trim();
         return authorization;
     }
     return undefined;

package/authentication/tests/helper.test.js

@@ -17,6 +17,17 @@ describe('authentication helper', () => {
         };
         expect(tryGetAuthorizationTokenStringFromRequest(request)).toBe('my-token');
     });
+    test('tryGetAuthorizationTokenStringFromRequest should extract token without scheme from header', () => {
+        const request = {
+            headers: {
+                tryGet: (name) => name == 'Authorization' ? 'my-token' : undefined,
+            },
+            cookies: {
+                tryGet: () => undefined,
+            },
+        };
+        expect(tryGetAuthorizationTokenStringFromRequest(request)).toBe('my-token');
+    });
     test('tryGetAuthorizationTokenStringFromRequest should extract bearer token from cookie', () => {
         const request = {
             headers: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.93.112",
+  "version": "0.93.114",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"
@@ -152,7 +152,7 @@
   },
   "peerDependencies": {
     "@genkit-ai/google-genai": "^1.28",
-    "@google-cloud/storage": "^7.18",
+    "@google-cloud/storage": "^7.19",
     "@google/genai": "^1.40",
     "@toon-format/toon": "^2.1.0",
     "@tstdl/angular": "^0.93",