@lenne.tech/nest-server 8.2.0 → 8.4.0

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

@@ -35,7 +35,7 @@ export abstract class CoreUserService<
    * Create user
    */
   async create(input: any, serviceOptions?: ServiceOptions): Promise<TUser> {
-    merge({ prepareInput: { create: true } }, serviceOptions);
+    serviceOptions = merge({ prepareInput: { create: true } }, serviceOptions);
     return this.process(
       async (data) => {
         // Create user with verification token
@@ -47,11 +47,6 @@ export abstract class CoreUserService<
         // Distinguish between different error messages when saving
         try {
           await createdUser.save();
-          if (!createdUser.ownerIds) {
-            createdUser.ownerIds = [];
-          }
-          createdUser.ownerIds.push(createdUser.id);
-          await createdUser.save();
         } catch (error) {
           if (error.code === 11000) {
             throw new UnprocessableEntityException(

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/avatar.controller.ts

@@ -22,7 +22,7 @@ export class AvatarController {
   /**
    * Upload files
    */
-  @Roles(RoleEnum.USER)
+  @Roles(RoleEnum.S_USER)
   @Post('upload')
   @UseInterceptors(
     FileInterceptor(

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.resolver.ts

@@ -40,13 +40,13 @@ export class UserResolver {
   /**
    * Get user via ID
    */
-  @Roles(RoleEnum.USER)
+  @Roles(RoleEnum.S_USER)
   @Query((returns) => User, { description: 'Get user with specified ID' })
   async getUser(@Args('id') id: string, @Info() info: GraphQLResolveInfo, @GraphQLUser() user: User): Promise<User> {
     return await this.userService.get(id, {
       currentUser: user,
       fieldSelection: { info, select: 'getUser' },
-      roles: [RoleEnum.OWNER, RoleEnum.ADMIN],
+      roles: [RoleEnum.ADMIN, RoleEnum.S_CREATOR],
     });
   }
 
@@ -89,13 +89,13 @@ export class UserResolver {
   /**
    * Delete existing user
    */
-  @Roles(RoleEnum.USER)
+  @Roles(RoleEnum.S_USER)
   @Mutation((returns) => User, { description: 'Delete existing user' })
   async deleteUser(@Args('id') id: string, @Info() info: GraphQLResolveInfo, @GraphQLUser() user: User): Promise<User> {
     return await this.userService.delete(id, {
       currentUser: user,
       fieldSelection: { info, select: 'deleteUser' },
-      roles: [RoleEnum.ADMIN, RoleEnum.OWNER],
+      roles: [RoleEnum.ADMIN, RoleEnum.S_CREATOR],
     });
   }
 
@@ -110,7 +110,7 @@ export class UserResolver {
   /**
    * Update existing user
    */
-  @Roles(RoleEnum.USER)
+  @Roles(RoleEnum.S_USER)
   @Mutation((returns) => User, { description: 'Update existing user' })
   async updateUser(
     @Args('input') input: UserInput,
@@ -123,7 +123,7 @@ export class UserResolver {
       currentUser: user,
       fieldSelection: { info, select: 'updateUser' },
       inputType: UserInput,
-      roles: [RoleEnum.ADMIN, RoleEnum.OWNER],
+      roles: [RoleEnum.ADMIN, RoleEnum.S_CREATOR],
     });
   }
 

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

@@ -44,7 +44,14 @@ export class UserService extends CoreUserService<User, UserInput, UserCreateInpu
    */
   async create(input: UserCreateInput, serviceOptions?: ServiceOptions): Promise<User> {
     // Get prepared user
-    const user = await super.create(input, serviceOptions);
+    let user = await super.create(input, serviceOptions);
+
+    // 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, currentUser: serviceOptions.currentUser || user });
+    }
 
     // Publish action
     if (serviceOptions?.pubSub === undefined || serviceOptions.pubSub) {