rez_core 0.0.3 → 0.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -12,6 +12,8 @@ export declare class UserService extends EntityServiceImpl {
|
|
|
12
12
|
private userRepository;
|
|
13
13
|
private userRoleMappingService;
|
|
14
14
|
private readonly clockIDGenService;
|
|
15
|
+
masterKey: string;
|
|
16
|
+
masterIv: string;
|
|
15
17
|
constructor(entityMasterService: EntityMasterService, reflectionHelper: ReflectionHelper, entityListService: EntityListService, loggingService: LoggingService, userRepository: UserRepository, userRoleMappingService: UserRoleMappingService, clockIDGenService: ClockIDGenService);
|
|
16
18
|
createEntity(entityData: BaseEntity, loggedInUser: UserData | null): Promise<BaseEntity>;
|
|
17
19
|
getEntityData(entityType: string, id: number): Promise<BaseEntity | null>;
|
|
@@ -30,6 +30,8 @@ let UserService = class UserService extends entity_service_impl_service_1.Entity
|
|
|
30
30
|
this.userRepository = userRepository;
|
|
31
31
|
this.userRoleMappingService = userRoleMappingService;
|
|
32
32
|
this.clockIDGenService = clockIDGenService;
|
|
33
|
+
this.masterKey = process.env.master_key || '';
|
|
34
|
+
this.masterIv = process.env.master_iv || '';
|
|
33
35
|
}
|
|
34
36
|
async createEntity(entityData, loggedInUser) {
|
|
35
37
|
let userData = entityData;
|
|
@@ -45,10 +47,10 @@ let UserService = class UserService extends entity_service_impl_service_1.Entity
|
|
|
45
47
|
userData.first_name + userData.last_name ? userData.last_name : '';
|
|
46
48
|
let password;
|
|
47
49
|
if (userData.password) {
|
|
48
|
-
password = encryptUtil_service_1.EncryptUtilService.encryptGCM(userData.password,
|
|
50
|
+
password = encryptUtil_service_1.EncryptUtilService.encryptGCM(userData.password, this.masterKey, this.masterIv);
|
|
49
51
|
}
|
|
50
52
|
else {
|
|
51
|
-
password = encryptUtil_service_1.EncryptUtilService.encryptGCM(this.clockIDGenService.idGenerator(''),
|
|
53
|
+
password = encryptUtil_service_1.EncryptUtilService.encryptGCM(this.clockIDGenService.idGenerator(''), this.masterKey, this.masterIv);
|
|
52
54
|
}
|
|
53
55
|
userData.password = password;
|
|
54
56
|
let savedData = await super.createEntity(userData, loggedInUser);
|
|
@@ -84,7 +86,7 @@ let UserService = class UserService extends entity_service_impl_service_1.Entity
|
|
|
84
86
|
async updateEntity(entityData, loggedInUserData) {
|
|
85
87
|
let userDto = entityData;
|
|
86
88
|
if (userDto.password) {
|
|
87
|
-
const password = encryptUtil_service_1.EncryptUtilService.encryptGCM(userDto.password,
|
|
89
|
+
const password = encryptUtil_service_1.EncryptUtilService.encryptGCM(userDto.password, this.masterKey, this.masterIv);
|
|
88
90
|
userDto.password = password;
|
|
89
91
|
}
|
|
90
92
|
let userData = (0, class_transformer_1.plainToInstance)(user_entity_1.UserData, userDto, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/user.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAiE;AACjE,gGAAmF;AACnF,oFAA+E;AAC/E,gGAAoF;AACpF,oFAA4E;AAC5E,uDAAiD;AAEjD,mEAA+D;AAC/D,oFAAgF;AAChF,0FAAkF;AAClF,
|
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/user.service.ts"],"names":[],"mappings":"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"}
|