@lenne.tech/nest-server 8.0.2 → 8.3.0

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

@@ -1,3 +1,4 @@
+import { Inject } from '@nestjs/common';
 import { Args, Info, Mutation, Query, Resolver, Subscription } from '@nestjs/graphql';
 import { GraphQLResolveInfo } from 'graphql';
 import { PubSub } from 'graphql-subscriptions';
@@ -5,12 +6,10 @@ import { FilterArgs } from '../../../core/common/args/filter.args';
 import { GraphQLUser } from '../../../core/common/decorators/graphql-user.decorator';
 import { Roles } from '../../../core/common/decorators/roles.decorator';
 import { RoleEnum } from '../../../core/common/enums/role.enum';
-import { InputHelper } from '../../../core/common/helpers/input.helper';
 import { UserCreateInput } from './inputs/user-create.input';
 import { UserInput } from './inputs/user.input';
 import { User } from './user.model';
 import { UserService } from './user.service';
-import { Inject } from '@nestjs/common';
 
 /**
  * Resolver to process with user data
@@ -20,27 +19,43 @@ export class UserResolver {
   /**
    * Import services
    */
-  constructor(protected readonly usersService: UserService, @Inject('PUB_SUB') protected readonly pubSub: PubSub) {}
+  constructor(protected readonly userService: UserService, @Inject('PUB_SUB') protected readonly pubSub: PubSub) {}
 
   // ===========================================================================
   // Queries
   // ===========================================================================
 
+  /**
+   * Get users (via filter)
+   */
+  @Roles(RoleEnum.ADMIN)
+  @Query((returns) => [User], { description: 'Find users (via filter)' })
+  async findUsers(@Info() info: GraphQLResolveInfo, @Args() args?: FilterArgs) {
+    return await this.userService.find(args, {
+      fieldSelection: { info, select: 'findUsers' },
+      inputType: FilterArgs,
+    });
+  }
+
   /**
    * Get user via ID
    */
+  @Roles(RoleEnum.S_USER)
   @Query((returns) => User, { description: 'Get user with specified ID' })
-  async getUser(@Args('id') id: string, @Info() info: GraphQLResolveInfo): Promise<User> {
-    return await this.usersService.get(id, info);
+  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.ADMIN, RoleEnum.S_CREATOR],
+    });
   }
 
   /**
-   * Get users (via filter)
+   * Get verified state of user with token
    */
-  @Roles(RoleEnum.USER)
-  @Query((returns) => [User], { description: 'Find users (via filter)' })
-  async findUsers(@Info() info: GraphQLResolveInfo, @Args() args?: FilterArgs) {
-    return await this.usersService.find(args, info);
+  @Query((returns) => Boolean, { description: 'Get verified state of user with token' })
+  async getVerifiedState(@Args('token') token: string) {
+    return await this.userService.getVerifiedState(token);
   }
 
   /**
@@ -48,63 +63,76 @@ export class UserResolver {
    */
   @Query((returns) => Boolean, { description: 'Request new password for user with email' })
   async requestPasswordResetMail(@Args('email') email: string): Promise<boolean> {
-    return !!(await this.usersService.sendPasswordResetMail(email));
+    return !!(await this.userService.sendPasswordResetMail(email));
   }
 
   // ===========================================================================
   // Mutations
   // ===========================================================================
+
   /**
-   * Verify user with email
+   * Create new user
    */
-  @Mutation((returns) => Boolean, { description: 'Verify user with email' })
-  async verifyUser(@Args('token') token: string): Promise<boolean> {
-    return !!(await this.usersService.verify(token));
+  @Mutation((returns) => User, { description: 'Create a new user' })
+  async createUser(
+    @Args('input') input: UserCreateInput,
+    @GraphQLUser() user: User,
+    @Info() info: GraphQLResolveInfo
+  ): Promise<User> {
+    return await this.userService.create(input, {
+      currentUser: user,
+      fieldSelection: { info, select: 'createUser' },
+      inputType: UserCreateInput,
+    });
   }
 
   /**
-   * Set new password for user with token
+   * Delete existing user
    */
-  @Mutation((returns) => Boolean, { description: 'Set new password for user with token' })
-  async resetPassword(@Args('token') token: string, @Args('password') password: string): Promise<boolean> {
-    return !!(await this.usersService.resetPassword(token, password));
+  @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.S_CREATOR],
+    });
   }
 
   /**
-   * Create new user
+   * Set new password for user with token
    */
