@lenne.tech/nest-server 8.3.0 → 8.5.0

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

@@ -1,11 +1,11 @@
 import { Document, Model, Types } from 'mongoose';
+import { ProcessType } from '../enums/process-type.enum';
 import { getStringIds, popAndMap } from '../helpers/db.helper';
 import { check } from '../helpers/input.helper';
 import { prepareInput, prepareOutput } from '../helpers/service.helper';
 import { ServiceOptions } from '../interfaces/service-options.interface';
 import { CoreModel } from '../models/core-model.model';
 import { FieldSelection } from '../types/field-selection.type';
-import { IdsType } from '../types/ids.type';
 
 /**
  * Module service class to be extended by concrete module services
@@ -39,9 +39,9 @@ export abstract class ModuleService<T extends CoreModel = any> {
     input: any,
     currentUser: { id: any; hasRole: (roles: string[]) => boolean },
     options?: {
-      creator?: IdsType;
+      dbObject?: any;
       metatype?: any;
-      ownerIds?: IdsType;
+      processType?: ProcessType;
       roles?: string | string[];
       throwError?: boolean;
     }
@@ -84,36 +84,28 @@ export abstract class ModuleService<T extends CoreModel = any> {
 
     // Prepare input
     if (config.prepareInput && this.prepareInput) {
-      await this.prepareInput(config.input, config.prepareInput);
+      const opts = config.prepareInput;
+      if (!opts.targetModel && config.inputType) {
+        opts.targetModel = config.inputType;
+      }
+      await this.prepareInput(config.input, opts);
     }
 
     // Get DB object
-    const getDbObject = async () => {
-      if (config.dbObject) {
-        if (typeof config.dbObject === 'string' || config.dbObject instanceof Types.ObjectId) {
-          const dbObject = await this.get(getStringIds(config.dbObject));
-          if (dbObject) {
-            config.dbObject = dbObject;
-          }
+    if (config.dbObject && config.checkRights && this.checkRights) {
+      if (typeof config.dbObject === 'string' || config.dbObject instanceof Types.ObjectId) {
+        const dbObject = await this.get(getStringIds(config.dbObject));
+        if (dbObject) {
+          config.dbObject = dbObject;
         }
       }
-      return config.dbObject;
-    };
-
-    // Get owner IDs
-    let ownerIds = undefined;
-    if (config.checkRights && this.checkRights) {
-      ownerIds = getStringIds(config.ownerIds);
-      if (!ownerIds?.length) {
-        ownerIds = (await getDbObject())?.ownerIds;
-      }
     }
 
     // Check rights for input
     if (config.input && config.checkRights && this.checkRights) {
-      const opts: any = { creator: (await getDbObject())?.createdBy, ownerIds, roles: config.roles };
+      const opts: any = { dbObject: config.dbObject, processType: ProcessType.INPUT, roles: config.roles };
       if (config.inputType) {
-        opts.metatype = config.resultType;
+        opts.metatype = config.inputType;
       }
       config.input = await this.checkRights(config.input, config.currentUser as any, opts);
     }
@@ -128,18 +120,23 @@ export abstract class ModuleService<T extends CoreModel = any> {
 
     // Prepare output
     if (config.prepareOutput && this.prepareOutput) {
-      // Check if mapping is already done by processFieldSelection
-      if (config.processFieldSelection && config.fieldSelection && this.processFieldSelection) {
-        config.prepareOutput.targetModel = null;
+      const opts = config.prepareOutput;
+      if (!opts.targetModel && config.outputType) {
+        opts.targetModel = config.outputType;
       }
-      result = await this.prepareOutput(result, config.prepareOutput);
+      result = await this.prepareOutput(result, opts);
     }
 
     // Check output rights
     if (config.checkRights && this.checkRights) {
-      const opts: any = { creator: (await getDbObject())?.createdBy, ownerIds, roles: config.roles, throwError: false };
-      if (config.resultType) {
-        opts.metatype = config.resultType;
+      const opts: any = {
+        dbObject: config.dbObject,
+        processType: ProcessType.OUTPUT,
+        roles: config.roles,
+        throwError: false,
+      };
+      if (config.outputType) {
+        opts.metatype = config.outputType;
       }
       result = await this.checkRights(result, config.currentUser as any, opts);
     }
@@ -152,7 +149,11 @@ export abstract class ModuleService<T extends CoreModel = any> {
    * Prepare input before save
    */
   async prepareInput(input: Record<string, any>, options: ServiceOptions = {}) {
-    return prepareInput(input, options.currentUser, options.prepareInput);
+    const config = {
+      targetModel: this.mainModelConstructor,
+      ...options?.prepareInput,
+    };
+    return prepareInput(input, options.currentUser, config);
   }
 
   /**

package/src/core/common/types/require-only-one.type.ts

@@ -0,0 +1,6 @@
+/**
+ * Require only one of the optional properties
+ * See https://stackoverflow.com/a/49725198
+ */
+export type RequireOnlyOne<T, Keys extends keyof T = keyof T> = Pick<T, Exclude<keyof T, Keys>> &
+  { [K in Keys]-?: Required<Pick<T, K>> & Partial<Record<Exclude<Keys, K>, undefined>> }[Keys];

