rez_core 0.0.2 → 0.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "",
   "author": "",
   "private": false,

package/src/module/enterprise/enterprise.module.ts

@@ -1,8 +1,12 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { UserData } from '../user/entity/user.entity';
+import { OrganizationService } from './service/organization.service';
+import { OrganizationData } from './entity/organization.entity';
 
 @Module({
-  imports: [],
+  imports: [TypeOrmModule.forFeature([OrganizationData])],
+  providers:[OrganizationService],
+  exports:[OrganizationService]
 })
 export class EnterpriseModule {}

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

@@ -9,9 +9,7 @@ import { UserRepository } from '../repository/user.repository';
 import { EncryptUtilService } from '../../../utils/service/encryptUtil.service';
 import { ClockIDGenService } from '../../../utils/service/clockIDGenUtil.service';
 import {
-  ENTITYTYPE_ROLE,
-  masterIv,
-  masterKey,
+  ENTITYTYPE_ROLE
 } from '../../../constant/global.constant';
 import { CreateUserDto } from '../dto/create-user.dto';
 import { UserRoleMappingService } from './user-role-mapping.service';
@@ -19,8 +17,12 @@ import { UserRoleMapping } from '../entity/user-role-mapping.entity';
 import { plainToInstance } from 'class-transformer';
 import { EntityListService } from '../../meta/service/entity-list.service';
 
+
+
 @Injectable()
 export class UserService extends EntityServiceImpl {
+  masterKey = process.env.master_key || '';
+  masterIv = process.env.master_iv || '';
   constructor(
     entityMasterService: EntityMasterService,
     reflectionHelper: ReflectionHelper,
@@ -60,14 +62,14 @@ export class UserService extends EntityServiceImpl {
     if (userData.password) {
       password = EncryptUtilService.encryptGCM(
         userData.password,
-        masterKey,
-        masterIv,
+        this.masterKey,
+        this.masterIv,
       );
     } else {
       password = EncryptUtilService.encryptGCM(
         this.clockIDGenService.idGenerator(''),
-        masterKey,
-        masterIv,
+        this.masterKey,
+        this.masterIv,
       );
     }
     userData.password = password;
@@ -121,8 +123,8 @@ export class UserService extends EntityServiceImpl {
     if (userDto.password) {
       const password = EncryptUtilService.encryptGCM(
         userDto.password,
-        masterKey,
-        masterIv,
+        this.masterKey,
+        this.masterIv,
       );
       userDto.password = password;
     }