@lenne.tech/nest-server 9.2.0 → 9.2.2

package/src/core/modules/auth/tokens.decorator.ts

@@ -0,0 +1,36 @@
+import { createParamDecorator, ExecutionContext } from '@nestjs/common';
+import { GqlExecutionContext } from '@nestjs/graphql';
+import { getContextData } from '../../common/helpers/context.helper';
+
+/**
+ * Get current tokens
+ */
+export const Tokens = createParamDecorator(
+  (
+    tokenId: 'token' | 'refreshToken' | undefined,
+    ctx: ExecutionContext
+  ): string | { token: string; refreshToken: string } => {
+    // Get prepared context (REST or GraphQL)
+    const context = getContextData(ctx);
+
+    // Get token from cookie or authorization header
+    const token =
+      context?.request?.cookies?.['token'] ||
+      context?.request
+        ?.get('Authorization')
+        ?.replace(/bearer/i, '')
+        .trim();
+
+    // Refresh token from cookie or authorization header (the authorization header does not distinguish the tokens)
+    const refreshToken = context?.request?.cookies?.['refreshToken'] || token;
+
+    // Set tokens
+    const tokens = { token, refreshToken };
+
+    // Return tokens
+    if (tokenId?.length) {
+      return tokens[tokenId];
+    }
+    return tokens;
+  }
+);

package/src/core/modules/file/core-file.controller.ts

@@ -1,6 +1,6 @@
 import { BadRequestException, Controller, Get, NotFoundException, Param, Res } from '@nestjs/common';
-import { User } from '../../../server/modules/user/user.model';
 import { RESTUser } from '../../common/decorators/rest-user.decorator';
+import { CoreUserModel } from '../user/core-user.model';
 import { CoreFileService } from './core-file.service';
 
 /**
@@ -17,7 +17,7 @@ export abstract class CoreFileController {
    * Download file
    */
   @Get(':filename')
-  async getFile(@Param('filename') filename: string, @Res() res, @RESTUser() user: User) {
+  async getFile(@Param('filename') filename: string, @Res() res, @RESTUser() user: CoreUserModel) {
     if (!filename) {
       throw new BadRequestException('Missing filename for download');
     }

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

@@ -2,8 +2,8 @@ import { Field, ObjectType } from '@nestjs/graphql';
 import { Prop, raw, Schema as MongooseSchema } from '@nestjs/mongoose';
 import { IsEmail, IsOptional } from 'class-validator';
 import { Document } from 'mongoose';
-import { User } from '../../../server/modules/user/user.model';
 import { CorePersistenceModel } from '../../common/models/core-persistence.model';
+import { CoreTokenData } from '../auth/interfaces/core-token-data.interface';
 
 export type CoreUserModelDocument = CoreUserModel & Document;
 
@@ -71,20 +71,13 @@ export abstract class CoreUserModel extends CorePersistenceModel {
   passwordResetToken: string = undefined;
 
   /**
-   * Hashed refresh JWT
-   */
-  @IsOptional()
-  @Prop()
-  refreshToken: string = undefined;
-
-  /**
-   * Refresh tokens for devices
-   * key: deviceID
-   * value: hashed JWT
+   * Refresh tokens (for devices)
+   * key: Token
+   * value: TokenData
    */
   @IsOptional()
   @Prop(raw({}))
-  refreshTokens: Record<string, string> = undefined;
+  refreshTokens: Record<string, CoreTokenData> = undefined;
 
   /**
    * Verification token of the user

package/src/core.module.ts

@@ -68,8 +68,7 @@ export class CoreModule implements NestModule {
                       onConnect: async (connectionParams) => {
                         if (config.graphQl.enableSubscriptionAuth) {
                           // get authToken from authorization header
-                          const authToken: string =
-                            'Authorization' in connectionParams && connectionParams?.Authorization?.split(' ')[1];
+                          const authToken: string = connectionParams?.Authorization?.split(' ')[1];
 
                           if (authToken) {
                             // verify authToken/getJwtPayLoad

package/src/index.ts

@@ -81,14 +81,16 @@ export * from './core/modules/auth/guards/roles.guard';
 export * from './core/modules/auth/inputs/core-auth-sign-in.input';
 export * from './core/modules/auth/inputs/core-auth-sign-up.input';
 export * from './core/modules/auth/interfaces/core-auth-user.interface';
+export * from './core/modules/auth/interfaces/core-token-data.interface';
 export * from './core/modules/auth/interfaces/jwt-payload.interface';
 export * from './core/modules/auth/services/core-auth.service';
 export * from './core/modules/auth/services/core-auth-user.service';
+export * from './core/modules/auth/strategies/jwt.strategy';
+export * from './core/modules/auth/strategies/jwt-refresh.strategy';
 export * from './core/modules/auth/core-auth.model';
 export * from './core/modules/auth/core-auth.module';
 export * from './core/modules/auth/core-auth.resolver';
-export * from './core/modules/auth/strategies/jwt.strategy';
-export * from './core/modules/auth/strategies/jwt-refresh.strategy';
+export * from './core/modules/auth/tokens.decorator';
 
 // =====================================================================================================================
 // Core - Modules - File