@lenne.tech/nest-server 10.2.3 → 10.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "10.2.3",
+  "version": "10.2.4",
   "description": "Modern, fast, powerful Node.js web framework in TypeScript based on Nest with a GraphQL API and a connection to MongoDB (or other databases).",
   "keywords": [
     "node",

package/src/config.env.ts

@@ -86,6 +86,7 @@ const config: { [env: string]: IServerOptions } = {
           expiresIn: '7d',
         },
       },
+      sameTokenIdPeriod: 2000,
     },
     loadLocalConfig: true,
     logExceptions: true,
@@ -176,6 +177,7 @@ const config: { [env: string]: IServerOptions } = {
           expiresIn: '7d',
         },
       },
+      sameTokenIdPeriod: 2000,
     },
     loadLocalConfig: false,
     logExceptions: true,
@@ -266,6 +268,7 @@ const config: { [env: string]: IServerOptions } = {
           expiresIn: '7d',
         },
       },
+      sameTokenIdPeriod: 2000,
     },
     loadLocalConfig: false,
     logExceptions: true,

package/src/core/common/interfaces/server-options.interface.ts

@@ -315,6 +315,13 @@ export interface IServerOptions {
        */
       renewal?: boolean;
     } & IJwt;
+
+    /**
+     * Time period in milliseconds
+     * in which the same token ID is used so that all parallel token refresh requests of a device can be generated.
+     * default: 0 (every token includes a new token ID, all parallel token refresh requests must be prevented by the client or processed accordingly)
+     */
+    sameTokenIdPeriod?: number;
   } & IJwt &
     JwtModuleOptions;
 

package/src/core/common/services/config.service.ts

@@ -74,7 +74,7 @@ export class ConfigService {
     // Init subject handling
     if (!isInitialized) {
       ConfigService._configSubject$.subscribe((config) => {
-        ConfigService._frozenConfigSubject$.next(deepFreeze(config));
+        ConfigService._frozenConfigSubject$.next(deepFreeze(cloneDeep(config)));
       });
     }
 
@@ -370,7 +370,7 @@ export class ConfigService {
    * Set config property in ConfigService
    */
   setProperty(key: string, value: any, options?: { warn?: boolean }) {
-    return ConfigService.setProperty(key, options);
+    return ConfigService.setProperty(key, value, options);
   }
 
   /**

package/src/core/modules/auth/interfaces/core-auth-user.interface.ts

@@ -23,4 +23,10 @@ export interface ICoreAuthUser {
    * Refresh tokens for different devices
    */
   refreshTokens?: Record<string, CoreTokenData>;
+
+  /**
+   * Temporary tokens for parallel requests during the token refresh process
+   * See sameTokenIdPeriod in configuration
+   */
+  tempTokens?: Record<string, { createdAt: number; deviceId: string; tokenId: string }>;
 }

package/src/core/modules/auth/services/core-auth.service.ts

@@ -204,11 +204,26 @@ export class CoreAuthService {
    * Get JWT and refresh token
    */
   protected async createTokens(userId: string, data?: { [key: string]: any; deviceId?: string }) {
-    const payload: { [key: string]: any; id: string; deviceId: string } = {
+
+    // Initializations
+    const sameTokenIdPeriod: number = this.configService.getFastButReadOnly('jwt.sameTokenIdPeriod', 0);
+    const deviceId = data?.deviceId || randomUUID();
+
+    // Use last token ID or a new one
+    let tokenId: string = randomUUID();
+    if (sameTokenIdPeriod) {
+      const user: ICoreAuthUser = await this.userService.get(userId, { force: true });
+      const tempToken = user?.tempTokens?.[deviceId];
+      if (tempToken && tempToken.tokenId && tempToken.createdAt >= new Date().getTime() - sameTokenIdPeriod) {
+        tokenId = tempToken.tokenId;
+      }
+    }
+
+    const payload: { [key: string]: any; id: string; deviceId: string; tokenId: string } = {
       ...data,
       id: userId,
-      deviceId: data?.deviceId || randomUUID(),
-      tokenId: randomUUID(),
+      deviceId,
+      tokenId,
     };
     const [token, refreshToken] = await Promise.all([
       this.jwtService.signAsync(payload, {
@@ -253,6 +268,9 @@ export class CoreAuthService {
     if (!user.refreshTokens) {
       user.refreshTokens = {};
     }
+    if (!user.tempTokens) {
+      user.tempTokens = {};
+    }
     if (deviceId) {
       const oldData = user.refreshTokens[deviceId] || {};
       data = Object.assign(oldData, data);
@@ -267,7 +285,11 @@ export class CoreAuthService {
       deviceId = payload.deviceId;
     }
     user.refreshTokens[deviceId] = { ...data, deviceId, tokenId: payload.tokenId };
-    await this.userService.update(getStringIds(user), { refreshTokens: user.refreshTokens }, { force: true });
+    user.tempTokens[deviceId] = { createdAt: new Date().getTime(), deviceId, tokenId: payload.tokenId };
+    await this.userService.update(getStringIds(user), {
+      refreshTokens: user.refreshTokens,
+      tempTokens: user.tempTokens,
+    }, { force: true });
 
     // Return new token
     return newRefreshToken;

package/src/core/modules/user/core-user.model.ts

@@ -79,6 +79,14 @@ export abstract class CoreUserModel extends CorePersistenceModel {
   @Prop(raw({}))
   refreshTokens: Record<string, CoreTokenData> = undefined;
 
+  /**
+   * Temporary token for parallel requests during the token refresh process
+   * See sameTokenIdPeriod in configuration
+   */
+  @IsOptional()
+  @Prop(raw({}))
+  tempTokens: Record<string, { createdAt: number; deviceId: string; tokenId: string }> = undefined;
+
   /**
    * Verification token of the user
    */

package/src/test/test.helper.ts

@@ -606,4 +606,12 @@ export class TestHelper {
     // Return subscribed messages
     return messages;
   }
+
+  /**
+   * Convert JWT into to object
+   * @param token
+   */
+  parseJwt(token) {
+    return JSON.parse(Buffer.from(token.split('.')[1], 'base64').toString());
+  }
 }