@tstdl/base 0.84.16 → 0.84.18

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;
+    jwtId?: string;
+    issuedAt?: number;
+    expiration?: 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, jwtId, issuedAt, expiration, 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, jwtId, issuedAt, expiration, 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: jwtId ?? (0, import_random.getRandomString)(24, import_alphabet.Alphabet.LowerUpperCaseNumbers),
+      iat: issuedAt ?? (0, import_date_time.timestampToTimestampSeconds)(timestamp),
+      exp: expiration ?? (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.16",
+  "version": "0.84.18",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"