rez_core 1.0.26 → 1.0.28

package/src/module/notification/service/otp.service.ts

@@ -2,17 +2,20 @@ import { Injectable } from '@nestjs/common';
 import { OtpRepository } from '../repository/otp.repository';
 import { Otp } from '../entity/otp.entity';
 import { ClockIDGenService } from '../../../utils/service/clockIDGenUtil.service';
+import { ConfigService } from '@nestjs/config';
 
 @Injectable()
 export class OtpService {
-  VERIFY_OTP = process.env.VERIFY_OTP || 'true';
-  DEFAULT_OTP = process.env.DEFAULT_OTP || '123456';
-
   constructor(
     private readonly otpRepository: OtpRepository,
     private readonly idGen: ClockIDGenService,
+    private configService: ConfigService,
   ) {
   }
+  
+  VERIFY_OTP = this.configService.get('VERIFY_OTP') || 'true';
+  DEFAULT_OTP = this.configService.get('DEFAULT_OTP') || '123456';
+
 
   async generate(identifier: string, service: string, expiresIn: number = 5, otpLength: number = 6) {
     let otp = new Otp();

package/src/module/user/controller/user.controller.ts

@@ -1,28 +1,28 @@
-import {
-  Body,
-  Controller,
-  HttpStatus,
-  Inject,
-  Post,
-  Res,
-  ValidationPipe,
-} from '@nestjs/common';
-import { UserService } from '../service/user.service';
-import { CreateUserDto } from '../dto/create-user.dto';
-import { Response } from 'express';
-
-@Controller('user')
-export class UserController {
-  constructor(
-    @Inject('UserService') private readonly userService: UserService,
-  ) {}
-
-  @Post('signup')
-  async signup(
-    @Body(new ValidationPipe()) createUserDto: CreateUserDto,
-    @Res() res: Response,
-  ) {
-    const result = await this.userService.createEntity(createUserDto, null);
-    res.status(HttpStatus.OK).json(result);
-  }
-}
+import {
+  Body,
+  Controller,
+  HttpStatus,
+  Inject,
+  Post,
+  Res,
+  ValidationPipe,
+} from '@nestjs/common';
+import { UserService } from '../service/user.service';
+import { CreateUserDto } from '../dto/create-user.dto';
+import { Response } from 'express';
+
+@Controller('user')
+export class UserController {
+  constructor(
+    @Inject('UserService') private readonly userService: UserService,
+  ) {}
+
+  @Post('signup')
+  async signup(
+    @Body(new ValidationPipe()) createUserDto: CreateUserDto,
+    @Res() res: Response,
+  ) {
+    const result = await this.userService.createEntity(createUserDto, null);
+    res.status(HttpStatus.OK).json(result);
+  }
+}

package/src/module/user/dto/update-user.dto.ts

@@ -1,4 +1,4 @@
-import { PartialType } from '@nestjs/mapped-types';
-import { CreateUserDto } from './create-user.dto';
-
-export class UpdateUserDto extends PartialType(CreateUserDto) {}
+import { PartialType } from '@nestjs/mapped-types';
+import { CreateUserDto } from './create-user.dto';
+
+export class UpdateUserDto extends PartialType(CreateUserDto) {}

package/src/module/user/entity/user-role-mapping.entity.ts

@@ -1,21 +1,21 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-
-@Entity({ name: 'cr_user_role_mapping' })
-export class UserRoleMapping {
-  constructor(user_id: number, role_id: number) {
-    this.user_id = user_id;
-    this.role_id = role_id;
-  }
-
-  @PrimaryGeneratedColumn()
-  id: number;
-
-  @Column({ type: 'bigint', nullable: true })
-  user_id: number;
-
-  @Column({ type: 'bigint', nullable: true })
-  role_id: number;
-
-  @Column({ type: 'int', nullable: true })
-  is_default: number;
-}
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+@Entity({ name: 'cr_user_role_mapping' })
+export class UserRoleMapping {
+  constructor(user_id: number, role_id: number) {
+    this.user_id = user_id;
+    this.role_id = role_id;
+  }
+
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column({ type: 'bigint', nullable: true })
+  user_id: number;
+
+  @Column({ type: 'bigint', nullable: true })
+  role_id: number;
+
+  @Column({ type: 'int', nullable: true })
+  is_default: number;
+}

package/src/module/user/entity/user-session.entity.ts

@@ -1,61 +1,61 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-
-@Entity({ name: 'cr_user_session' })
-export class UserSession {
-  @PrimaryGeneratedColumn()
-  id: number;
-
-  @Column({
-    name: 'is_session_loggedout',
-    nullable: true,
-    type: 'int',
-  })
-  is_session_loggedout: number;
-
-  @Column({
-    name: 'login_id',
-    nullable: true,
-    length: 50,
-  })
-  login_id: string;
-
-  @Column({
-    name: 'login_time',
-    nullable: true,
-  })
-  login_time: Date;
-
-  @Column({
-    name: 'logout_time',
-    nullable: true,
-  })
-  logout_time: Date;
-
-  @Column({
-    name: 'session_key',
-    nullable: true,
-    length: 100,
-  })
-  session_key: string;
-
-  @Column({
-    name: 'user_id',
-    nullable: true,
-    type: 'bigint',
-  })
-  user_id: number;
-
-  @Column({
-    name: 'access_token',
-    nullable: true,
-    type: 'varchar',
-    length: 5000,
-  })
-  access_token: string;
-
-  @Column({
-    name: 'expiry_date',
-    nullable: true,
-  })
-  expiry_date: Date;
-}
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+@Entity({ name: 'cr_user_session' })
+export class UserSession {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column({
+    name: 'is_session_loggedout',
+    nullable: true,
+    type: 'int',
+  })
+  is_session_loggedout: number;
+
+  @Column({
+    name: 'login_id',
+    nullable: true,
+    length: 50,
+  })
+  login_id: string;
+
+  @Column({
+    name: 'login_time',
+    nullable: true,
+  })
+  login_time: Date;
+
+  @Column({
+    name: 'logout_time',
+    nullable: true,
+  })
+  logout_time: Date;
+
+  @Column({
+    name: 'session_key',
+    nullable: true,
+    length: 100,
+  })
+  session_key: string;
+
+  @Column({
+    name: 'user_id',
+    nullable: true,
+    type: 'bigint',
+  })
+  user_id: number;
+
+  @Column({
+    name: 'access_token',
+    nullable: true,
+    type: 'varchar',
+    length: 5000,
+  })
+  access_token: string;
+
+  @Column({
+    name: 'expiry_date',
+    nullable: true,
+  })
+  expiry_date: Date;
+}

package/src/module/user/entity/user.entity.ts

@@ -1,35 +1,35 @@
-import { Column, Entity } from 'typeorm';
-import { ENTITYTYPE_USER } from '../../../constant/global.constant';
-import { BaseEntity } from '../../meta/entity/base-entity.entity';
-
-@Entity({ name: 'cr_user' })
-export class UserData extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ENTITYTYPE_USER;
-  }
-
-  @Column({ type: 'varchar', length: 50, nullable: true })
-  first_name: string;
-
-  @Column({ type: 'varchar', length: 50, nullable: true })
-  last_name: string;
-
-  @Column({ type: 'varchar', length: 200, nullable: true })
-  password: string;
-
-  @Column({ type: 'varchar', length: 200, nullable: true })
-  email_id: string;
-
-  @Column({ type: 'varchar', length: 50, nullable: true })
-  mobile: string;
-
-  @Column({ type: 'int', nullable: true })
-  is_firstlogin: number;
-
-  @Column({ type: 'int', width: 1, nullable: true })
-  is_defaultadmin: number;
-
-  @Column({ type: 'int', width: 1, nullable: true })
-  is_customer: number;
-}
+import { Column, Entity } from 'typeorm';
+import { ENTITYTYPE_USER } from '../../../constant/global.constant';
+import { BaseEntity } from '../../meta/entity/base-entity.entity';
+
+@Entity({ name: 'cr_user' })
+export class UserData extends BaseEntity {
+  constructor() {
+    super();
+    this.entity_type = ENTITYTYPE_USER;
+  }
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  first_name: string;
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  last_name: string;
+
+  @Column({ type: 'varchar', length: 200, nullable: true })
+  password: string;
+
+  @Column({ type: 'varchar', length: 200, nullable: true })
+  email_id: string;
+
+  @Column({ type: 'varchar', length: 50, nullable: true })
+  mobile: string;
+
+  @Column({ type: 'int', nullable: true })
+  is_firstlogin: number;
+
+  @Column({ type: 'int', width: 1, nullable: true })
+  is_defaultadmin: number;
+
+  @Column({ type: 'int', width: 1, nullable: true })
+  is_customer: number;
+}