-  @Mutation((returns) => User, { description: 'Create a new user' })
-  async createUser(@Args('input') input: UserCreateInput, @GraphQLUser() user: User): Promise<User> {
-    // Check input
-    // Hint: necessary as long as global CheckInputPipe can't access context for current user
-    // (see https://github.com/nestjs/graphql/issues/325)
-    input = await InputHelper.check(input, user, UserCreateInput);
-
-    return await this.usersService.create(input, user);
+  @Mutation((returns) => Boolean, { description: 'Set new password for user with token' })
+  async resetPassword(@Args('token') token: string, @Args('password') password: string): Promise<boolean> {
+    return !!(await this.userService.resetPassword(token, password));
   }
 
   /**
    * Update existing user
    */
-  @Roles(RoleEnum.ADMIN, RoleEnum.OWNER)
+  @Roles(RoleEnum.S_USER)
   @Mutation((returns) => User, { description: 'Update existing user' })
-  async updateUser(@Args('input') input: UserInput, @Args('id') id: string, @GraphQLUser() user: User): Promise<User> {
-    // Check input
-    // Hint: necessary as long as global CheckInputPipe can't access context for current user
-    // (see https://github.com/nestjs/graphql/issues/325)
-    input = await InputHelper.check(input, user, UserInput);
-
+  async updateUser(
+    @Args('input') input: UserInput,
+    @Args('id') id: string,
+    @GraphQLUser() user: User,
+    @Info() info: GraphQLResolveInfo
+  ): Promise<User> {
     // Update user
-    return await this.usersService.update(id, input, user);
+    return await this.userService.update(id, input, {
+      currentUser: user,
+      fieldSelection: { info, select: 'updateUser' },
+      inputType: UserInput,
+      roles: [RoleEnum.ADMIN, RoleEnum.S_CREATOR],
+    });
   }
 
   /**
-   * Delete existing user
+   * Verify user with email
    */
-  @Roles(RoleEnum.ADMIN, RoleEnum.OWNER)
-  @Mutation((returns) => User, { description: 'Delete existing user' })
-  async deleteUser(@Args('id') id: string, @Info() info: GraphQLResolveInfo): Promise<User> {
-    return await this.usersService.delete(id, info);
+  @Mutation((returns) => Boolean, { description: 'Verify user with email' })
+  async verifyUser(@Args('token') token: string): Promise<boolean> {
+    return !!(await this.userService.verify(token));
   }
 
   // ===========================================================================
@@ -112,10 +140,13 @@ export class UserResolver {
   // ===========================================================================
 
   /**
-   * Subscritption for create user
+   * Subscription for created user
    */
   @Subscription((returns) => User, {
-    resolve: (value) => value,
+    filter(this: UserResolver, payload, variables, context) {
+      return context.user.roles.include(RoleEnum.ADMIN);
+    },
+    resolve: (user) => user,
   })
   async userCreated() {
     return this.pubSub.asyncIterator('userCreated');

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

@@ -1,33 +1,23 @@
 import { Inject, Injectable, UnauthorizedException, UnprocessableEntityException } from '@nestjs/common';
+import { InjectModel } from '@nestjs/mongoose';
 import * as fs from 'fs';
+import { PubSub } from 'graphql-subscriptions';
+import { Model } from 'mongoose';
 import envConfig from '../../../config.env';
-import { FilterArgs } from '../../../core/common/args/filter.args';
-import { Filter } from '../../../core/common/helpers/filter.helper';
-import { ServiceHelper } from '../../../core/common/helpers/service.helper';
+import { ServiceOptions } from '../../../core/common/interfaces/service-options.interface';
 import { ConfigService } from '../../../core/common/services/config.service';
 import { EmailService } from '../../../core/common/services/email.service';
+import { CoreModelConstructor } from '../../../core/common/types/core-model-constructor.type';
 import { CoreUserService } from '../../../core/modules/user/core-user.service';
 import { UserCreateInput } from './inputs/user-create.input';
 import { UserInput } from './inputs/user.input';
 import { User, UserDocument } from './user.model';
-import { InjectModel } from '@nestjs/mongoose';
-import { Model } from 'mongoose';
-import { ICorePersistenceModel } from '../../../core/common/interfaces/core-persistence-model.interface';
-import { PubSub } from 'graphql-subscriptions';
 
 /**
  * User service
  */
 @Injectable()
 export class UserService extends CoreUserService<User, UserInput, UserCreateInput> {
-  // ===================================================================================================================
-  // Properties
-  // ===================================================================================================================
-
-  /**
-   * User model
-   */
-  protected readonly model: ICorePersistenceModel;
   // ===================================================================================================================
   // Injections
   // ===================================================================================================================
@@ -38,11 +28,11 @@ export class UserService extends CoreUserService<User, UserInput, UserCreateInpu
   constructor(
     protected readonly configService: ConfigService,
     protected readonly emailService: EmailService,
-    @InjectModel('User') protected readonly userModel: Model<UserDocument>,
+    @Inject('USER_CLASS') protected readonly mainModelConstructor: CoreModelConstructor<User>,
+    @InjectModel('User') protected readonly mainDbModel: Model<UserDocument>,
     @Inject('PUB_SUB') protected readonly pubSub: PubSub
   ) {
-    super(userModel, emailService);
-    this.model = User;
+    super(emailService, mainDbModel, mainModelConstructor);
   }
 
   // ===================================================================================================================
@@ -52,43 +42,48 @@ export class UserService extends CoreUserService<User, UserInput, UserCreateInpu
   /**
    * Create new user and send welcome email
    */
-  async create(input: UserCreateInput, currentUser?: User): Promise<User> {
-    const user = await super.create(input, currentUser);
-
-    await this.prepareOutput(user);
+  async create(input: UserCreateInput, serviceOptions?: ServiceOptions): Promise<User> {
+    // 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
+    if (!user.createdBy) {
+      await this.mainDbModel.findByIdAndUpdate(user.id, { createdBy: user.id });
+      user = await this.get(user.id, serviceOptions);
+    }
 
-    await this.pubSub.publish('userCreated', User.map(user));
+    // Publish action
+    if (serviceOptions?.pubSub === undefined || serviceOptions.pubSub) {
+      await this.pubSub.publish('userCreated', User.map(user));
+    }
 
+    // Send email
     await this.emailService.sendMail(user.email, 'Welcome', {
       htmlTemplate: 'welcome',
       templateData: { name: user.username, link: envConfig.email.verificationLink + '/' + user.verificationToken },
     });
 
+    // Return created user
     return user;
   }
 
-  /**
-   * Get users via filter
-   */
-  find(filterArgs?: FilterArgs, ...args: any[]): Promise<User[]> {
-    const filterQuery = Filter.convertFilterArgsToQuery(filterArgs);
-    // Return found users
-    return this.userModel.find(filterQuery[0], null, filterQuery[1]).exec();
-  }
-
   /**
    * Request password reset mail
    *
    * @param email
    */
-  async sendPasswordResetMail(email: string): Promise<User> {
-    const user = await super.setPasswordResetTokenForEmail(email);
+  async sendPasswordResetMail(email: string, serviceOptions?: ServiceOptions): Promise<User> {
+    // Set password reset token
+    const user = await super.setPasswordResetTokenForEmail(email, serviceOptions);
 
+    // Send email
     await this.emailService.sendMail(user.email, 'Password reset', {
       htmlTemplate: 'password-reset',
       templateData: { name: user.username, link: envConfig.email.passwordResetLink + '/' + user.passwordResetToken },
     });
 
+    // Return user
     return user;
   }
 
@@ -96,7 +91,7 @@ export class UserService extends CoreUserService<User, UserInput, UserCreateInpu
    * Set avatar image
    */
   async setAvatar(file: Express.Multer.File, user: User): Promise<string> {
-    const dbUser = await this.userModel.findOne({ id: user.id }).exec();
+    const dbUser = await this.mainDbModel.findOne({ id: user.id }).exec();
     // Check user
     if (!dbUser) {
       throw new UnauthorizedException();
@@ -124,22 +119,4 @@ export class UserService extends CoreUserService<User, UserInput, UserCreateInpu
     // Return user
     return file.filename;
   }
-
-  // ===================================================================================================================
-  // Helper methods
-  // ===================================================================================================================
-
-  /**
-   * Prepare input before save
-   */
-  protected async prepareInput(input: { [key: string]: any }, currentUser: User, options: { create?: boolean } = {}) {
-    return ServiceHelper.prepareInput(input, currentUser, options);
-  }
-
-  /**
-   * Prepare output before return
-   */
-  protected async prepareOutput(user: User): Promise<User> {
-    return ServiceHelper.prepareOutput(user);
-  }
 }

package/src/test/test.helper.ts

@@ -1,5 +1,5 @@
 import { INestApplication } from '@nestjs/common';
-import { FastifyInstance } from 'fastify';
+// import { FastifyInstance } from 'fastify';
 import { jsonToGraphQLQuery } from 'json-to-graphql-query';
 import * as LightMyRequest from 'light-my-request';
 import * as supertest from 'supertest';
@@ -101,7 +101,8 @@ export interface TestRestOptions {
  * Test helper
  */
 export class TestHelper {
-  app: FastifyInstance | INestApplication;
+  // app: FastifyInstance | INestApplication;
+  app: INestApplication;
 
   /**
    * Constructor
@@ -202,15 +203,15 @@ export class TestHelper {
     const response = await this.getResponse(token, requestConfig, statusCode, log, logError);
 
     // Response of fastify
-    if ((this.app as FastifyInstance).inject) {
-      // Check data
-      expect(response.headers['content-type']).toBe('application/json');
-
-      // return data
-      return JSON.parse(response.payload).data
-        ? JSON.parse(response.payload).data[(graphql as TestGraphQLConfig).name]
-        : JSON.parse(response.payload);
-    }
+    // if ((this.app as FastifyInstance).inject) {
+    //   // Check data
+    //   expect(response.headers['content-type']).toBe('application/json');
+    //
+    //   // return data
+    //   return JSON.parse(response.payload).data
+    //     ? JSON.parse(response.payload).data[(graphql as TestGraphQLConfig).name]
+    //     : JSON.parse(response.payload);
+    // }
 
     // Check data
     expect(response.headers['content-type']).toMatch('application/json');
@@ -322,24 +323,24 @@ export class TestHelper {
     }
 
     // Init response
-    let response: any;
-
-    // Response of fastify
-    if ((this.app as FastifyInstance).inject) {
-      // Get response
-      response = await (this.app as FastifyInstance).inject(requestConfig);
-
-      // Log response
-      if (log) {
-        console.log(response);
-      }
-
-      // Check data
-      expect(response.statusCode).toBe(statusCode);
-
-      // Return response
-      return response;
-    }
+    // let response: any;
+
+    // // Response of fastify
+    // if ((this.app as FastifyInstance).inject) {
+    //   // Get response
+    //   response = await (this.app as FastifyInstance).inject(requestConfig);
+    //
+    //   // Log response
+    //   if (log) {
+    //     console.log(response);
+    //   }
+    //
+    //   // Check data
+    //   expect(response.statusCode).toBe(statusCode);
+    //
+    //   // Return response
+    //   return response;
+    // }
 
     // Express request
     const method: string = requestConfig.method.toLowerCase();
@@ -349,7 +350,7 @@ export class TestHelper {
     }
 
     // Response
-    response = await request.send(requestConfig.payload);
+    const response = await request.send(requestConfig.payload);
 
     // Log response
     if (log) {

package/dist/core/modules/user/core-basic-user.service.d.ts

@@ -1,17 +0,0 @@
-import { FilterArgs } from '../../common/args/filter.args';
-import { CoreUserModel } from './core-user.model';
-import { CoreUserCreateInput } from './inputs/core-user-create.input';
-import { CoreUserInput } from './inputs/core-user.input';
-import { Model } from 'mongoose';
-import { ICorePersistenceModel } from '../../common/interfaces/core-persistence-model.interface';
-export declare abstract class CoreBasicUserService<TUser extends CoreUserModel, TUserInput extends CoreUserInput, TUserCreateInput extends CoreUserCreateInput> {
-    protected readonly userModel: Model<any>;
-    protected readonly model: ICorePersistenceModel;
-    constructor(userModel: Model<any>);
-    create(input: TUserCreateInput, ...args: any[]): Promise<TUser>;
-    get(id: string, ...args: any[]): Promise<TUser>;
-    getViaEmail(email: string, ...args: any[]): Promise<TUser>;
-    find(filterArgs?: FilterArgs, ...args: any[]): Promise<TUser[]>;
-    update(id: string, input: TUserInput, ...args: any[]): Promise<TUser>;
-    delete(id: string, ...args: any[]): Promise<TUser>;
-}

package/dist/core/modules/user/core-basic-user.service.js

@@ -1,73 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CoreBasicUserService = void 0;
-const common_1 = require("@nestjs/common");
-const bcrypt = require("bcrypt");
-const graphql_subscriptions_1 = require("graphql-subscriptions");
-const filter_helper_1 = require("../../common/helpers/filter.helper");
-const pubSub = new graphql_subscriptions_1.PubSub();
-class CoreBasicUserService {
-    constructor(userModel) {
-        this.userModel = userModel;
-    }
-    async create(input, ...args) {
-        if (input.password) {
-            input.password = await bcrypt.hash(input.password, 10);
-        }
-        const createdUser = new this.userModel(this.model.map(input));
-        try {
-            await createdUser.save();
-        }
-        catch (error) {
-            if (error.code === 11000) {
-                throw new common_1.UnprocessableEntityException(`User with email address "${input.email}" already exists`);
-            }
-            else {
-                throw new common_1.UnprocessableEntityException();
-            }
-        }
-        pubSub.publish('userCreated', { userCreated: createdUser });
-        return createdUser;
-    }
-    async get(id, ...args) {
-        const user = await this.userModel.findOne({ id: id }).exec();
-        if (!user) {
-            throw new common_1.NotFoundException();
-        }
-        return user;
-    }
-    async getViaEmail(email, ...args) {
-        let user = await this.userModel.findOne({ email }).exec();
-        if (!user) {
-            throw new common_1.NotFoundException();
-        }
-        user = this.model.map(user);
-        return user;
-    }
-    find(filterArgs, ...args) {
-        return this.userModel.find(...filter_helper_1.Filter.convertFilterArgsToQuery(filterArgs)).exec();
-    }
-    async update(id, input, ...args) {
-        let user = await this.userModel.findOne({ id });
-        if (!user) {
-            throw new common_1.NotFoundException(`User not found with ID: ${id}`);
-        }
-        if (input.password) {
-            input.password = await bcrypt.hash(input.password, 10);
-        }
-        user.set(input);
-        await user.save();
-        user = this.model.map(user);
-        return user;
-    }
-    async delete(id, ...args) {
-        const user = await this.userModel.findOne({ id }).exec();
-        if (!user) {
-            throw new common_1.NotFoundException();
-        }
-        await this.userModel.deleteOne({ id: user.id });
-        return user;
-    }
-}
-exports.CoreBasicUserService = CoreBasicUserService;
-//# sourceMappingURL=core-basic-user.service.js.map

package/dist/core/modules/user/core-basic-user.service.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"core-basic-user.service.js","sourceRoot":"","sources":["../../../../src/core/modules/user/core-basic-user.service.ts"],"names":[],"mappings":"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"}

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

@@ -1,138 +0,0 @@
-import { NotFoundException, UnprocessableEntityException } from '@nestjs/common';
-import * as bcrypt from 'bcrypt';
-import { PubSub } from 'graphql-subscriptions';
-import { FilterArgs } from '../../common/args/filter.args';
-import { Filter } from '../../common/helpers/filter.helper';
-import { CoreUserModel } from './core-user.model';
-import { CoreUserCreateInput } from './inputs/core-user-create.input';
-import { CoreUserInput } from './inputs/core-user.input';
-import { Model } from 'mongoose';
-import { ICorePersistenceModel } from '../../common/interfaces/core-persistence-model.interface';
-
-// Subscription
-const pubSub = new PubSub();
-
-/**
- * User service
- */
-export abstract class CoreBasicUserService<
-  TUser extends CoreUserModel,
-  TUserInput extends CoreUserInput,
-  TUserCreateInput extends CoreUserCreateInput
-> {
-  protected readonly model: ICorePersistenceModel;
-
-  constructor(protected readonly userModel: Model<any>) {}
-
-  /**
-   * Create user
-   */
-  async create(input: TUserCreateInput, ...args: any[]): Promise<TUser> {
-    // Prepare input
-    if ((input as any).password) {
-      (input as any).password = await bcrypt.hash((input as any).password, 10);
-    }
-
-    // Create new user
-    const createdUser = new this.userModel(this.model.map(input));
-
-    try {
-      // Save created user
-      await createdUser.save();
-    } catch (error) {
-      if (error.code === 11000) {
-        throw new UnprocessableEntityException(`User with email address "${(input as any).email}" already exists`);
-      } else {
-        throw new UnprocessableEntityException();
-      }
-    }
-
-    // Inform subscriber
-    pubSub.publish('userCreated', { userCreated: createdUser });
-
-    // Return created user
-    return createdUser;
-  }
-
-  /**
-   * Get user via ID
-   */
-  async get(id: string, ...args: any[]): Promise<TUser> {
-    const user = await this.userModel.findOne({ id: id }).exec();
-    if (!user) {
-      throw new NotFoundException();
-    }
-    return user;
-  }
-
-  /**
-   * Get user via email
-   */
-  async getViaEmail(email: string, ...args: any[]): Promise<TUser> {
-    let user = await this.userModel.findOne({ email }).exec();
-
-    if (!user) {
-      throw new NotFoundException();
-    }
-
-    user = this.model.map(user);
-
-    return user;
-  }
-
-  /**
-   * Get users via filter
-   */
-  find(filterArgs?: FilterArgs, ...args: any[]): Promise<TUser[]> {
-    // Return found users
-    return this.userModel.find(...Filter.convertFilterArgsToQuery(filterArgs)).exec();
-  }
-
-  /**
-   * Get user via ID
-   */
-  async update(id: string, input: TUserInput, ...args: any[]): Promise<TUser> {
-    // Check if user exists
-    let user = await this.userModel.findOne({ id });
-
-    if (!user) {
-      throw new NotFoundException(`User not found with ID: ${id}`);
-    }
-
-    // Prepare input
-    if ((input as any).password) {
-      (input as any).password = await bcrypt.hash((input as any).password, 10);
-    }
-
-    // Update
-    user.set(input);
-
-    // Save
-    await user.save();
-
-    // Map for response
-    user = this.model.map(user);
-
-    // Return user
-    return user;
-  }
-
-  /**
-   * Delete user via ID
-   */
-  async delete(id: string, ...args: any[]): Promise<TUser> {
-    // Search user
-    const user = await this.userModel.findOne({ id }).exec();
-
-    // Check user
-    if (!user) {
-      throw new NotFoundException();
-    }
-
-    // Delete user
-    await this.userModel.deleteOne({ id: user.id });
-
-    // Return deleted user
-    return user;
-  }
-}