@lenne.tech/nest-server 10.2.4 → 10.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "10.2.4",
+  "version": "10.2.6",
   "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/core/common/interceptors/check-security.interceptor.ts

@@ -12,7 +12,7 @@ import { processDeep } from '../helpers/input.helper';
 export class CheckSecurityInterceptor implements NestInterceptor {
   intercept(context: ExecutionContext, next: CallHandler): Observable<any> {
     // Get current user
-    const user = getContextData(context)?.currentUser;
+    const user = getContextData(context)?.currentUser || null;
 
     // Set force mode for sign in and sign up
     let force = false;

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

@@ -311,6 +311,69 @@ export abstract class CrudService<
     return this.findAndUpdateForce(filter, update, serviceOptions);
   }
 
+  /**
+   * Find one item via filter
+   */
+  async findOne(
+    filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions },
+    serviceOptions?: ServiceOptions,
+  ): Promise<Model> {
+    // If filter is not instance of FilterArgs a simple form with filterQuery and queryOptions is set
+    // and should not be processed as FilterArgs
+    if (!(filter instanceof FilterArgs) && serviceOptions?.inputType === FilterArgs) {
+      serviceOptions = Object.assign({ prepareInput: null }, serviceOptions, { inputType: null });
+    }
+
+    return this.process(
+      async (data) => {
+
+        // Prepare filter query
+        const filterQuery = { filterQuery: data?.input?.filterQuery, queryOptions: data?.input?.queryOptions };
+        if (data?.input instanceof FilterArgs) {
+          const converted = convertFilterArgsToQuery(data.input);
+          filterQuery.filterQuery = converted[0];
+          filterQuery.queryOptions = converted[1];
+        }
+
+        // Find in DB
+        let find = this.mainDbModel.findOne(filterQuery.filterQuery, null, filterQuery.queryOptions);
+        const collation = serviceOptions?.collation || ConfigService.get('mongoose.collation');
+        if (collation) {
+          find = find.collation(collation);
+        }
+        return find.exec();
+      },
+      { input: filter, serviceOptions },
+    );
+  }
+
+  /**
+   * Find one item via filter without checks or restrictions
+   * Warning: Disables the handling of rights and restrictions!
+   */
+  async findOneForce(
+    filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number },
+    serviceOptions: ServiceOptions = {},
+  ): Promise<Model> {
+    serviceOptions = serviceOptions || {};
+    serviceOptions.force = true;
+    return this.findOne(filter, serviceOptions);
+  }
+
+  /**
+   * Find one item via filter without checks, restrictions or preparations
+   * Warning: Disables the handling of rights and restrictions! The raw data may contain secrets (such as passwords).
+   */
+  async findOneRaw(
+    filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number },
+    serviceOptions: ServiceOptions = {},
+  ): Promise<Model> {
+    serviceOptions = serviceOptions || {};
+    serviceOptions.prepareInput = null;
+    serviceOptions.prepareOutput = null;
+    return this.findOneForce(filter, serviceOptions);
+  }
+
   /**
    * CRUD alias for get
    */

package/src/core.module.ts

@@ -40,6 +40,26 @@ export class CoreModule implements NestModule {
     consumer.apply(graphqlUploadExpress()).forRoutes('graphql');
   }
 
+  /**
+   * Convert array with key value entries to header object
+   * e.g. ['Sec-WebSocket-Version', '13', 'Sec-WebSocket-Key', 'Yu4Lewa60jLk41YXcVrw0w==']
+   * => {
+   *   'Sec-WebSocket-Version': '13',
+   *   'Sec-WebSocket-Key': 'Yu4Lewa60jLk41YXcVrw0w==',
+   * }
+   */
+  static getHeaderFromArray(array): Record<string, string> {
+    const result: Record<string, string> = {};
+    if (!array.length) {
+      return result;
+    }
+    for (let i = 0; i < array.length; i += 2) {
+      const key = array[i];
+      result[key] = array[i + 1];
+    }
+    return result;
+  }
+
   /**
    * Dynamic module
    * see https://docs.nestjs.com/modules#dynamic-modules
@@ -78,6 +98,9 @@ export class CoreModule implements NestModule {
                             // verify authToken/getJwtPayLoad
                             const payload = authService.decodeJwt(authToken);
                             const user = await authService.validateUser(payload);
+                            if (!user) {
+                              throw new UnauthorizedException('No user found for token');
+                            }
                             // the user/jwtPayload object found will be available as context.currentUser/jwtPayload in your GraphQL resolvers
                             return { user, headers: connectionParams };
                           }
@@ -91,14 +114,20 @@ export class CoreModule implements NestModule {
                         const { connectionParams, extra } = context;
                         if (config.graphQl.enableSubscriptionAuth) {
                           // get authToken from authorization header
-                          const authToken: string = connectionParams?.Authorization?.split(' ')[1];
+                          const headers = this.getHeaderFromArray(extra.request?.rawHeaders);
+                          const authToken: string
+                            = connectionParams?.Authorization?.split(' ')[1]
+                            ?? headers.Authorization?.split(' ')[1];
                           if (authToken) {
                             // verify authToken/getJwtPayLoad
                             const payload = authService.decodeJwt(authToken);
                             const user = await authService.validateUser(payload);
+                            if (!user) {
+                              throw new UnauthorizedException('No user found for token');
+                            }
                             // the user/jwtPayload object found will be available as context.currentUser/jwtPayload in your GraphQL resolvers
                             extra.user = user;
-                            extra.header = connectionParams;
+                            extra.headers = connectionParams ?? headers;
                             return extra;
                           }