@lenne.tech/nest-server 2.0.0-alpha8 → 2.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "2.0.0-alpha8",
+  "version": "2.0.3",
   "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",
@@ -114,8 +114,7 @@
     "supertest": "6.1.6",
     "ts-morph": "11.0.3",
     "ts-node": "9.1.1",
-    "tsconfig-paths": "3.10.1",
-    "ts-jest": "27.0.5"
+    "tsconfig-paths": "3.10.1"
   },
   "devDependencies": {
     "eslint": "7.32.0",
@@ -124,6 +123,7 @@
     "pm2": "5.1.0",
     "prettier": "2.3.2",
     "pretty-quick": "3.1.1",
+    "ts-jest": "27.0.5",
     "typescript": "4.3.5"
   },
   "jest": {

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

@@ -14,20 +14,22 @@ export class ConfigService {
    * Create config service
    */
   constructor(config: { [key: string]: any } & Partial<IServerOptions>) {
-    this._config = config;
+    this._config = config || {};
   }
 
   /**
-   * Get config
+   * Get config (deep cloned to avoid unwanted side effects)
    */
   get config() {
     return _.cloneDeep(this._config);
   }
 
   /**
-   * Get data from config
+   * Get data from config (deep cloned to avoid unwanted side effects)
+   * @param key Property name of config object, which is to be returned
+   * @param defaultValue Default value which is to be returned if property doesn't exist
    */
-  get(key: string) {
-    return _.cloneDeep(_.get(this._config, key, undefined));
+  get(key: string, defaultValue: any = undefined) {
+    return _.cloneDeep(_.get(this._config, key, defaultValue));
   }
 }

package/src/core/modules/auth/core-auth.module.ts

@@ -6,6 +6,7 @@ import { RolesGuard } from './guards/roles.guard';
 import { JwtStrategy } from './jwt.strategy';
 import { CoreAuthUserService } from './services/core-auth-user.service';
 import { CoreAuthService } from './services/core-auth.service';
+import { PubSub } from 'graphql-subscriptions';
 
 /**
  * CoreAuthModule to handle user authentication and enables Roles
@@ -34,6 +35,10 @@ export class CoreAuthModule {
           provide: CoreAuthUserService,
           useClass: UserService,
         },
+        {
+          provide: 'PUB_SUB',
+          useValue: new PubSub(),
+        },
 
         // Standard services
         CoreAuthService,

package/src/core/modules/auth/guards/auth.guard.ts

@@ -58,6 +58,11 @@ function createAuthGuard(type?: string): Type<CanActivate> {
      * Integrate options
      */
     async canActivate(context: ExecutionContext): Promise<boolean> {
+      const args = context.getArgs();
+      if (args.length > 0 && args[args.length - 1]?.operation?.operation === 'subscription') {
+        return true;
+      }
+
       const options = { ...defaultOptions, ...this.options };
       const response = context?.switchToHttp()?.getResponse();
       let request = this.getRequest(context);

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

@@ -97,10 +97,11 @@ export abstract class CoreUserService<
    * Get users via filter
    */
   async find(filterArgs?: FilterArgs, ...args: any[]): Promise<TUser[]> {
+    const filterQuery = Filter.convertFilterArgsToQuery(filterArgs);
     // Return found users
     return await Promise.all(
       (
-        await this.userModel.find(...Filter.convertFilterArgsToQuery(filterArgs))
+        await this.userModel.find(filterQuery[0], null, filterQuery[1]).exec()
       ).map((user) => {
         return this.prepareOutput(user, args[0]);
       })

package/src/core.module.ts

@@ -41,6 +41,14 @@ export class CoreModule {
           autoSchemaFile: 'schema.gql',
           context: ({ req }) => ({ req }),
           installSubscriptionHandlers: true,
+          subscriptions: {
+            'subscriptions-transport-ws': {
+              onConnect: (connectionParams) => {
+                // TODO: Handle Authorization
+                const authToken = connectionParams.Authorization;
+              },
+            },
+          },
         },
         port: 3000,
         mongoose: {

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

@@ -5,6 +5,7 @@ import { User, UserSchema } from './user.model';
 import { UserResolver } from './user.resolver';
 import { UserService } from './user.service';
 import { MongooseModule } from '@nestjs/mongoose';
+import { PubSub } from 'graphql-subscriptions';
 
 /**
  * User module
@@ -12,7 +13,15 @@ import { MongooseModule } from '@nestjs/mongoose';
 @Module({
   imports: [MongooseModule.forFeature([{ name: User.name, schema: UserSchema }])],
   controllers: [AvatarController],
-  providers: [JSON, UserResolver, UserService],
+  providers: [
+    JSON,
+    UserResolver,
+    UserService,
+    {
+      provide: 'PUB_SUB',
+      useValue: new PubSub(),
+    },
+  ],
   exports: [MongooseModule, UserResolver, UserService],
 })
 export class UserModule {}

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

@@ -10,9 +10,7 @@ import { UserCreateInput } from './inputs/user-create.input';
 import { UserInput } from './inputs/user.input';
 import { User } from './user.model';
 import { UserService } from './user.service';
-
-// Subscription
-const pubSub = new PubSub();
+import { Inject } from '@nestjs/common';
 
 /**
  * Resolver to process with user data
@@ -22,7 +20,7 @@ export class UserResolver {
   /**
    * Import services
    */
-  constructor(protected readonly usersService: UserService) {}
+  constructor(protected readonly usersService: UserService, @Inject('PUB_SUB') protected readonly pubSub: PubSub) {}
 
   // ===========================================================================
   // Queries
@@ -96,9 +94,10 @@ export class UserResolver {
   /**
    * Subscritption for create user
    */
-  @Roles(RoleEnum.ADMIN)
-  @Subscription((returns) => User)
-  userCreated() {
-    return pubSub.asyncIterator('userCreated');
+  @Subscription((returns) => User, {
+    resolve: (value) => value,
+  })
+  async userCreated() {
+    return this.pubSub.asyncIterator('userCreated');
   }
 }

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

@@ -1,7 +1,6 @@
-import { Injectable, UnauthorizedException, UnprocessableEntityException } from '@nestjs/common';
+import { Inject, Injectable, UnauthorizedException, UnprocessableEntityException } from '@nestjs/common';
 import * as fs from 'fs';
 import { GraphQLResolveInfo } from 'graphql';
-import { PubSub } from 'graphql-subscriptions';
 import envConfig from '../../../config.env';
 import { FilterArgs } from '../../../core/common/args/filter.args';
 import { Filter } from '../../../core/common/helpers/filter.helper';
@@ -15,9 +14,7 @@ import { User } from './user.model';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 import { ICorePersistenceModel } from '../../../core/common/interfaces/core-persistence-model.interface';
-
-// Subscription
-const pubSub = new PubSub();
+import { PubSub } from 'graphql-subscriptions';
 
 /**
  * User service
@@ -42,7 +39,8 @@ export class UserService extends CoreUserService<User, UserInput, UserCreateInpu
   constructor(
     protected readonly configService: ConfigService,
     protected readonly emailService: EmailService,
-    @InjectModel('User') protected readonly userModel: Model<User>
+    @InjectModel('User') protected readonly userModel: Model<User>,
+    @Inject('PUB_SUB') protected readonly pubSub: PubSub
   ) {
     super(userModel);
     this.model = User;
@@ -58,6 +56,7 @@ export class UserService extends CoreUserService<User, UserInput, UserCreateInpu
   async create(input: UserCreateInput, currentUser?: User, ...args: any[]): Promise<User> {
     const user = await super.create(input, currentUser);
     const text = `Welcome ${user.firstName}, this is plain text from server.`;
+    await this.pubSub.publish('userCreated', User.map(user));
     await this.emailService.sendMail(user.email, 'Welcome', {
       htmlTemplate: 'welcome',
       templateData: user,
@@ -71,8 +70,9 @@ export class UserService extends CoreUserService<User, UserInput, UserCreateInpu
    * Get users via filter
    */
   find(filterArgs?: FilterArgs, ...args: any[]): Promise<User[]> {
+    const filterQuery = Filter.convertFilterArgsToQuery(filterArgs);
     // Return found users
-    return this.userModel.find(...Filter.convertFilterArgsToQuery(filterArgs)).exec();
+    return this.userModel.find(filterQuery[0], null, filterQuery[1]).exec();
   }
 
   /**

package/src/server/server.module.ts

@@ -4,6 +4,7 @@ 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)