rez_core 2.0.1 → 2.0.3
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.
- package/dist/module/meta/controller/entity.controller.d.ts +1 -1
- package/dist/module/meta/controller/entity.controller.js +14 -11
- package/dist/module/meta/controller/entity.controller.js.map +1 -1
- package/dist/module/meta/entity/app-master.entity.d.ts +5 -0
- package/dist/module/meta/entity/app-master.entity.js +30 -0
- package/dist/module/meta/entity/app-master.entity.js.map +1 -0
- package/dist/module/meta/entity/user-app-mapping.entity.d.ts +7 -0
- package/dist/module/meta/entity/user-app-mapping.entity.js +41 -0
- package/dist/module/meta/entity/user-app-mapping.entity.js.map +1 -0
- package/dist/module/meta/entity.module.js +9 -1
- package/dist/module/meta/entity.module.js.map +1 -1
- package/dist/module/meta/repository/user-app-mapping.repository.d.ts +8 -0
- package/dist/module/meta/repository/user-app-mapping.repository.js +43 -0
- package/dist/module/meta/repository/user-app-mapping.repository.js.map +1 -0
- package/dist/module/meta/service/entity-list.service.d.ts +2 -2
- package/dist/module/meta/service/entity-list.service.js +18 -7
- package/dist/module/meta/service/entity-list.service.js.map +1 -1
- package/dist/module/meta/service/entity-service-impl.service.d.ts +3 -3
- package/dist/module/meta/service/entity-service-impl.service.js +6 -6
- package/dist/module/meta/service/entity-service-impl.service.js.map +1 -1
- package/dist/module/meta/service/entity.service.d.ts +2 -2
- package/dist/module/meta/service/user-app-mapping.service.d.ts +7 -0
- package/dist/module/meta/service/user-app-mapping.service.js +31 -0
- package/dist/module/meta/service/user-app-mapping.service.js.map +1 -0
- package/dist/module/module/controller/module-access.controller.d.ts +5 -5
- package/dist/module/module/controller/module-access.controller.js +28 -16
- package/dist/module/module/controller/module-access.controller.js.map +1 -1
- package/dist/module/module/repository/module-access.repository.d.ts +10 -6
- package/dist/module/module/repository/module-access.repository.js +45 -29
- package/dist/module/module/repository/module-access.repository.js.map +1 -1
- package/dist/module/module/service/module-access.service.d.ts +9 -5
- package/dist/module/module/service/module-access.service.js +12 -10
- package/dist/module/module/service/module-access.service.js.map +1 -1
- package/dist/module/user/dto/create-user.dto.d.ts +1 -0
- package/dist/module/user/dto/create-user.dto.js.map +1 -1
- package/dist/module/user/entity/user-role-mapping.entity.js +1 -1
- package/dist/module/user/entity/user-role-mapping.entity.js.map +1 -1
- package/dist/module/user/service/login.service.d.ts +3 -1
- package/dist/module/user/service/login.service.js +11 -4
- package/dist/module/user/service/login.service.js.map +1 -1
- package/dist/module/user/service/role.service.d.ts +1 -1
- package/dist/module/user/service/role.service.js +4 -1
- package/dist/module/user/service/role.service.js.map +1 -1
- package/dist/module/user/service/user-session.service.d.ts +1 -1
- package/dist/module/user/service/user-session.service.js +2 -2
- package/dist/module/user/service/user-session.service.js.map +1 -1
- package/dist/module/user/service/user.service.d.ts +6 -2
- package/dist/module/user/service/user.service.js +25 -3
- package/dist/module/user/service/user.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/meta/controller/entity.controller.ts +27 -12
- package/src/module/meta/entity/app-master.entity.ts +13 -0
- package/src/module/meta/entity/user-app-mapping.entity.ts +21 -0
- package/src/module/meta/entity.module.ts +10 -1
- package/src/module/meta/repository/user-app-mapping.repository.ts +29 -0
- package/src/module/meta/service/entity-list.service.ts +29 -7
- package/src/module/meta/service/entity-service-impl.service.ts +31 -19
- package/src/module/meta/service/entity.service.ts +2 -1
- package/src/module/meta/service/user-app-mapping.service.ts +17 -0
- package/src/module/module/controller/module-access.controller.ts +48 -21
- package/src/module/module/repository/module-access.repository.ts +69 -50
- package/src/module/module/service/module-access.service.ts +15 -13
- package/src/module/user/dto/create-user.dto.ts +1 -0
- package/src/module/user/entity/user-role-mapping.entity.ts +2 -2
- package/src/module/user/service/login.service.ts +23 -3
- package/src/module/user/service/role.service.ts +5 -1
- package/src/module/user/service/user-session.service.ts +2 -2
- package/src/module/user/service/user.service.ts +76 -5
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { RoleService } from './role.service';
|
|
1
2
|
import { EntityServiceImpl } from '../../meta/service/entity-service-impl.service';
|
|
2
3
|
import { UserData } from '../entity/user.entity';
|
|
3
4
|
import { BaseEntity } from '../../meta/entity/base-entity.entity';
|
|
@@ -6,15 +7,18 @@ import { ClockIDGenService } from '../../../utils/service/clockIDGenUtil.service
|
|
|
6
7
|
import { UserRoleMappingService } from './user-role-mapping.service';
|
|
7
8
|
import { EntityManager } from 'typeorm';
|
|
8
9
|
import { ConfigService } from '@nestjs/config';
|
|
10
|
+
import { UserAppMappingService } from 'src/module/meta/service/user-app-mapping.service';
|
|
9
11
|
export declare class UserService extends EntityServiceImpl {
|
|
10
12
|
private userRepository;
|
|
11
13
|
private userRoleMappingService;
|
|
12
14
|
private readonly clockIDGenService;
|
|
13
15
|
private configService;
|
|
14
|
-
|
|
16
|
+
private readonly userAppMappingService;
|
|
17
|
+
private readonly roleService;
|
|
18
|
+
constructor(userRepository: UserRepository, userRoleMappingService: UserRoleMappingService, clockIDGenService: ClockIDGenService, configService: ConfigService, userAppMappingService: UserAppMappingService, roleService: RoleService);
|
|
15
19
|
masterKey: any;
|
|
16
20
|
masterIv: any;
|
|
17
|
-
createEntity(entityData: BaseEntity, loggedInUser: UserData | null, manager?: EntityManager): Promise<BaseEntity>;
|
|
21
|
+
createEntity(entityData: BaseEntity, loggedInUser: UserData | null, manager?: EntityManager, appcode?: string): Promise<BaseEntity>;
|
|
18
22
|
getEntityData(entityType: string, id: number): Promise<BaseEntity | null>;
|
|
19
23
|
updateEntity(entityData: BaseEntity, loggedInUserData: UserData): Promise<BaseEntity>;
|
|
20
24
|
findByEmailId(email_id: string, organization_id?: number, appCode?: string): Promise<UserData | null>;
|
|
@@ -8,8 +8,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
exports.UserService = void 0;
|
|
16
|
+
const role_service_1 = require("./role.service");
|
|
13
17
|
const common_1 = require("@nestjs/common");
|
|
14
18
|
const entity_service_impl_service_1 = require("../../meta/service/entity-service-impl.service");
|
|
15
19
|
const user_entity_1 = require("../entity/user.entity");
|
|
@@ -21,18 +25,24 @@ const user_role_mapping_service_1 = require("./user-role-mapping.service");
|
|
|
21
25
|
const user_role_mapping_entity_1 = require("../entity/user-role-mapping.entity");
|
|
22
26
|
const class_transformer_1 = require("class-transformer");
|
|
23
27
|
const config_1 = require("@nestjs/config");
|
|
28
|
+
const user_app_mapping_service_1 = require("../../meta/service/user-app-mapping.service");
|
|
24
29
|
let UserService = class UserService extends entity_service_impl_service_1.EntityServiceImpl {
|
|
25
|
-
constructor(userRepository, userRoleMappingService, clockIDGenService, configService) {
|
|
30
|
+
constructor(userRepository, userRoleMappingService, clockIDGenService, configService, userAppMappingService, roleService) {
|
|
26
31
|
super();
|
|
27
32
|
this.userRepository = userRepository;
|
|
28
33
|
this.userRoleMappingService = userRoleMappingService;
|
|
29
34
|
this.clockIDGenService = clockIDGenService;
|
|
30
35
|
this.configService = configService;
|
|
36
|
+
this.userAppMappingService = userAppMappingService;
|
|
37
|
+
this.roleService = roleService;
|
|
31
38
|
this.masterKey = this.configService.get('MASTER_KEY') || '';
|
|
32
39
|
this.masterIv = this.configService.get('MASTER_IV') || '';
|
|
33
40
|
}
|
|
34
|
-
async createEntity(entityData, loggedInUser, manager) {
|
|
41
|
+
async createEntity(entityData, loggedInUser, manager, appcode) {
|
|
35
42
|
let userData = entityData;
|
|
43
|
+
if (appcode) {
|
|
44
|
+
userData.appcode = appcode;
|
|
45
|
+
}
|
|
36
46
|
let existingUser = await this.userRepository.findByEmailId(userData.email_id, loggedInUser?.organization_id);
|
|
37
47
|
if (existingUser) {
|
|
38
48
|
throw new common_1.BadRequestException('User already exists');
|
|
@@ -53,9 +63,12 @@ let UserService = class UserService extends entity_service_impl_service_1.Entity
|
|
|
53
63
|
}
|
|
54
64
|
userData.password = password;
|
|
55
65
|
userData.is_firstlogin = 1;
|
|
66
|
+
userData.roles = [];
|
|
56
67
|
userData.invitation_status = 'SENT';
|
|
57
68
|
userData.status = global_constant_1.STATUS_ACTIVE;
|
|
58
69
|
const savedData = await super.createEntity(userData, loggedInUser);
|
|
70
|
+
userData.roles.push('1');
|
|
71
|
+
userData.roles.push('2');
|
|
59
72
|
if (userData.roles) {
|
|
60
73
|
let roles = userData.roles;
|
|
61
74
|
await this.userRoleMappingService.deleteByUserId(userData.id);
|
|
@@ -64,6 +77,12 @@ let UserService = class UserService extends entity_service_impl_service_1.Entity
|
|
|
64
77
|
await this.userRoleMappingService.assignUserRole(userRoleMapping);
|
|
65
78
|
}
|
|
66
79
|
}
|
|
80
|
+
const appcodedata = ['CRM', 'ERP'];
|
|
81
|
+
if (savedData.id) {
|
|
82
|
+
for (const app of appcodedata) {
|
|
83
|
+
await this.userAppMappingService.assignUserAppMapping(savedData.id, app);
|
|
84
|
+
}
|
|
85
|
+
}
|
|
67
86
|
return savedData;
|
|
68
87
|
}
|
|
69
88
|
async getEntityData(entityType, id) {
|
|
@@ -120,9 +139,12 @@ let UserService = class UserService extends entity_service_impl_service_1.Entity
|
|
|
120
139
|
exports.UserService = UserService;
|
|
121
140
|
exports.UserService = UserService = __decorate([
|
|
122
141
|
(0, common_1.Injectable)(),
|
|
142
|
+
__param(5, (0, common_1.Inject)('RoleService')),
|
|
123
143
|
__metadata("design:paramtypes", [user_repository_1.UserRepository,
|
|
124
144
|
user_role_mapping_service_1.UserRoleMappingService,
|
|
125
145
|
clockIDGenUtil_service_1.ClockIDGenService,
|
|
126
|
-
config_1.ConfigService
|
|
146
|
+
config_1.ConfigService,
|
|
147
|
+
user_app_mapping_service_1.UserAppMappingService,
|
|
148
|
+
role_service_1.RoleService])
|
|
127
149
|
], UserService);
|
|
128
150
|
//# sourceMappingURL=user.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/user.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/user.service.ts"],"names":[],"mappings":"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"}
|