@tstdl/base 0.84.15 → 0.84.17

package/application/application.d.ts

@@ -7,8 +7,7 @@ export declare class Application {
     private static _instance;
     private static get instance();
     private readonly logger;
-    private readonly moduleTypes;
-    private readonly moduleInstances;
+    private readonly moduleTypesAndInstances;
     private readonly shutdownPromise;
     private readonly _shutdownToken;
     get shutdownToken(): ReadonlyCancellationToken;
@@ -16,14 +15,12 @@ export declare class Application {
     constructor(logger: Logger);
     static registerModule(moduleType: Type<Module>): void;
     static registerModuleFunction(fn: FunctionModuleFunction): void;
-    static registerModuleInstance(module: Module): void;
     static run(...functionsAndModules: OneOrMany<FunctionModuleFunction | Type<Module>>[]): void;
     static waitForShutdown(): Promise<void>;
     static shutdown(): Promise<void>;
     static requestShutdown(): void;
-    registerModule(moduleType: Type<Module>): void;
+    registerModule(moduleType: Module | Type<Module>): void;
     registerModuleFunction(fn: FunctionModuleFunction): void;
-    registerModuleInstance(module: Module): void;
     run(...functionsAndModules: OneOrMany<FunctionModuleFunction | Type<Module>>[]): void;
     shutdown(): Promise<void>;
     requestShutdown(): void;

package/application/application.js

@@ -63,8 +63,7 @@ let Application = Application_1 = class Application2 {
     return this._instance;
   }
   logger;
-  moduleTypes;
-  moduleInstances;
+  moduleTypesAndInstances;
   shutdownPromise;
   _shutdownToken;
   get shutdownToken() {
@@ -75,8 +74,7 @@ let Application = Application_1 = class Application2 {
   }
   constructor(logger) {
     this.logger = logger;
-    this.moduleTypes = /* @__PURE__ */ new Set();
-    this.moduleInstances = /* @__PURE__ */ new Set();
+    this.moduleTypesAndInstances = /* @__PURE__ */ new Set();
     this.shutdownPromise = new import_deferred_promise.DeferredPromise();
     this._shutdownToken = import_process_shutdown.shutdownToken.createChild();
   }
@@ -86,9 +84,6 @@ let Application = Application_1 = class Application2 {
   static registerModuleFunction(fn) {
     Application_1.instance.registerModuleFunction(fn);
   }
-  static registerModuleInstance(module2) {
-    Application_1.instance.registerModuleInstance(module2);
-  }
   static run(...functionsAndModules) {
     Application_1.instance.run(...functionsAndModules);
   }
@@ -102,14 +97,11 @@ let Application = Application_1 = class Application2 {
     Application_1.instance.requestShutdown();
   }
   registerModule(moduleType) {
-    this.moduleTypes.add(moduleType);
+    this.moduleTypesAndInstances.add(moduleType);
   }
   registerModuleFunction(fn) {
     const module2 = new import_function_module.FunctionModule(fn);
-    this.registerModuleInstance(module2);
-  }
-  registerModuleInstance(module2) {
-    this.moduleInstances.add(module2);
+    this.registerModule(module2);
   }
   run(...functionsAndModules) {
     void this._run(...functionsAndModules);
@@ -135,8 +127,7 @@ let Application = Application_1 = class Application2 {
         this.registerModuleFunction(fnOrModule);
       }
     }
-    const resolvedModules = await (0, import_to_array.toArrayAsync)((0, import_map.mapAsync)(this.moduleTypes, async (type) => import_container.container.resolveAsync(type)));
-    const modules = [...this.moduleInstances, ...resolvedModules];
+    const modules = await (0, import_to_array.toArrayAsync)((0, import_map.mapAsync)(this.moduleTypesAndInstances, async (instanceOrType) => (0, import_type_guards.isFunction)(instanceOrType) ? import_container.container.resolveAsync(instanceOrType) : instanceOrType));
     try {
       await Promise.race([
         this.runModules(modules),

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

@@ -8,6 +8,17 @@ import { AuthenticationSecretResetHandler } from './authentication-secret-reset.
 import { AuthenticationSessionRepository } from './authentication-session.repository.js';
 import { AuthenticationSubjectResolver } from './authentication-subject.resolver.js';
 import { AuthenticationTokenPayloadProvider } from './authentication-token-payload.provider.js';
+export type CreateTokenData<AdditionalTokenPayload extends Record> = {
+    tokenVersion?: number;
+    jti?: string;
+    iat?: number;
+    exp?: number;
+    additionalTokenPayload: AdditionalTokenPayload;
+    subject: string;
+    sessionId: string;
+    refreshTokenExpiration: number;
+    timestamp: number;
+};
 export declare class AuthenticationServiceOptions {
     /**
      * Secrets used for signing tokens and refreshTokens
@@ -81,7 +92,7 @@ export declare class AuthenticationService<AdditionalTokenPayload extends Record
     validateSecretResetToken(token: string): Promise<SecretResetToken>;
     resolveSubject(subject: string): Promise<string>;
     /** Creates a token without session or refresh token and is not saved in database */
-    createToken(additionalTokenPayload: AdditionalTokenPayload, subject: string, sessionId: string, refreshTokenExpiration: number, timestamp: number): Promise<CreateTokenResult<AdditionalTokenPayload>>;
+    createToken({ tokenVersion, jti, iat, exp, additionalTokenPayload, subject, sessionId, refreshTokenExpiration, timestamp }: CreateTokenData<AdditionalTokenPayload>): Promise<CreateTokenResult<AdditionalTokenPayload>>;
     /** Creates a refresh token without session or something else. */
     createRefreshToken(subject: string, sessionId: string, expirationTimestamp: number): Promise<CreateRefreshTokenResult>;
     private createSecretResetToken;

package/authentication/server/authentication.service.js

@@ -155,7 +155,7 @@ let AuthenticationService = class AuthenticationService2 {
       refreshTokenHash: new Uint8Array()
     });
     const tokenPayload = await this.tokenPayloadProvider?.getTokenPayload(actualSubject, authenticationData, { action: import_authentication_token_payload_provider.GetTokenPayloadContextAction.GetToken });
-    const { token, jsonToken } = await this.createToken(tokenPayload, actualSubject, session.id, end, now);
+    const { token, jsonToken } = await this.createToken({ additionalTokenPayload: tokenPayload, subject: actualSubject, sessionId: session.id, refreshTokenExpiration: end, timestamp: now });
     const refreshToken = await this.createRefreshToken(actualSubject, session.id, end);
     await this.sessionRepository.extend(session.id, {
       end,
@@ -183,7 +183,7 @@ let AuthenticationService = class AuthenticationService2 {
     const now = (0, import_date_time.currentTimestamp)();
     const newEnd = now + this.refreshTokenTimeToLive;
     const tokenPayload = await this.tokenPayloadProvider?.getTokenPayload(session.subject, authenticationData, { action: import_authentication_token_payload_provider.GetTokenPayloadContextAction.Refresh });
-    const { token, jsonToken } = await this.createToken(tokenPayload, session.subject, sessionId, newEnd, now);
+    const { token, jsonToken } = await this.createToken({ additionalTokenPayload: tokenPayload, subject: session.subject, sessionId, refreshTokenExpiration: newEnd, timestamp: now });
     const newRefreshToken = await this.createRefreshToken(validatedToken.payload.subject, sessionId, newEnd);
     await this.sessionRepository.extend(sessionId, {
       end: newEnd,
@@ -225,16 +225,16 @@ let AuthenticationService = class AuthenticationService2 {
     return this.subjectResolver?.resolveSubject(subject) ?? subject;
   }
   /** Creates a token without session or refresh token and is not saved in database */
-  async createToken(additionalTokenPayload, subject, sessionId, refreshTokenExpiration, timestamp) {
+  async createToken({ tokenVersion, jti, iat, exp, additionalTokenPayload, subject, sessionId, refreshTokenExpiration, timestamp }) {
     const header = {
-      v: this.tokenVersion,
+      v: tokenVersion ?? this.tokenVersion,
       alg: "HS256",
       typ: "JWT"
     };
     const payload = {
-      jti: (0, import_random.getRandomString)(24, import_alphabet.Alphabet.LowerUpperCaseNumbers),
-      iat: (0, import_date_time.timestampToTimestampSeconds)(timestamp),
-      exp: (0, import_date_time.timestampToTimestampSeconds)(timestamp + this.tokenTimeToLive),
+      jti: jti ?? (0, import_random.getRandomString)(24, import_alphabet.Alphabet.LowerUpperCaseNumbers),
+      iat: iat ?? (0, import_date_time.timestampToTimestampSeconds)(timestamp),
+      exp: exp ?? (0, import_date_time.timestampToTimestampSeconds)(timestamp + this.tokenTimeToLive),
       refreshTokenExp: (0, import_date_time.timestampToTimestampSeconds)(refreshTokenExpiration),
       sessionId,
       subject,

package/package.json

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