@lenne.tech/nest-server 2.0.4 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "2.0.4",
+  "version": "3.0.0",
   "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",
@@ -49,48 +49,38 @@
     "url": "https://github.com/lenneTech/nest-server/issues"
   },
   "engines": {
-    "node": ">= 14.17.0"
-  },
-  "peerDependencies": {
-    "@nestjs/testing": "8.1.2",
-    "@nestjs/core": "8.1.2",
-    "@nestjs/common": "8.1.2",
-    "@nestjs/graphql": "9.1.1",
-    "@nestjs/jwt": "8.0.0",
-    "@nestjs/mongoose": "9.0.1",
-    "@nestjs/passport": "8.0.1",
-    "@nestjs/platform-express": "8.1.2"
+    "node": ">= 16.13.0"
   },
   "dependencies": {
-    "@apollo/federation": "0.33.6",
+    "@apollo/federation": "0.33.9",
     "@apollo/gateway": "0.42.3",
-    "@nestjs/testing": "8.1.2",
-    "@nestjs/core": "8.1.2",
-    "@nestjs/common": "8.1.2",
-    "@nestjs/graphql": "9.1.1",
+    "@nestjs/common": "8.2.6",
+    "@nestjs/core": "8.2.6",
+    "@nestjs/graphql": "9.1.2",
     "@nestjs/jwt": "8.0.0",
-    "@nestjs/mongoose": "9.0.1",
-    "@nestjs/passport": "8.0.1",
-    "@nestjs/platform-express": "8.1.2",
+    "@nestjs/mongoose": "9.0.2",
+    "@nestjs/passport": "8.1.0",
+    "@nestjs/platform-express": "8.2.6",
+    "@nestjs/testing": "8.2.6",
     "@types/ejs": "3.1.0",
-    "@types/jest": "27.0.2",
-    "@types/lodash": "4.14.176",
+    "@types/jest": "27.4.0",
+    "@types/lodash": "4.14.178",
     "@types/multer": "1.4.7",
-    "@types/node": "16.11.6",
+    "@types/node": "16.11.21",
     "@types/nodemailer": "6.4.4",
     "@types/passport": "1.0.7",
     "@types/supertest": "2.0.11",
-    "@typescript-eslint/eslint-plugin": "5.3.0",
-    "@typescript-eslint/parser": "5.3.0",
-    "apollo-server-core": "3.4.0",
-    "apollo-server-express": "3.4.0",
+    "@typescript-eslint/eslint-plugin": "5.10.0",
+    "@typescript-eslint/parser": "5.10.0",
+    "apollo-server-core": "3.6.2",
+    "apollo-server-express": "3.6.2",
     "bcrypt": "5.0.1",
-    "class-transformer": "0.4.0",
-    "class-validator": "0.13.1",
+    "class-transformer": "0.5.1",
+    "class-validator": "0.13.2",
     "coffeescript": "2.6.1",
     "ejs": "3.1.6",
-    "fastify": "3.22.1",
-    "graphql": "15.7.2",
+    "fastify": "3.27.0",
+    "graphql": "15.8.0",
     "graphql-subscriptions": "2.0.0",
     "grunt": "1.4.1",
     "grunt-bg-shell": "2.3.3",
@@ -98,33 +88,33 @@
     "grunt-contrib-watch": "1.1.0",
     "grunt-sync": "0.8.2",
     "husky": "7.0.4",
-    "jest": "27.3.1",
-    "json-to-graphql-query": "2.1.0",
-    "light-my-request": "4.6.0",
+    "jest": "27.4.7",
+    "json-to-graphql-query": "2.2.0",
+    "light-my-request": "4.7.0",
     "lodash": "4.17.21",
-    "mongoose": "6.0.12",
-    "multer": "1.4.3",
-    "nodemailer": "6.7.0",
-    "nodemon": "2.0.14",
-    "passport": "0.4.1",
+    "mongoose": "6.1.7",
+    "multer": "1.4.4",
+    "nodemailer": "6.7.2",
+    "nodemon": "2.0.15",
+    "passport": "0.5.2",
     "passport-jwt": "4.0.0",
     "reflect-metadata": "0.1.13",
     "rimraf": "3.0.2",
-    "rxjs": "7.4.0",
-    "supertest": "6.1.6",
-    "ts-morph": "12.2.0",
+    "rxjs": "7.5.2",
+    "supertest": "6.2.2",
+    "ts-morph": "13.0.3",
     "ts-node": "10.4.0",
-    "tsconfig-paths": "3.11.0"
+    "tsconfig-paths": "3.12.0"
   },
   "devDependencies": {
-    "eslint": "8.1.0",
+    "eslint": "8.7.0",
     "eslint-config-prettier": "8.3.0",
     "find-file-up": "2.0.1",
     "pm2": "5.1.2",
-    "prettier": "2.4.1",
-    "pretty-quick": "3.1.1",
-    "ts-jest": "27.0.7",
-    "typescript": "4.4.4"
+    "prettier": "2.5.1",
+    "pretty-quick": "3.1.3",
+    "ts-jest": "27.1.3",
+    "typescript": "4.5.5"
   },
   "jest": {
     "collectCoverage": true,

package/src/core/common/helpers/service.helper.ts

@@ -1,4 +1,7 @@
+import { UnauthorizedException } from '@nestjs/common';
 import * as bcrypt from 'bcrypt';
+import * as _ from 'lodash';
+import { RoleEnum } from '../enums/role.enum';
 
 /**
  * Helper class for services
@@ -9,13 +12,15 @@ export class ServiceHelper {
    */
   static async prepareInput(
     input: { [key: string]: any },
-    currentUser: { id: string },
+    currentUser: { [key: string]: any; id: string },
     options: { [key: string]: any; create?: boolean; clone?: boolean } = {},
     ...args: any[]
   ) {
     // Configuration
     const config = {
+      checkRoles: true,
       clone: false,
+      create: false,
       ...options,
     };
 
@@ -24,7 +29,21 @@ export class ServiceHelper {
       input = JSON.parse(JSON.stringify(input));
     }
 
-    // Has password
+    // Process roles
+    if (input.roles && config.checkRoles && (!currentUser?.hasRole || !currentUser.hasRole(RoleEnum.ADMIN))) {
+      if (!(currentUser as any)?.roles) {
+        throw new UnauthorizedException('Missing roles of current user');
+      } else {
+        const allowedRoles = _.intersection(input.roles, (currentUser as any).roles);
+        if (allowedRoles.length !== input.roles.length) {
+          const missingRoles = _.difference(input.roles, (currentUser as any).roles);
+          throw new UnauthorizedException('Current user not allowed setting roles: ' + missingRoles);
+        }
+        input.roles = allowedRoles;
+      }
+    }
+
+    // Hash password
     if (input.password) {
       input.password = await bcrypt.hash((input as any).password, 10);
     }

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

@@ -16,9 +16,9 @@ const pubSub = new PubSub();
  * User service
  */
 export abstract class CoreBasicUserService<
-  TUser = CoreUserModel,
-  TUserInput = CoreUserInput,
-  TUserCreateInput = CoreUserCreateInput
+  TUser extends CoreUserModel,
+  TUserInput extends CoreUserInput,
+  TUserCreateInput extends CoreUserCreateInput
 > {
   protected readonly model: ICorePersistenceModel;
 

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

@@ -1,13 +1,20 @@
-import { NotFoundException, UnprocessableEntityException } from '@nestjs/common';
+import {
+  BadRequestException,
+  NotFoundException,
+  UnauthorizedException,
+  UnprocessableEntityException,
+} from '@nestjs/common';
 import * as bcrypt from 'bcrypt';
 import { PubSub } from 'graphql-subscriptions';
 import { FilterArgs } from '../../common/args/filter.args';
+import { RoleEnum } from '../../common/enums/role.enum';
 import { Filter } from '../../common/helpers/filter.helper';
 import { CoreBasicUserService } from './core-basic-user.service';
 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 * as _ from 'lodash';
 
 // Subscription
 const pubSub = new PubSub();
@@ -16,9 +23,9 @@ const pubSub = new PubSub();
  * User service
  */
 export abstract class CoreUserService<
-  TUser = CoreUserModel,
-  TUserInput = CoreUserInput,
-  TUserCreateInput = CoreUserCreateInput
+  TUser extends CoreUserModel,
+  TUserInput extends CoreUserInput,
+  TUserCreateInput extends CoreUserCreateInput
 > extends CoreBasicUserService<TUser, TUserInput, TUserCreateInput> {
   protected constructor(protected readonly userModel: Model<any>) {
     super(userModel);
@@ -108,6 +115,24 @@ export abstract class CoreUserService<
     );
   }
 
+  /**
+   * Set roles for specified user
+   */
+  async setRoles(userId: string, roles: string[]): Promise<TUser> {
+    // Check roles
+    if (!Array.isArray(roles)) {
+      throw new BadRequestException('Missing roles');
+    }
+
+    // Check roles values
+    if (roles.some((role) => typeof role !== 'string')) {
+      throw new BadRequestException('roles contains invalid values');
+    }
+
+    // Update and return user
+    return this.userModel.findByIdAndUpdate(userId, { roles }).exec();
+  }
+
   /**
    * Update user via ID
    */
@@ -144,22 +169,37 @@ export abstract class CoreUserService<
    */
   protected async prepareInput(
     input: { [key: string]: any },
-    currentUser: TUser,
-    options: { [key: string]: any; create?: boolean; clone?: boolean } = {},
+    currentUser?: TUser,
+    options: { [key: string]: any; checkRoles?: boolean; clone?: boolean } = {},
     ...args: any[]
   ) {
     // Configuration
     const config = {
+      checkRoles: true,
       clone: false,
       ...options,
     };
 
-    // Clone output
+    // Clone input
     if (config.clone) {
       input = JSON.parse(JSON.stringify(input));
     }
 
-    // Has password
+    // Process roles
+    if (input.roles && config.checkRoles && (!currentUser?.hasRole || !currentUser.hasRole(RoleEnum.ADMIN))) {
+      if (!(currentUser as any)?.roles) {
+        throw new UnauthorizedException('Missing roles of current user');
+      } else {
+        const allowedRoles = _.intersection(input.roles, (currentUser as any).roles);
+        if (allowedRoles.length !== input.roles.length) {
+          const missingRoles = _.difference(input.roles, (currentUser as any).roles);
+          throw new UnauthorizedException('Current user not allowed setting roles: ' + missingRoles);
+        }
+        input.roles = allowedRoles;
+      }
+    }
+
+    // Hash password
     if (input.password) {
       input.password = await bcrypt.hash((input as any).password, 10);
     }

package/src/server/server.module.ts

@@ -4,7 +4,6 @@ import { CoreModule } from '../core.module';
 import { AuthModule } from './modules/auth/auth.module';
 import { FileController } from './modules/file/file.controller';
 import { ServerController } from './server.controller';
-import { PubSub } from 'graphql-subscriptions';
 
 /**
  * Server module (dynamic)