Merge pull request #1 from bharathkeyvalue/multi-tanent-test-fix

tests: multi-tanent test fixes

Author: bharathkeyvalue

package-lock.json

@@ -65,6 +65,7 @@
     "twilio": "^3.67.1",
     "typeorm": "^0.3.11",
     "typeorm-naming-strategies": "^2.0.0",
+    "uuid": "^8.3.2",
     "winston": "^3.3.3"
   },
   "devDependencies": {
@@ -86,6 +87,7 @@
     "@types/speakeasy": "^2.0.6",
     "@types/supertest": "^2.0.10",
     "@types/totp-generator": "0.0.2",
+    "@types/uuid": "^10.0.0",
     "@typescript-eslint/eslint-plugin": "^4.19.0",
     "@typescript-eslint/parser": "^4.19.0",
     "eslint": "^7.22.0",

package.json

@@ -1,4 +1,4 @@
-import { Module } from '@nestjs/common';
+import { MiddlewareConsumer, Module } from '@nestjs/common';
 import * as Joi from '@hapi/joi';
 import { ConfigModule } from '@nestjs/config';
 
@@ -7,6 +7,7 @@ import { AppGraphQLModule } from './graphql/graphql.module';
 import { UserAuthModule } from './authentication/authentication.module';
 import { AuthorizationModule } from './authorization/authorization.module';
 import { HealthModule } from './health/health.module';
+import { ExecutionContextBinder } from './middleware/executionId.middleware';
 
 @Module({
   imports: [
@@ -30,4 +31,8 @@ import { HealthModule } from './health/health.module';
   controllers: [],
   providers: [],
 })
-export class AppModule {}
+export class AppModule {
+  configure(consumer: MiddlewareConsumer) {
+    consumer.apply(ExecutionContextBinder).forRoutes('*');
+  }
+}

src/app.module.ts

@@ -13,10 +13,9 @@ export class AuthenticationHelper {
       this.configService.get('JWT_TOKEN_EXPTIME') * 1 || 60 * 60;
     const secret = this.configService.get('JWT_SECRET') as string;
     const username = userDetails.email || userDetails.phone;
-    const tenantId = userDetails.tenantId;
     const dataStoredInToken = {
       username: username,
-      tenantId,
+      tenantId: userDetails.tenantId,
       sub: userDetails.id,
       env: this.configService.get('ENV') || 'local',
     };

src/authentication/authentication.helper.ts

@@ -25,6 +25,7 @@ import {
 } from '../exception/userauth.exception';
 import { Authenticatable } from '../interfaces/authenticatable';
 import { TokenService } from './token.service';
+import { ExecutionManager } from '../../util/execution.manager';
 
 @Injectable()
 export default class PasswordAuthService implements Authenticatable {
@@ -68,6 +69,7 @@ export default class PasswordAuthService implements Authenticatable {
   async inviteTokenSignup(
     userDetails: UserInviteTokenSignupInput,
   ): Promise<InviteTokenResponse> {
+    const tenantId = ExecutionManager.getTenantId();
     const verifyUser = await this.userService.verifyDuplicateUser(
       userDetails.email,
       userDetails.phone,
@@ -85,6 +87,7 @@ export default class PasswordAuthService implements Authenticatable {
     userFromInput.middleName = userDetails.middleName;
     userFromInput.lastName = userDetails.lastName;
     userFromInput.status = Status.INVITED;
+    userFromInput.tenantId = tenantId;
     let invitationToken: { token: any; tokenExpiryTime?: any };
     const transaction = await this.dataSource.manager.transaction(async () => {
       const savedUser = await this.userService.createUser(userFromInput);
@@ -104,6 +107,7 @@ export default class PasswordAuthService implements Authenticatable {
         lastName: user.lastName,
         inviteToken: user?.inviteToken,
         status: user.status,
+        tenantId: user.tenantId,
       };
       return {
         inviteToken: invitationToken.token,

src/authentication/service/password.auth.service.ts

@@ -1,8 +1,8 @@
-import { PrimaryColumn } from 'typeorm';
+import { Column } from 'typeorm';
 import BaseEntity from './base.entity';
 
 class AbstractTenantEntity extends BaseEntity {
-  @PrimaryColumn({ type: 'uuid' })
+  @Column({ type: 'uuid' })
   public tenantId!: string;
 }
 

src/authorization/entity/abstract.tenant.entity.ts

@@ -1,6 +1,7 @@
 type Entity {
   id: ID!
   name: String!
+  tenantId: String!
   permissions: [Permission]
 }
 

src/authorization/graphql/entity.graphql

@@ -1,6 +1,7 @@
 type Group {
   id: ID!
   name: String!
+  tenantId: String!
   users: [User]
   roles: [Role]
   permissions: [Permission]
@@ -27,6 +28,7 @@ input UpdateGroupRoleInput {
 type GroupRole {
   id: ID!,
   name: String!
+  tenantId: String!
 }
 
 input GroupInputFilter {

src/authorization/graphql/group.graphql

@@ -1,6 +1,7 @@
 type Role {
   id: ID!
   name: String!
+  tenantId: String!
   permissions: [Permission]
 }
 

src/authorization/graphql/role.graphql

@@ -20,6 +20,7 @@ type User {
   groups: [Group]
   permissions: [Permission]
   inviteToken: String
+  tenantId: String!
 }
 
 enum OperationType {
@@ -44,6 +45,7 @@ input UpdateUserGroupInput {
 type UserGroupResponse {
   id: ID!,
   name: String!
+  tenantId: String!
 }
 
 enum OperationType {