package/src/core/common/types/required-at-least-one.type.ts

@@ -0,0 +1,6 @@
+/**
+ * Require at least on of optional properties
+ * See https://stackoverflow.com/a/49725198
+ */
+export type RequireAtLeastOne<T, Keys extends keyof T = keyof T> = Pick<T, Exclude<keyof T, Keys>> &
+  { [K in Keys]-?: Required<Pick<T, K>> & Partial<Pick<T, Exclude<Keys, K>>> }[Keys];

package/src/core.module.ts

@@ -1,8 +1,7 @@
 import { DynamicModule, Global, Module, UnauthorizedException } from '@nestjs/common';
-import { APP_INTERCEPTOR, APP_PIPE } from '@nestjs/core';
+import { APP_PIPE } from '@nestjs/core';
 import { GraphQLModule } from '@nestjs/graphql';
 import { merge } from './core/common/helpers/config.helper';
-import { CheckResponseInterceptor } from './core/common/interceptors/check-response.interceptor';
 import { IServerOptions } from './core/common/interfaces/server-options.interface';
 import { MapAndValidatePipe } from './core/common/pipes/map-and-validate.pipe';
 import { ConfigService } from './core/common/services/config.service';
@@ -19,8 +18,6 @@ import { ApolloDriver, ApolloDriverConfig } from '@nestjs/apollo';
  * - MongooseModule
  * - GraphQL
  * - ConfigService
- * - CheckInput
- * - CheckResponse
  *
  * and sets the following services as globals:
  * - ConfigService
@@ -99,21 +96,6 @@ export class CoreModule {
         useValue: new ConfigService(config),
       },
 
-      // [Global] The CheckResponseInterceptor restricts the response to the properties
-      // that are permitted for the current user
-      {
-        provide: APP_INTERCEPTOR,
-        useClass: CheckResponseInterceptor,
-      },
-
-      // [Global] The CheckInputPipe checks the permissibility of individual properties of inputs for the resolvers
-      // in relation to the current user, replaces MapAndValidatePipe
-      // Does not work yet, because context is missing: https://github.com/nestjs/graphql/issues/325
-      // {
-      //   provide: APP_PIPE,
-      //   useClass: CheckInputPipe,
-      // },
-
       // [Global] Map plain objects to metatype and validate
       {
         provide: APP_PIPE,

package/src/index.ts

@@ -15,6 +15,7 @@ export * from './core/common/decorators/restricted.decorator';
 export * from './core/common/decorators/roles.decorator';
 export * from './core/common/enums/comparison-operator.enum';
 export * from './core/common/enums/logical-operator.enum';
+export * from './core/common/enums/process-type.enum';
 export * from './core/common/enums/role.enum';
 export * from './core/common/enums/sort-order.emum';
 export * from './core/common/helpers/config.helper';
@@ -54,6 +55,8 @@ export * from './core/common/types/core-model-constructor.type';
 export * from './core/common/types/field-selection.type';
 export * from './core/common/types/ids.type';
 export * from './core/common/types/plain-input.type';
+export * from './core/common/types/require-only-one.type';
+export * from './core/common/types/required-at-least-one.type';
 export * from './core/common/types/string-or-object-id.type';
 
 // =====================================================================================================================

package/src/server/modules/user/user.model.ts

@@ -1,8 +1,8 @@
 import { Field, ObjectType } from '@nestjs/graphql';
+import { Prop, Schema as MongooseSchema, SchemaFactory } from '@nestjs/mongoose';
+import { Document, Schema } from 'mongoose';
 import { CoreUserModel } from '../../../core/modules/user/core-user.model';
 import { PersistenceModel } from '../../common/models/persistence.model';
-import { Prop, Schema as MongooseSchema, SchemaFactory } from '@nestjs/mongoose';
-import { Schema, Document } from 'mongoose';
 
 export type UserDocument = User & Document;
 

package/src/server/modules/user/user.service.ts

@@ -46,11 +46,11 @@ export class UserService extends CoreUserService<User, UserInput, UserCreateInpu
     // Get prepared user
     let user = await super.create(input, serviceOptions);
 
-    // Add the createdBy information in an additional step if it was not set by the system,
-    // because the user created himself and could not exist as currentUser before
+    // Add the createdBy information in an extra step if it was not set by the system because the user created himself
+    // and could not exist as currentUser before
     if (!user.createdBy) {
       await this.mainDbModel.findByIdAndUpdate(user.id, { createdBy: user.id });
-      user = await this.get(user.id, serviceOptions);
+      user = await this.get(user.id, { ...serviceOptions, currentUser: serviceOptions.currentUser || user });
     }
 
     // Publish action