@tstdl/base 0.93.194 → 0.93.196

package/api/server/error-handler.d.ts

@@ -1,4 +1,4 @@
 import type { HttpServerResponse } from '../../http/server/index.js';
 import type { Logger } from '../../logger/index.js';
 import type { Type } from '../../types/index.js';
-export declare function handleApiError(error: unknown, response: HttpServerResponse, supressedErrors: Set<Type<Error>>, logger: Logger): HttpServerResponse;
+export declare function handleApiError(error: unknown, response: HttpServerResponse, supressedErrors: Set<Type<Error>>, logger: Logger): void;

package/api/server/error-handler.js

@@ -3,5 +3,4 @@ export function handleApiError(error, response, supressedErrors, logger) {
     const { statusCode, errorResponse } = logAndGetErrorResponse(logger, supressedErrors, error);
     response.statusCode = statusCode;
     response.body = { json: errorResponse };
-    return response;
 }

package/api/types.d.ts

@@ -109,12 +109,12 @@ export type ApiEndpointParametersSchema<T extends ApiDefinition, K extends ApiEn
 export type ApiEndpointBodySchema<T extends ApiDefinition, K extends ApiEndpointKeys<T>> = NonUndefinable<ApiEndpoint<T, K>['body']>;
 export type ApiEndpointResultSchema<T extends ApiDefinition, K extends ApiEndpointKeys<T>> = NonUndefinable<ApiEndpoint<T, K>['result']>;
 export type ApiBinaryType = typeof Uint8Array | typeof Blob | typeof ReadableStream;
-export type ApiInputType<T extends SchemaTestable> = T extends ApiBinaryType ? InstanceType<Exclude<ApiBinaryType, typeof ReadableStream> | typeof ReadableStream<Uint8Array<ArrayBuffer>>> : T extends typeof ServerSentEvents ? ServerSentEventsSource : T extends typeof DataStream<infer U> ? AsyncIterable<U> | DataStreamSource<U> : T extends SchemaTestable ? SchemaOutput<T> : never;
-export type ApiOutputType<T extends SchemaTestable> = T extends typeof ReadableStream ? ReadableStream<Uint8Array<ArrayBuffer>> : T extends typeof DataStream<infer U> ? Observable<U> : T extends SchemaTestable ? SchemaOutput<T> : never;
+export type ApiInputType<T extends SchemaTestable> = T extends ApiBinaryType ? InstanceType<Exclude<ApiBinaryType, typeof ReadableStream> | typeof ReadableStream<Uint8Array<ArrayBuffer>>> : T extends typeof ServerSentEvents ? ServerSentEventsSource : T extends typeof DataStream<infer U> ? AsyncIterable<U> | DataStreamSource<U> : SchemaOutput<T>;
+export type ApiOutputType<T extends SchemaTestable> = T extends typeof ReadableStream ? ReadableStream<Uint8Array<ArrayBuffer>> : T extends typeof DataStream<infer U> ? Observable<U> : SchemaOutput<T>;
 export type ApiParameters<T extends ApiDefinition, K extends ApiEndpointKeys<T>> = ApiInputType<ApiEndpointParametersSchema<T, K>>;
 export type ApiClientBody<T extends ApiDefinition, K extends ApiEndpointKeys<T>> = ApiInputType<ApiEndpointBodySchema<T, K>>;