package/src/module/user/repository/role.repository.ts

@@ -1,16 +1,16 @@
-import { Injectable } from '@nestjs/common';
-import { Repository } from 'typeorm';
-import { InjectRepository } from '@nestjs/typeorm';
-import { Role } from '../entity/role.entity';
-
-@Injectable()
-export class RoleRepository {
-  constructor(
-    @InjectRepository(Role)
-    private readonly roleRepo: Repository<Role>,
-  ) {}
-
-  async findByCode(code: string): Promise<Role | null> {
-    return this.roleRepo.findOne({ where: { code } });
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { Repository } from 'typeorm';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Role } from '../entity/role.entity';
+
+@Injectable()
+export class RoleRepository {
+  constructor(
+    @InjectRepository(Role)
+    private readonly roleRepo: Repository<Role>,
+  ) {}
+
+  async findByCode(code: string): Promise<Role | null> {
+    return this.roleRepo.findOne({ where: { code } });
+  }
+}

package/src/module/user/repository/userSession.repository.ts

@@ -1,33 +1,33 @@
-import { Repository } from 'typeorm';
-import { UserSession } from '../entity/user-session.entity';
-import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-
-@Injectable()
-export class UserSessionRepository {
-  constructor(
-    @InjectRepository(UserSession)
-    private userSessionRepo: Repository<UserSession>,
-  ) {}
-
-  async findBySessionKey(sessionKey: string): Promise<UserSession | null> {
-    return this.userSessionRepo.findOne({ where: { session_key: sessionKey } });
-  }
-
-  async findActiveSessionByUserId(userId: number): Promise<UserSession | null> {
-    return this.userSessionRepo.findOne({
-      where: { user_id: userId, is_session_loggedout: 0 },
-    });
-  }
-
-  async saveSession(session: UserSession): Promise<UserSession> {
-    return this.userSessionRepo.save(session);
-  }
-
-  async logoutSession(sessionKey: string): Promise<void> {
-    await this.userSessionRepo.update(
-      { session_key: sessionKey },
-      { is_session_loggedout: 1, logout_time: new Date() },
-    );
-  }
-}
+import { Repository } from 'typeorm';
+import { UserSession } from '../entity/user-session.entity';
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+@Injectable()
+export class UserSessionRepository {
+  constructor(
+    @InjectRepository(UserSession)
+    private userSessionRepo: Repository<UserSession>,
+  ) {}
+
+  async findBySessionKey(sessionKey: string): Promise<UserSession | null> {
+    return this.userSessionRepo.findOne({ where: { session_key: sessionKey } });
+  }
+
+  async findActiveSessionByUserId(userId: number): Promise<UserSession | null> {
+    return this.userSessionRepo.findOne({
+      where: { user_id: userId, is_session_loggedout: 0 },
+    });
+  }
+
+  async saveSession(session: UserSession): Promise<UserSession> {
+    return this.userSessionRepo.save(session);
+  }
+
+  async logoutSession(sessionKey: string): Promise<void> {
+    await this.userSessionRepo.update(
+      { session_key: sessionKey },
+      { is_session_loggedout: 1, logout_time: new Date() },
+    );
+  }
+}

package/src/module/user/service/login.service.ts

@@ -3,6 +3,8 @@ import { EncryptUtilService } from '../../../utils/service/encryptUtil.service';
 import { UserData } from '../entity/user.entity';
 import { UserSessionService } from './user-session.service';
 import { UserService } from './user.service';
+import { ConfigService } from '@nestjs/config';
+
 
 
 @Injectable()
@@ -10,13 +12,13 @@ export class LoginService {
   constructor(
     @Inject('UserService') private readonly userService: UserService,
     private userSessionService: UserSessionService,
+    private configService: ConfigService
   ) {}
-  
-  masterKey: string = process.env.master_key || '';
-  masterIv: string = process.env.master_iv || '';
-  
+
+  masterKey: string = this.configService.get('MASTER_KEY') || '';
+  masterIv: string = this.configService.get('MASTER_IV') || '';
+
   async login(email: string, password: string) {
-    console.log(process.env.master_key)
     const user = await this.userService.findByEmailId(email);
     if (!user) {
       return {

package/src/module/user/service/user.service.ts

@@ -5,27 +5,30 @@ import { BaseEntity } from '../../meta/entity/base-entity.entity';
 import { UserRepository } from '../repository/user.repository';
 import { EncryptUtilService } from '../../../utils/service/encryptUtil.service';
 import { ClockIDGenService } from '../../../utils/service/clockIDGenUtil.service';
-import { ENTITYTYPE_ROLE } from '../../../constant/global.constant';
+import { ENTITYTYPE_ROLE, STATUS_ACTIVE } from '../../../constant/global.constant';
 import { CreateUserDto } from '../dto/create-user.dto';
 import { UserRoleMappingService } from './user-role-mapping.service';
 import { UserRoleMapping } from '../entity/user-role-mapping.entity';
 import { plainToInstance } from 'class-transformer';
 import { EntityManager } from 'typeorm';
 import { UpdateUserDto } from '../dto/update-user.dto';
+import { ConfigService } from '@nestjs/config';
 
 @Injectable()
 export class UserService extends EntityServiceImpl {
-  masterKey = process.env.master_key || '';
-  masterIv = process.env.master_iv || '';
-
   constructor(
     private userRepository: UserRepository,
     private userRoleMappingService: UserRoleMappingService,
     private readonly clockIDGenService: ClockIDGenService,
+    private configService: ConfigService,
   ) {
     super();
   }
 
+  masterKey = this.configService.get('MASTER_KEY') || '';
+  masterIv = this.configService.get('MASTER_IV') || '';
+
+
   async createEntity(
     entityData: BaseEntity,
     loggedInUser: UserData | null,
@@ -60,11 +63,11 @@ export class UserService extends EntityServiceImpl {
       );
     }
     userData.password = password;
-
-    let savedData = await super.createEntity(userData, loggedInUser);
+    userData.status = STATUS_ACTIVE;
+    const savedData = await super.createEntity(userData, loggedInUser);
     if (userData.roles) {
       let roles = userData.roles;
-      this.userRoleMappingService.deleteByUserId(userData.id);
+      await this.userRoleMappingService.deleteByUserId(userData.id);
       for (const role in roles) {
         let userRoleMapping = new UserRoleMapping(
           savedData.id,

package/src/resources/dev.properties.yaml

@@ -0,0 +1,15 @@
+DB_HOST: "13.234.25.234"
+DB_PORT: "3306"
+DB_USER: "root"
+DB_PASS: "Rezolut@123"
+DB_NAME: "core"
+MASTER_KEY: "0QZ2eRJv5oVILYnyBlC+FbSGVQiWKReh"
+MASTER_IV: "heuUQf5uPVtkotrFAOKUVw=="
+SECRET_KEY: "1hard_to_guess_secret7890a"
+CLIENT_ID: "324529881356-596sc8ksrb9lg01i7sktofqqqf0fv2ug.apps.googleusercontent.com"
+CLIENT_SECRET: "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"
+CALLBACK_URL: "http://localhost:3000/auth/google/callback"
+OTP_EXPIRY: "10"
+OTP_LENGTH: "6"
+VERIFY_OTP: "false"
+DEFAULT_OTP: "123456"

package/src/resources/properties.module.ts

@@ -0,0 +1,12 @@
+import { Module } from "@nestjs/common";
+import { ConfigModule } from "@nestjs/config";
+import propertiesYaml from "./properties.yaml";
+@Module({
+    imports: [
+        ConfigModule.forRoot({
+            load: [propertiesYaml],
+            isGlobal: true
+        })
+    ],
+})
+export default class Properties { }

package/src/resources/properties.yaml.ts

@@ -0,0 +1,11 @@
+import { readFileSync } from 'fs';
+import * as yaml from 'js-yaml';
+import { join } from 'path';
+
+const YAML_CONFIG = `/dev.properties.yaml`;
+
+export default () => {
+    return yaml.load(
+        readFileSync(join(__dirname, YAML_CONFIG), 'utf8'),
+    ) as Record<string, any>
+}

package/src/resources/uat.properties.yaml

@@ -0,0 +1,15 @@
+DB_HOST: "13.234.25.234"
+DB_PORT: "3306"
+DB_USER: "root"
+DB_PASS: "Rezolut@123"
+DB_NAME: "ether_core"
+MASTER_KEY: "0QZ2eRJv5oVILYnyBlC+FbSGVQiWKReh"
+MASTER_IV: "heuUQf5uPVtkotrFAOKUVw=="
+SECRET_KEY: "1hard_to_guess_secret7890a"
+CLIENT_ID: "324529881356-596sc8ksrb9lg01i7sktofqqqf0fv2ug.apps.googleusercontent.com"
+CLIENT_SECRET: "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"
+CALLBACK_URL: "http://localhost:3000/auth/google/callback"
+OTP_EXPIRY: "10"
+OTP_LENGTH: "6"
+VERIFY_OTP: "false"
+DEFAULT_OTP: "123456"