-export type ApiServerBody<T extends ApiDefinition, K extends ApiEndpointKeys<T>> = ApiOutputType<ApiEndpointBodySchema<T, K>>;
-export type ApiServerResult<T extends ApiDefinition, K extends ApiEndpointKeys<T>> = ApiInputType<ApiEndpointResultSchema<T, K>> | HttpServerResponse;
+export type ApiServerBody<T extends ApiDefinition, K extends ApiEndpointKeys<T>> = ApiOutputType<ApiEndpointResultSchema<T, K>>;
+export type ApiServerResult<T extends ApiDefinition, K extends ApiEndpointKeys<T>> = ApiInputType<ApiEndpointResultSchema<T, K>> | HttpServerResponse<ApiServerBody<T, K>>;
 export type ApiClientResult<T extends ApiDefinition, K extends ApiEndpointKeys<T>> = ApiOutputType<ApiEndpointResultSchema<T, K>>;
 export type ApiRequestData<T extends ApiDefinition = ApiDefinition, K extends ApiEndpointKeys<T> = ApiEndpointKeys<T>> = {
     parameters: ApiParameters<T, K>;

package/authentication/authentication.api.d.ts

@@ -36,7 +36,6 @@ export declare const authenticationApiDefinition: {
             result: import("../schema/index.js").UnionSchema<[ObjectSchema<{
                 type: "success";
                 result: TokenPayload<import("type-fest").EmptyObject>;
-                lowRecoveryCodesWarning?: boolean | undefined;
             }>, ObjectSchema<{
                 type: "totp";
                 challengeToken: string;
@@ -56,7 +55,6 @@ export declare const authenticationApiDefinition: {
             result: ObjectSchema<{
                 type: "success";
                 result: TokenPayload<import("type-fest").EmptyObject>;
-                lowRecoveryCodesWarning?: boolean | undefined;
             }>;
             credentials: true;
             data: {
@@ -73,7 +71,6 @@ export declare const authenticationApiDefinition: {
             result: ObjectSchema<{
                 type: "success";
                 result: TokenPayload<import("type-fest").EmptyObject>;
-                lowRecoveryCodesWarning?: boolean | undefined;
             }>;
             credentials: true;
             data: {
@@ -265,8 +262,7 @@ export declare function getAuthenticationApiDefinition<AdditionalTokenPayload ex
             }>;
             result: import("../schema/index.js").UnionSchema<[ObjectSchema<{
                 type: "success";
-                result: import("../schema/schema.js").SchemaOutput<ObjectSchema<TokenPayload<AdditionalTokenPayload>>>;
-                lowRecoveryCodesWarning?: boolean | undefined;
+                result: TokenPayload<AdditionalTokenPayload>;
             }>, ObjectSchema<{
                 type: "totp";
                 challengeToken: string;
@@ -285,8 +281,7 @@ export declare function getAuthenticationApiDefinition<AdditionalTokenPayload ex
             }>;
             result: ObjectSchema<{
                 type: "success";
-                result: import("../schema/schema.js").SchemaOutput<ObjectSchema<TokenPayload<AdditionalTokenPayload>>>;
-                lowRecoveryCodesWarning?: boolean | undefined;
+                result: TokenPayload<AdditionalTokenPayload>;
             }>;
             credentials: true;
             data: {
@@ -302,8 +297,7 @@ export declare function getAuthenticationApiDefinition<AdditionalTokenPayload ex
             }>;
             result: ObjectSchema<{
                 type: "success";
-                result: import("../schema/schema.js").SchemaOutput<ObjectSchema<TokenPayload<AdditionalTokenPayload>>>;
-                lowRecoveryCodesWarning?: boolean | undefined;
+                result: TokenPayload<AdditionalTokenPayload>;
             }>;
             credentials: true;
             data: {
@@ -490,8 +484,7 @@ export declare function getAuthenticationApiEndpointsDefinition<AdditionalTokenP
         }>;
         result: import("../schema/index.js").UnionSchema<[ObjectSchema<{
             type: "success";
-            result: import("../schema/schema.js").SchemaOutput<ObjectSchema<TokenPayload<AdditionalTokenPayload>>>;
-            lowRecoveryCodesWarning?: boolean | undefined;
+            result: TokenPayload<AdditionalTokenPayload>;
         }>, ObjectSchema<{
             type: "totp";
             challengeToken: string;
@@ -510,8 +503,7 @@ export declare function getAuthenticationApiEndpointsDefinition<AdditionalTokenP
         }>;
         result: ObjectSchema<{
             type: "success";
-            result: import("../schema/schema.js").SchemaOutput<ObjectSchema<TokenPayload<AdditionalTokenPayload>>>;
-            lowRecoveryCodesWarning?: boolean | undefined;
+            result: TokenPayload<AdditionalTokenPayload>;
         }>;
         credentials: true;
         data: {
@@ -527,8 +519,7 @@ export declare function getAuthenticationApiEndpointsDefinition<AdditionalTokenP
         }>;
         result: ObjectSchema<{
             type: "success";
-            result: import("../schema/schema.js").SchemaOutput<ObjectSchema<TokenPayload<AdditionalTokenPayload>>>;
-            lowRecoveryCodesWarning?: boolean | undefined;
+            result: TokenPayload<AdditionalTokenPayload>;
         }>;
         credentials: true;
         data: {

package/authentication/authentication.api.js

@@ -47,7 +47,6 @@ export function getAuthenticationApiEndpointsDefinition(additionalTokenPayloadSc
     const loginSuccessResultSchema = object({
         type: literal('success'),
         result: tokenResultSchema,
-        lowRecoveryCodesWarning: optional(boolean()),
     });
     const loginTotpResultSchema = object({
         type: literal('totp'),

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

@@ -46,8 +46,6 @@ export declare class AuthenticationClientService<AdditionalTokenPayload extends
     readonly rawRefreshToken: import("../../signals/api.js").WritableSignal<string | undefined>;
     /** Current raw impersonator refresh token */
     readonly rawImpersonatorRefreshToken: import("../../signals/api.js").WritableSignal<string | undefined>;
-    /** Whether the remaining recovery codes are low */
-    readonly lowRecoveryCodesWarning: import("../../signals/api.js").WritableSignal<boolean | undefined>;
     /** Whether the user is logged in */
     readonly isLoggedIn: import("../../signals/api.js").Signal<boolean>;
     /** Current session id */

package/authentication/client/authentication.service.js

@@ -93,8 +93,6 @@ let AuthenticationClientService = class AuthenticationClientService {
     rawRefreshToken = signal(undefined);
     /** Current raw impersonator refresh token */
     rawImpersonatorRefreshToken = signal(undefined);
-    /** Whether the remaining recovery codes are low */
-    lowRecoveryCodesWarning = signal(undefined);
     /** Whether the user is logged in */
     isLoggedIn = computed(() => isDefined(this.token()));
     /** Current session id */
@@ -253,7 +251,6 @@ let AuthenticationClientService = class AuthenticationClientService {
         if (result.type == 'totp') {
             return result;
         }
-        this.lowRecoveryCodesWarning.set(result.lowRecoveryCodesWarning);
         this.setNewToken(result.result);
         return { type: 'success' };
     }
@@ -264,7 +261,6 @@ let AuthenticationClientService = class AuthenticationClientService {
      */
     async verifyTotpLogin(challengeToken, token) {
         const result = await this.client.loginVerifyTotp({ challengeToken, token });
-        this.lowRecoveryCodesWarning.set(result.lowRecoveryCodesWarning);
         this.setNewToken(result.result);
     }
     /**
@@ -274,7 +270,6 @@ let AuthenticationClientService = class AuthenticationClientService {
      */
     async loginRecovery(challengeToken, recoveryCode) {
         const result = await this.client.loginRecovery({ challengeToken, recoveryCode });
-        this.lowRecoveryCodesWarning.set(result.lowRecoveryCodesWarning);
         this.setNewToken(result.result);
     }
     /**

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

@@ -100,7 +100,7 @@ export declare class AuthenticationApiController<AdditionalTokenPayload extends
     invalidateAllOtherSessions({ getToken, getAuditor }: ApiRequestContext<AuthenticationApiDefinition<AdditionalTokenPayload, AuthenticationData, AdditionalInitPasswordResetData>, 'invalidateAllOtherSessions'>): Promise<ApiServerResult<AuthenticationApiDefinition<AdditionalTokenPayload, AuthenticationData, AdditionalInitPasswordResetData>, 'invalidateAllOtherSessions'>>;
     protected enforceRateLimit(ip: string, subjectResource: string, auditor: Auditor, targetId: string, action: string): Promise<void>;
     protected refundRateLimit(ip: string, subjectResource: string): Promise<void>;
-    protected getTokenResponse<T>(result: TokenResult<AdditionalTokenPayload>, body: NoInfer<T>): HttpServerResponse;
+    protected getTokenResponse<T>(result: TokenResult<AdditionalTokenPayload>, body: T): HttpServerResponse<T>;
     protected getLoginResponse(result: LoginResult<AdditionalTokenPayload>): ApiServerResult<AuthenticationApiDefinition<AdditionalTokenPayload, AuthenticationData, AdditionalInitPasswordResetData>, 'login'>;
 }
 /**

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

@@ -381,7 +381,6 @@ let AuthenticationApiController = AuthenticationApiController_1 = class Authenti
             return this.getTokenResponse(result.result, {
                 type: 'success',
                 result: result.result.jsonToken.payload,
-                lowRecoveryCodesWarning: result.lowRecoveryCodesWarning,
             });
         }
         return result;

package/authentication/server/authentication.service.d.ts

@@ -158,7 +158,6 @@ export type TokenResult<AdditionalTokenPayload extends Record> = {
 export type LoginSuccessResult<AdditionalTokenPayload extends Record> = {
     type: 'success';
     result: TokenResult<AdditionalTokenPayload>;
-    lowRecoveryCodesWarning?: boolean;
 };
 export type LoginTotpResult = {
     type: 'totp';

package/authentication/server/authentication.service.js

@@ -1105,9 +1105,7 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
                 throw new ForbiddenError('Invalid recovery code');
             }
             const subject = await this.#subjectRepository.loadByQuery({ tenantId: tenant, id: subjectId });
-            const loginResult = await this.#loginAlreadyValidatedSubject(subject, data, authAuditor, remember);
-            const unusedRecoveryCodesCount = await this.#totpRecoveryCodeRepository.withTransaction(tx).countByQuery({ tenantId: tenant, totpId: totp.id, usedTimestamp: null });
-            return { loginResult, unusedRecoveryCodesCount };
+            return await this.#loginAlreadyValidatedSubject(subject, data, authAuditor, remember);
         });
         await authAuditor.info('recovery-login-success', {
             tenantId: tenant,
@@ -1115,16 +1113,13 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
             actorType: ActorType.Subject,
             targetId: subjectId,
             targetType: 'Subject',
-            network: { sessionId: result.loginResult.result.jsonToken.payload.session },
+            network: { sessionId: result.result.jsonToken.payload.session },
             details: {
-                sessionId: result.loginResult.result.jsonToken.payload.session,
+                sessionId: result.result.jsonToken.payload.session,
                 remember,
             },
         });
-        return {
-            ...result.loginResult,
-            lowRecoveryCodesWarning: result.unusedRecoveryCodesCount <= 3,
-        };
+        return result;
     }
     async #loginVerifyTotp(challengeTokenString, token, authAuditor) {
         const challengeToken = await this.validateTotpChallengeToken(challengeTokenString);

package/http/server/http-server-response.d.ts

@@ -7,33 +7,33 @@ import { ServerTiming } from '../server-timing.js';
 export type SetCookieObject = SetCookieOptions & {
     value: string;
 };
-export type HttpServerResponseBody = {
+export type HttpServerResponseBody<out T = unknown> = {
     stream?: ReadableStream<Uint8Array>;
     buffer?: Uint8Array;
     text?: string;
-    json?: unknown;
+    json?: T;
     events?: ServerSentEventsSource;
 };
 export type HttpServerResponseBodyType = 'stream' | 'buffer' | 'text' | 'json' | 'events' | 'none';
-export type HttpServerResponseOptions = {
+export type HttpServerResponseOptions<out T = unknown> = {
     statusCode?: number | undefined;
     statusMessage?: string | undefined;
     headers?: HttpHeadersInput | HttpHeaders;
     cookies?: Record<string, SetCookieObject>;
-    body?: HttpServerResponseBody;
+    body?: HttpServerResponseBody<T>;
 };
-export declare class HttpServerResponse {
+export declare class HttpServerResponse<out T = unknown> {
     #private;
     readonly headers: HttpHeaders;
     readonly serverTiming: ServerTiming;
     statusCode: number | undefined;
     statusMessage: string | undefined;
-    get body(): HttpServerResponseBody | undefined;
-    set body(value: HttpServerResponseBody | undefined);
+    get body(): HttpServerResponseBody<T> | undefined;
+    set body(value: HttpServerResponseBody<T> | undefined);
     get bodyType(): HttpServerResponseBodyType;
-    constructor(response?: HttpServerResponseOptions);
-    static fromObject(options?: HttpServerResponseOptions): HttpServerResponse;
-    static redirect(url: string, options?: HttpServerResponseOptions): HttpServerResponse;
-    update(options: HttpServerResponseOptions): void;
+    constructor(response?: HttpServerResponseOptions<T>);
+    static fromObject<T>(options?: HttpServerResponseOptions<T>): HttpServerResponse<T>;
+    static redirect<T>(url: string, options?: HttpServerResponseOptions<T>): HttpServerResponse<T>;
+    update(options: HttpServerResponseOptions<T>): void;
 }
-export declare function redirect(url: string, options?: HttpServerResponseOptions): HttpServerResponse;
+export declare function redirect<T>(url: string, options?: HttpServerResponseOptions<T>): HttpServerResponse<T>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.93.194",
+  "version": "0.93.196",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"
@@ -153,8 +153,8 @@
     "type-fest": "^5.5"
   },
   "peerDependencies": {
-    "@aws-sdk/client-s3": "^3.1024",
-    "@aws-sdk/s3-request-presigner": "^3.1024",
+    "@aws-sdk/client-s3": "^3.1025",
+    "@aws-sdk/s3-request-presigner": "^3.1025",
     "@genkit-ai/google-genai": "^1.31",
     "@google-cloud/storage": "^7.19",
     "@toon-format/toon": "^2.1.0",

package/schema/schema.d.ts

@@ -20,7 +20,7 @@ export type SchemaTestResult<T> = {
 };
 type NormalizePrimitiveToConstructor<T> = Or<IsEqual<T, string>, IsEqual<T, String>> extends true ? typeof String : Or<IsEqual<T, number>, IsEqual<T, Number>> extends true ? typeof Number : Or<IsEqual<T, boolean>, IsEqual<T, Boolean>> extends true ? typeof Boolean : Or<IsEqual<T, bigint>, IsEqual<T, BigInt>> extends true ? typeof BigInt : Or<IsEqual<T, symbol>, IsEqual<T, Symbol>> extends true ? typeof Symbol : never;
 export type SchemaTestable<T = any> = Schema<T> | AbstractConstructor<T> | NormalizePrimitiveToConstructor<T>;
-export type SchemaOutput<T extends SchemaTestable> = T extends SchemaTestable<infer U> ? U : never;
+export type SchemaOutput<T extends SchemaTestable> = T extends Schema<infer U> ? U : T extends SchemaTestable<infer U> ? U : never;
 export declare const OPTIONAL: unique symbol;
 export type SchemaOptions<_T> = {
     description?: string | null;