rez_core 2.0.2 → 2.0.4
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/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.js +1 -4
- package/dist/module/meta/service/entity-list.service.js.map +1 -1
- package/dist/module/meta/service/entity-service-impl.service.js +2 -2
- package/dist/module/meta/service/entity-service-impl.service.js.map +1 -1
- 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/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/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 +5 -1
- package/dist/module/user/service/user.service.js +21 -2
- 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/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 +4 -4
- package/src/module/meta/service/entity-service-impl.service.ts +3 -3
- package/src/module/meta/service/user-app-mapping.service.ts +17 -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/user-session.service.ts +2 -2
- package/src/module/user/service/user.service.ts +73 -6
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.UserAppMapping = void 0;
|
|
13
|
+
const typeorm_1 = require("typeorm");
|
|
14
|
+
const base_entity_entity_1 = require("./base-entity.entity");
|
|
15
|
+
let UserAppMapping = class UserAppMapping extends base_entity_entity_1.BaseEntity {
|
|
16
|
+
constructor() {
|
|
17
|
+
super();
|
|
18
|
+
this.entity_type = 'APM';
|
|
19
|
+
}
|
|
20
|
+
};
|
|
21
|
+
exports.UserAppMapping = UserAppMapping;
|
|
22
|
+
__decorate([
|
|
23
|
+
(0, typeorm_1.PrimaryGeneratedColumn)(),
|
|
24
|
+
__metadata("design:type", Number)
|
|
25
|
+
], UserAppMapping.prototype, "id", void 0);
|
|
26
|
+
exports.UserAppMapping = UserAppMapping = __decorate([
|
|
27
|
+
(0, typeorm_1.Entity)({ name: 'cr_app_master' }),
|
|
28
|
+
__metadata("design:paramtypes", [])
|
|
29
|
+
], UserAppMapping);
|
|
30
|
+
//# sourceMappingURL=app-master.entity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"app-master.entity.js","sourceRoot":"","sources":["../../../../src/module/meta/entity/app-master.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyD;AACzD,6DAAkD;AAG3C,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,+BAAU;IAC5C;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;IAC3B,CAAC;CAIF,CAAA;AARY,wCAAc;AAOzB;IADC,IAAA,gCAAsB,GAAE;;0CACd;yBAPA,cAAc;IAD1B,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC;;GACrB,cAAc,CAQ1B"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.UserAppMapping = void 0;
|
|
13
|
+
const typeorm_1 = require("typeorm");
|
|
14
|
+
let UserAppMapping = class UserAppMapping {
|
|
15
|
+
constructor(user_id) {
|
|
16
|
+
this.user_id = user_id;
|
|
17
|
+
this.entity_type = 'UAP';
|
|
18
|
+
}
|
|
19
|
+
};
|
|
20
|
+
exports.UserAppMapping = UserAppMapping;
|
|
21
|
+
__decorate([
|
|
22
|
+
(0, typeorm_1.PrimaryGeneratedColumn)(),
|
|
23
|
+
__metadata("design:type", Number)
|
|
24
|
+
], UserAppMapping.prototype, "id", void 0);
|
|
25
|
+
__decorate([
|
|
26
|
+
(0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
|
|
27
|
+
__metadata("design:type", Number)
|
|
28
|
+
], UserAppMapping.prototype, "user_id", void 0);
|
|
29
|
+
__decorate([
|
|
30
|
+
(0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
|
|
31
|
+
__metadata("design:type", String)
|
|
32
|
+
], UserAppMapping.prototype, "appcode", void 0);
|
|
33
|
+
__decorate([
|
|
34
|
+
(0, typeorm_1.Column)({ type: 'varchar' }),
|
|
35
|
+
__metadata("design:type", String)
|
|
36
|
+
], UserAppMapping.prototype, "entity_type", void 0);
|
|
37
|
+
exports.UserAppMapping = UserAppMapping = __decorate([
|
|
38
|
+
(0, typeorm_1.Entity)({ name: 'cr_user_app_mapping' }),
|
|
39
|
+
__metadata("design:paramtypes", [Number])
|
|
40
|
+
], UserAppMapping);
|
|
41
|
+
//# sourceMappingURL=user-app-mapping.entity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"user-app-mapping.entity.js","sourceRoot":"","sources":["../../../../src/module/meta/entity/user-app-mapping.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiE;AAG1D,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YAAY,OAAe;QACzB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;IAC3B,CAAC;CAaF,CAAA;AAjBY,wCAAc;AAOzB;IADC,IAAA,gCAAsB,GAAE;;0CACd;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CAC3B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CAC5B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;mDACR;yBAhBT,cAAc;IAD1B,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,CAAC;;GAC3B,cAAc,CAiB1B"}
|
|
@@ -47,6 +47,9 @@ const meta_controller_1 = require("./controller/meta.controller");
|
|
|
47
47
|
const entity_validation_service_1 = require("./service/entity-validation.service");
|
|
48
48
|
const listmaster_module_1 = require("../listmaster/listmaster.module");
|
|
49
49
|
const filter_module_1 = require("../filter/filter.module");
|
|
50
|
+
const user_app_mapping_service_1 = require("./service/user-app-mapping.service");
|
|
51
|
+
const user_app_mapping_repository_1 = require("./repository/user-app-mapping.repository");
|
|
52
|
+
const user_app_mapping_entity_1 = require("./entity/user-app-mapping.entity");
|
|
50
53
|
let EntityModule = class EntityModule {
|
|
51
54
|
};
|
|
52
55
|
exports.EntityModule = EntityModule;
|
|
@@ -65,10 +68,11 @@ exports.EntityModule = EntityModule = __decorate([
|
|
|
65
68
|
schoolAddress_entity_1.SchoolAddressEntity,
|
|
66
69
|
section_master_entity_1.SectionMaster,
|
|
67
70
|
field_group_entity_1.FieldGroup,
|
|
71
|
+
user_app_mapping_entity_1.UserAppMapping,
|
|
68
72
|
]),
|
|
69
73
|
(0, common_1.forwardRef)(() => listmaster_module_1.ListMasterModule),
|
|
70
74
|
(0, common_1.forwardRef)(() => filter_module_1.FilterModule),
|
|
71
|
-
utils_module_1.UtilsModule
|
|
75
|
+
utils_module_1.UtilsModule,
|
|
72
76
|
],
|
|
73
77
|
providers: [
|
|
74
78
|
entity_master_service_1.EntityMasterService,
|
|
@@ -90,6 +94,8 @@ exports.EntityModule = EntityModule = __decorate([
|
|
|
90
94
|
view_master_repository_1.ViewMaterRespository,
|
|
91
95
|
entity_validation_service_1.EntityValidationService,
|
|
92
96
|
{ provide: 'ViewMasterService', useClass: view_master_service_1.ViewMasterService },
|
|
97
|
+
user_app_mapping_service_1.UserAppMappingService,
|
|
98
|
+
user_app_mapping_repository_1.UserAppMappingRepository,
|
|
93
99
|
],
|
|
94
100
|
exports: [
|
|
95
101
|
entity_master_service_1.EntityMasterService,
|
|
@@ -104,6 +110,8 @@ exports.EntityModule = EntityModule = __decorate([
|
|
|
104
110
|
field_group_service_1.FieldGroupService,
|
|
105
111
|
'ViewMasterService',
|
|
106
112
|
attribute_master_service_1.AttributeMasterService,
|
|
113
|
+
user_app_mapping_service_1.UserAppMappingService,
|
|
114
|
+
user_app_mapping_repository_1.UserAppMappingRepository,
|
|
107
115
|
],
|
|
108
116
|
controllers: [
|
|
109
117
|
entity_controller_1.EntityController,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity.module.js","sourceRoot":"","sources":["../../../src/module/meta/entity.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,2EAAsE;AACtE,uFAA0E;AAC1E,sEAAkE;AAClE,6CAAgD;AAChD,2DAAuD;AACvD,wEAA6D;AAC7D,8EAAmE;AACnE,0FAAqF;AACrF,qEAAiE;AACjE,8EAA0E;AAC1E,kEAA8D;AAC9D,8EAA0E;AAC1E,qEAAiE;AACjE,sEAA2D;AAC3D,oFAAwE;AACxE,kFAA6E;AAC7E,yEAAoE;AACpE,gGAA0F;AAC1F,uFAAiF;AACjF,uEAAkE;AAClE,kEAAuD;AACvD,qEAAgE;AAChE,8EAAyE;AACzE,oEAAgE;AAChE,oEAAyD;AACzD,0DAAsD;AACtD,wEAAoE;AACpE,iFAA4E;AAC5E,6EAAwE;AACxE,0EAA+D;AAC/D,oEAAyD;AACzD,uEAAkE;AAClE,uEAAkE;AAClE,gFAA2E;AAC3E,gFAA2E;AAC3E,kEAA8D;AAC9D,mFAA8E;AAC9E,uEAAmE;AACnE,2DAAuD;
|
|
1
|
+
{"version":3,"file":"entity.module.js","sourceRoot":"","sources":["../../../src/module/meta/entity.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,2EAAsE;AACtE,uFAA0E;AAC1E,sEAAkE;AAClE,6CAAgD;AAChD,2DAAuD;AACvD,wEAA6D;AAC7D,8EAAmE;AACnE,0FAAqF;AACrF,qEAAiE;AACjE,8EAA0E;AAC1E,kEAA8D;AAC9D,8EAA0E;AAC1E,qEAAiE;AACjE,sEAA2D;AAC3D,oFAAwE;AACxE,kFAA6E;AAC7E,yEAAoE;AACpE,gGAA0F;AAC1F,uFAAiF;AACjF,uEAAkE;AAClE,kEAAuD;AACvD,qEAAgE;AAChE,8EAAyE;AACzE,oEAAgE;AAChE,oEAAyD;AACzD,0DAAsD;AACtD,wEAAoE;AACpE,iFAA4E;AAC5E,6EAAwE;AACxE,0EAA+D;AAC/D,oEAAyD;AACzD,uEAAkE;AAClE,uEAAkE;AAClE,gFAA2E;AAC3E,gFAA2E;AAC3E,kEAA8D;AAC9D,mFAA8E;AAC9E,uEAAmE;AACnE,2DAAuD;AACvD,iFAA2E;AAC3E,0FAAoF;AACpF,8EAAkE;AAqE3D,IAAM,YAAY,GAAlB,MAAM,YAAY;CAAG,CAAA;AAAf,oCAAY;uBAAZ,YAAY;IAnExB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,UAAU,CAAC;gBACvB,mCAAY;gBACZ,yCAAe;gBACf,oCAAgB;gBAChB,iCAAW;gBACX,8CAAiB;gBACjB,6BAAS;gBACT,+BAAU;gBACV,4BAAY;gBACZ,0CAAmB;gBACnB,qCAAa;gBACb,+BAAU;gBACV,wCAAc;aACf,CAAC;YACF,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,oCAAgB,CAAC;YAClC,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,4BAAY,CAAC;YAC9B,0BAAW;SACZ;QACD,SAAS,EAAE;YACT,2CAAmB;YACnB,+CAAiB;YACjB,uDAAyB;YACzB,sCAAiB;YACjB,4CAAoB;YACpB,8BAAa;YACb,+CAAqB;YACrB,yCAAkB;YAClB,4DAA2B;YAC3B,sDAAwB;YACxB,uCAAiB;YACjB,2CAAmB;YACnB,qCAAgB;YAChB,iDAAsB;YACtB,6CAAoB;YACpB,uCAAiB;YACjB,6CAAoB;YACpB,mDAAuB;YACvB,EAAE,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,uCAAiB,EAAE;YAC7D,gDAAqB;YACrB,sDAAwB;SACzB;QACD,OAAO,EAAE;YACP,2CAAmB;YACnB,+CAAiB;YACjB,sCAAiB;YACjB,uCAAiB;YACjB,mDAAuB;YACvB,yCAAkB;YAClB,sDAAwB;YACxB,qCAAgB;YAChB,6CAAoB;YACpB,uCAAiB;YACjB,mBAAmB;YACnB,iDAAsB;YACtB,gDAAqB;YACrB,sDAAwB;SACzB;QACD,WAAW,EAAE;YACX,oCAAgB;YAChB,oCAAgB;YAChB,kCAAe;YACf,6CAAoB;YACpB,gCAAc;SACf;KACF,CAAC;GACW,YAAY,CAAG"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { Repository } from 'typeorm';
|
|
2
|
+
import { UserAppMapping } from '../entity/user-app-mapping.entity';
|
|
3
|
+
export declare class UserAppMappingRepository {
|
|
4
|
+
private readonly userAppMappingRepository;
|
|
5
|
+
constructor(userAppMappingRepository: Repository<UserAppMapping>);
|
|
6
|
+
save(userId: number, appCode: string): Promise<UserAppMapping | null>;
|
|
7
|
+
findByUserIdAndAppCode(userId: number, appCode: string): Promise<UserAppMapping | null>;
|
|
8
|
+
}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.UserAppMappingRepository = void 0;
|
|
16
|
+
const common_1 = require("@nestjs/common");
|
|
17
|
+
const typeorm_1 = require("@nestjs/typeorm");
|
|
18
|
+
const typeorm_2 = require("typeorm");
|
|
19
|
+
const user_app_mapping_entity_1 = require("../entity/user-app-mapping.entity");
|
|
20
|
+
let UserAppMappingRepository = class UserAppMappingRepository {
|
|
21
|
+
constructor(userAppMappingRepository) {
|
|
22
|
+
this.userAppMappingRepository = userAppMappingRepository;
|
|
23
|
+
}
|
|
24
|
+
async save(userId, appCode) {
|
|
25
|
+
const mapping = this.userAppMappingRepository.create({
|
|
26
|
+
user_id: userId,
|
|
27
|
+
appcode: appCode,
|
|
28
|
+
});
|
|
29
|
+
return await this.userAppMappingRepository.save(mapping);
|
|
30
|
+
}
|
|
31
|
+
async findByUserIdAndAppCode(userId, appCode) {
|
|
32
|
+
return await this.userAppMappingRepository.findOne({
|
|
33
|
+
where: { user_id: userId, appcode: appCode },
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
};
|
|
37
|
+
exports.UserAppMappingRepository = UserAppMappingRepository;
|
|
38
|
+
exports.UserAppMappingRepository = UserAppMappingRepository = __decorate([
|
|
39
|
+
(0, common_1.Injectable)(),
|
|
40
|
+
__param(0, (0, typeorm_1.InjectRepository)(user_app_mapping_entity_1.UserAppMapping)),
|
|
41
|
+
__metadata("design:paramtypes", [typeorm_2.Repository])
|
|
42
|
+
], UserAppMappingRepository);
|
|
43
|
+
//# sourceMappingURL=user-app-mapping.repository.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"user-app-mapping.repository.js","sourceRoot":"","sources":["../../../../src/module/meta/repository/user-app-mapping.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,qCAAqC;AACrC,+EAAmE;AAG5D,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IACnC,YAEmB,wBAAoD;QAApD,6BAAwB,GAAxB,wBAAwB,CAA4B;IACpE,CAAC;IAEJ,KAAK,CAAC,IAAI,CAAC,MAAc,EAAE,OAAe;QACxC,MAAM,OAAO,GAAG,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC;YACnD,OAAO,EAAE,MAAM;YACf,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;QACH,OAAO,MAAM,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC1B,MAAc,EACd,OAAe;QAEf,OAAO,MAAM,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC;YACjD,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE;SAC7C,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAtBY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,wCAAc,CAAC,CAAA;qCACU,oBAAU;GAH5C,wBAAwB,CAsBpC"}
|
|
@@ -42,9 +42,6 @@ let EntityListService = class EntityListService {
|
|
|
42
42
|
return entityListData;
|
|
43
43
|
}
|
|
44
44
|
async getFilteredList(entityTable, filters, sortColumn, sortOrder, pageNumber, pageSize, appcode) {
|
|
45
|
-
if (appcode) {
|
|
46
|
-
filters = { ...filters, appcode };
|
|
47
|
-
}
|
|
48
45
|
let query = this.getQuery(entityTable.data_source, null);
|
|
49
46
|
let whereClause = await this.getWhereClause(entityTable, filters);
|
|
50
47
|
if (whereClause.query) {
|
|
@@ -58,7 +55,7 @@ let EntityListService = class EntityListService {
|
|
|
58
55
|
}
|
|
59
56
|
async getTotalCount(entityTable, filters, appcode) {
|
|
60
57
|
let query = this.getQuery(entityTable.data_source, entityTable.tab_column);
|
|
61
|
-
let whereClause = await this.getWhereClause(entityTable, filters
|
|
58
|
+
let whereClause = await this.getWhereClause(entityTable, filters);
|
|
62
59
|
if (whereClause.query) {
|
|
63
60
|
query += whereClause.query;
|
|
64
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-list.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/entity-list.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,iEAA4D;AAC5D,sEAA6D;AAE7D,6CAAsD;AACtD,qCAAwC;AACxC,0DAAkD;AAClD,+EAAyE;AAGlE,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC5B,YACU,kBAAsC,EACtC,wBAAkD,EAC3B,aAA4B;QAFnD,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,6BAAwB,GAAxB,wBAAwB,CAA0B;QAC3B,kBAAa,GAAb,aAAa,CAAe;IAC1D,CAAC;IAEJ,KAAK,CAAC,qBAAqB,CACzB,UAAkB,EAClB,QAAgB,EAChB,OAA4B,EAC5B,UAA8B,EAC9B,SAA6B,EAC7B,UAAkB,EAClB,QAAgB,EAChB,SAAkB,EAClB,QAAiB,EACjB,OAAgB;QAEhB,IAAI,cAAc,GAAG,IAAI,qCAAc,EAAE,CAAC;QAE1C,IAAI,WAAW,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,2BAA2B,CACzE,UAAU,EACV,QAAQ,CACT,CAAC;QAEF,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,CAAC,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;gBAC7B,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CACvC,WAAW,EACX,OAAO,EACP,OAAO,CACR,CAAC;gBACF,cAAc,CAAC,WAAW,GAAG,UAAyB,CAAC;gBAEvD,IAAI,SAAS,IAAI,QAAQ,EAAE,CAAC;oBAC1B,OAAO,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC;gBAChC,CAAC;gBACD,cAAc,CAAC,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CACrD,WAAW,EACX,OAAO,EACP,UAAU,EACV,SAAS,EACT,UAAU,EACV,QAAQ,EACR,OAAO,CACR,CAAC;YACJ,CAAC;QACH,CAAC;QAED,OAAO,cAAc,CAAC;IACxB,CAAC;IAEM,KAAK,CAAC,eAAe,CAC1B,WAAwB,EACxB,OAA4B,EAC5B,UAA8B,EAC9B,SAA6B,EAC7B,UAA8B,EAC9B,QAA4B,EAC5B,OAAgB;
|
|
1
|
+
{"version":3,"file":"entity-list.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/entity-list.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,10 +31,10 @@ let EntityServiceImpl = class EntityServiceImpl {
|
|
|
31
31
|
const entityMaster = await this.entityMasterService.getEntityData(entityData.entity_type);
|
|
32
32
|
const validationErrors = await this.entityValidationService.validateEntityData(entityData, entityMaster);
|
|
33
33
|
if (validationErrors.length > 0) {
|
|
34
|
-
|
|
34
|
+
throw new common_1.BadRequestException({
|
|
35
35
|
success: false,
|
|
36
36
|
errors: validationErrors,
|
|
37
|
-
};
|
|
37
|
+
});
|
|
38
38
|
}
|
|
39
39
|
const repo = manager
|
|
40
40
|
? manager.getRepository(entityMaster.entity_data_class)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-service-impl.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/entity-service-impl.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2CAAyE;AAEzE,mEAA8D;AAC9D,gGAAoF;AAEpF,oFAA4E;AAE5E,+DAA0D;AAE1D,sEAA8D;AAC9D,yBAAyB;AACzB,6BAA6B;AAC7B,sFAA0E;AAE1E,iEAA4D;AAC5D,+EAAyE;AACzE,uEAA4E;AAC5E,2EAAsE;AAG/D,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAW5B,KAAK,CAAC,YAAY,CAChB,UAAsB,EACtB,YAA6B,EAC7B,OAA8B,EAC9B,OAAgB;QAEhB,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC;YAC5B,MAAM,IAAI,4BAAmB,CAAC,uBAAuB,CAAC,CAAC;QACzD,CAAC;QACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAC/D,UAAU,CAAC,WAAW,CACvB,CAAC;QAEF,MAAM,gBAAgB,GACpB,MAAM,IAAI,CAAC,uBAAuB,CAAC,kBAAkB,CACnD,UAAU,EACV,YAAY,CACb,CAAC;QACJ,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,
|
|
1
|
+
{"version":3,"file":"entity-service-impl.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/entity-service-impl.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { UserAppMappingRepository } from '../repository/user-app-mapping.repository';
|
|
2
|
+
export declare class UserAppMappingService {
|
|
3
|
+
private readonly userAppMappingRepository;
|
|
4
|
+
constructor(userAppMappingRepository: UserAppMappingRepository);
|
|
5
|
+
assignUserAppMapping(userId: number, appCode: string): Promise<import("../entity/user-app-mapping.entity").UserAppMapping | null>;
|
|
6
|
+
getUserAppMappings(userId: number, appCode: string): Promise<import("../entity/user-app-mapping.entity").UserAppMapping | null>;
|
|
7
|
+
}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.UserAppMappingService = void 0;
|
|
13
|
+
const common_1 = require("@nestjs/common");
|
|
14
|
+
const user_app_mapping_repository_1 = require("../repository/user-app-mapping.repository");
|
|
15
|
+
let UserAppMappingService = class UserAppMappingService {
|
|
16
|
+
constructor(userAppMappingRepository) {
|
|
17
|
+
this.userAppMappingRepository = userAppMappingRepository;
|
|
18
|
+
}
|
|
19
|
+
async assignUserAppMapping(userId, appCode) {
|
|
20
|
+
return await this.userAppMappingRepository.save(userId, appCode);
|
|
21
|
+
}
|
|
22
|
+
async getUserAppMappings(userId, appCode) {
|
|
23
|
+
return await this.userAppMappingRepository.findByUserIdAndAppCode(userId, appCode);
|
|
24
|
+
}
|
|
25
|
+
};
|
|
26
|
+
exports.UserAppMappingService = UserAppMappingService;
|
|
27
|
+
exports.UserAppMappingService = UserAppMappingService = __decorate([
|
|
28
|
+
(0, common_1.Injectable)(),
|
|
29
|
+
__metadata("design:paramtypes", [user_app_mapping_repository_1.UserAppMappingRepository])
|
|
30
|
+
], UserAppMappingService);
|
|
31
|
+
//# sourceMappingURL=user-app-mapping.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"user-app-mapping.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/user-app-mapping.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,2FAAqF;AAG9E,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAChC,YACmB,wBAAkD;QAAlD,6BAAwB,GAAxB,wBAAwB,CAA0B;IAClE,CAAC;IAEJ,KAAK,CAAC,oBAAoB,CAAC,MAAc,EAAE,OAAe;QACxD,OAAO,MAAM,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,MAAc,EAAG,OAAe;QACvD,OAAO,MAAM,IAAI,CAAC,wBAAwB,CAAC,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrF,CAAC;CACF,CAAA;AAZY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;qCAGkC,sDAAwB;GAF1D,qBAAqB,CAYjC"}
|
|
@@ -41,7 +41,7 @@ __decorate([
|
|
|
41
41
|
__metadata("design:type", Number)
|
|
42
42
|
], UserRoleMapping.prototype, "is_default", void 0);
|
|
43
43
|
__decorate([
|
|
44
|
-
(0, typeorm_1.Column)({ type: 'varchar' }),
|
|
44
|
+
(0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
|
|
45
45
|
__metadata("design:type", String)
|
|
46
46
|
], UserRoleMapping.prototype, "appcode", void 0);
|
|
47
47
|
exports.UserRoleMapping = UserRoleMapping = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-role-mapping.entity.js","sourceRoot":"","sources":["../../../../src/module/user/entity/user-role-mapping.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uEAAoE;AACpE,qCAAiE;AAG1D,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YAAY,OAAe,EAAE,OAAe;QAC1C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,WAAW,GAAG,sCAAoB,CAAC;IAC1C,CAAC;CAmBF,CAAA;AAxBY,0CAAe;AAQ1B;IADC,IAAA,gCAAsB,GAAE;;2CACd;AAGX;IADC,IAAA,gBAAM,EAAC,
|
|
1
|
+
{"version":3,"file":"user-role-mapping.entity.js","sourceRoot":"","sources":["../../../../src/module/user/entity/user-role-mapping.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uEAAoE;AACpE,qCAAiE;AAG1D,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YAAY,OAAe,EAAE,OAAe;QAC1C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,WAAW,GAAG,sCAAoB,CAAC;IAC1C,CAAC;CAmBF,CAAA;AAxBY,0CAAe;AAQ1B;IADC,IAAA,gCAAsB,GAAE;;2CACd;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;oDACR;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC3B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC3B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACrB;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC5B;0BAvBL,eAAe;IAD3B,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,sBAAsB,EAAE,CAAC;;GAC5B,eAAe,CAwB3B"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { UserSessionService } from './user-session.service';
|
|
2
2
|
import { UserService } from './user.service';
|
|
3
3
|
import { ConfigService } from '@nestjs/config';
|
|
4
|
+
import { UserAppMappingService } from 'src/module/meta/service/user-app-mapping.service';
|
|
4
5
|
export declare class LoginService {
|
|
5
6
|
private readonly userService;
|
|
6
7
|
private userSessionService;
|
|
7
8
|
private configService;
|
|
8
|
-
|
|
9
|
+
private readonly userAppMappingService;
|
|
10
|
+
constructor(userService: UserService, userSessionService: UserSessionService, configService: ConfigService, userAppMappingService: UserAppMappingService);
|
|
9
11
|
masterKey: string;
|
|
10
12
|
masterIv: string;
|
|
11
13
|
login(email: string, password: string, appcode: string, organization_id: any): Promise<{
|
|
@@ -19,16 +19,18 @@ const user_entity_1 = require("../entity/user.entity");
|
|
|
19
19
|
const user_session_service_1 = require("./user-session.service");
|
|
20
20
|
const user_service_1 = require("./user.service");
|
|
21
21
|
const config_1 = require("@nestjs/config");
|
|
22
|
+
const user_app_mapping_service_1 = require("../../meta/service/user-app-mapping.service");
|
|
22
23
|
let LoginService = class LoginService {
|
|
23
|
-
constructor(userService, userSessionService, configService) {
|
|
24
|
+
constructor(userService, userSessionService, configService, userAppMappingService) {
|
|
24
25
|
this.userService = userService;
|
|
25
26
|
this.userSessionService = userSessionService;
|
|
26
27
|
this.configService = configService;
|
|
28
|
+
this.userAppMappingService = userAppMappingService;
|
|
27
29
|
this.masterKey = this.configService.get('MASTER_KEY') || '';
|
|
28
30
|
this.masterIv = this.configService.get('MASTER_IV') || '';
|
|
29
31
|
}
|
|
30
32
|
async login(email, password, appcode, organization_id) {
|
|
31
|
-
const user = await this.userService.findByEmailId(email, organization_id
|
|
33
|
+
const user = await this.userService.findByEmailId(email, organization_id);
|
|
32
34
|
if (!user) {
|
|
33
35
|
return {
|
|
34
36
|
success: false,
|
|
@@ -36,6 +38,10 @@ let LoginService = class LoginService {
|
|
|
36
38
|
type: 'email',
|
|
37
39
|
};
|
|
38
40
|
}
|
|
41
|
+
const userAppMapping = await this.userAppMappingService.getUserAppMappings(user.id, appcode);
|
|
42
|
+
if (!userAppMapping) {
|
|
43
|
+
throw new common_1.BadRequestException(`User with email ${email} is not mapped to the app ${appcode}.`);
|
|
44
|
+
}
|
|
39
45
|
if (user.status !== 'ACTIVE') {
|
|
40
46
|
return {
|
|
41
47
|
success: false,
|
|
@@ -51,7 +57,7 @@ let LoginService = class LoginService {
|
|
|
51
57
|
type: 'password',
|
|
52
58
|
};
|
|
53
59
|
}
|
|
54
|
-
const token = await this.userSessionService.createSession(user);
|
|
60
|
+
const token = await this.userSessionService.createSession(user, appcode);
|
|
55
61
|
if (user.is_firstlogin === 1) {
|
|
56
62
|
user.invitation_status = 'ACCEPTED';
|
|
57
63
|
user.is_firstlogin = 0;
|
|
@@ -92,6 +98,7 @@ exports.LoginService = LoginService = __decorate([
|
|
|
92
98
|
__param(0, (0, common_1.Inject)('UserService')),
|
|
93
99
|
__metadata("design:paramtypes", [user_service_1.UserService,
|
|
94
100
|
user_session_service_1.UserSessionService,
|
|
95
|
-
config_1.ConfigService
|
|
101
|
+
config_1.ConfigService,
|
|
102
|
+
user_app_mapping_service_1.UserAppMappingService])
|
|
96
103
|
], LoginService);
|
|
97
104
|
//# sourceMappingURL=login.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/login.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAyE;AACzE,oFAAgF;AAChF,uDAAiD;AACjD,iEAA4D;AAC5D,iDAA6C;AAC7C,2CAA+C;
|
|
1
|
+
{"version":3,"file":"login.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/login.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ export declare class UserSessionService {
|
|
|
9
9
|
private readonly clockIDGenService;
|
|
10
10
|
private configService;
|
|
11
11
|
constructor(userSessionRepository: UserSessionRepository, jwtAuthService: JwtAuthService, clockIDGenService: ClockIDGenService, configService: ConfigService);
|
|
12
|
-
createSession(user: any): Promise<string>;
|
|
12
|
+
createSession(user: any, appcode?: string): Promise<string>;
|
|
13
13
|
findBySessionKey(sessionKey: string): Promise<UserSession | null>;
|
|
14
14
|
updateSession(userSession: UserSession): Promise<void>;
|
|
15
15
|
}
|
|
@@ -23,7 +23,7 @@ let UserSessionService = class UserSessionService {
|
|
|
23
23
|
this.clockIDGenService = clockIDGenService;
|
|
24
24
|
this.configService = configService;
|
|
25
25
|
}
|
|
26
|
-
async createSession(user) {
|
|
26
|
+
async createSession(user, appcode) {
|
|
27
27
|
const sessionToken = this.clockIDGenService.idGenerator('SES');
|
|
28
28
|
const userSession = new user_session_entity_1.UserSession();
|
|
29
29
|
userSession.user_id = user.id;
|
|
@@ -33,7 +33,7 @@ let UserSessionService = class UserSessionService {
|
|
|
33
33
|
const expiryTokenInHours = this.configService.get('TOKEN_EXPIRY') || 1;
|
|
34
34
|
userSession.expiry_date = new Date(Date.now() + expiryTokenInHours * 60 * 60 * 1000);
|
|
35
35
|
await this.userSessionRepository.saveSession(userSession);
|
|
36
|
-
const payload = { userId: user.id, sessionToken, appcode:
|
|
36
|
+
const payload = { userId: user.id, sessionToken, appcode: appcode };
|
|
37
37
|
const accessToken = this.jwtAuthService.generateJwt(payload);
|
|
38
38
|
userSession.access_token = accessToken;
|
|
39
39
|
await this.userSessionRepository.saveSession(userSession);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-session.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/user-session.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uEAA4D;AAC5D,0FAAkF;AAClF,2CAA4C;AAC5C,iFAA6E;AAC7E,iEAAsE;AACtE,2CAA+C;AAGxC,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC7B,YACmB,qBAA4C,EAC5C,cAA8B,EAC9B,iBAAoC,EAC7C,aAA4B;QAHnB,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,mBAAc,GAAd,cAAc,CAAgB;QAC9B,sBAAiB,GAAjB,iBAAiB,CAAmB;QAC7C,kBAAa,GAAb,aAAa,CAAe;IACnC,CAAC;IACJ,KAAK,CAAC,aAAa,CAAC,IAAI;
|
|
1
|
+
{"version":3,"file":"user-session.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/user-session.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uEAA4D;AAC5D,0FAAkF;AAClF,2CAA4C;AAC5C,iFAA6E;AAC7E,iEAAsE;AACtE,2CAA+C;AAGxC,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC7B,YACmB,qBAA4C,EAC5C,cAA8B,EAC9B,iBAAoC,EAC7C,aAA4B;QAHnB,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,mBAAc,GAAd,cAAc,CAAgB;QAC9B,sBAAiB,GAAjB,iBAAiB,CAAmB;QAC7C,kBAAa,GAAb,aAAa,CAAe;IACnC,CAAC;IACJ,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,OAAgB;QACxC,MAAM,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAE/D,MAAM,WAAW,GAAQ,IAAI,iCAAW,EAAE,CAAC;QAC3C,WAAW,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC;QAC9B,WAAW,CAAC,WAAW,GAAG,YAAY,CAAC;QACvC,WAAW,CAAC,oBAAoB,GAAG,CAAC,CAAC;QACrC,WAAW,CAAC,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC;QACpC,MAAM,kBAAkB,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QACvE,WAAW,CAAC,WAAW,GAAG,IAAI,IAAI,CAChC,IAAI,CAAC,GAAG,EAAE,GAAG,kBAAkB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CACjD,CAAC;QAEF,MAAM,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAE1D,MAAM,OAAO,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;QACpE,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAE7D,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC;QACvC,MAAM,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAE1D,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,UAAkB;QACvC,OAAO,MAAM,IAAI,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;IACvE,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,WAAwB;QAC1C,MAAM,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAC5D,CAAC;CACF,CAAA;AAtCY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;qCAG+B,8CAAqB;QAC5B,4BAAc;QACX,0CAAiB;QAC9B,sBAAa;GAL3B,kBAAkB,CAsC9B"}
|
|
@@ -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,12 +7,15 @@ 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
21
|
createEntity(entityData: BaseEntity, loggedInUser: UserData | null, manager?: EntityManager, appcode?: string): Promise<BaseEntity>;
|
|
@@ -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,13 +25,16 @@ 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
|
}
|
|
@@ -56,9 +63,12 @@ let UserService = class UserService extends entity_service_impl_service_1.Entity
|
|
|
56
63
|
}
|
|
57
64
|
userData.password = password;
|
|
58
65
|
userData.is_firstlogin = 1;
|
|
66
|
+
userData.roles = [];
|
|
59
67
|
userData.invitation_status = 'SENT';
|
|
60
68
|
userData.status = global_constant_1.STATUS_ACTIVE;
|
|
61
69
|
const savedData = await super.createEntity(userData, loggedInUser);
|
|
70
|
+
userData.roles.push('1');
|
|
71
|
+
userData.roles.push('2');
|
|
62
72
|
if (userData.roles) {
|
|
63
73
|
let roles = userData.roles;
|
|
64
74
|
await this.userRoleMappingService.deleteByUserId(userData.id);
|
|
@@ -67,6 +77,12 @@ let UserService = class UserService extends entity_service_impl_service_1.Entity
|
|
|
67
77
|
await this.userRoleMappingService.assignUserRole(userRoleMapping);
|
|
68
78
|
}
|
|
69
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
|
+
}
|
|
70
86
|
return savedData;
|
|
71
87
|
}
|
|
72
88
|
async getEntityData(entityType, id) {
|
|
@@ -123,9 +139,12 @@ let UserService = class UserService extends entity_service_impl_service_1.Entity
|
|
|
123
139
|
exports.UserService = UserService;
|
|
124
140
|
exports.UserService = UserService = __decorate([
|
|
125
141
|
(0, common_1.Injectable)(),
|
|
142
|
+
__param(5, (0, common_1.Inject)('RoleService')),
|
|
126
143
|
__metadata("design:paramtypes", [user_repository_1.UserRepository,
|
|
127
144
|
user_role_mapping_service_1.UserRoleMappingService,
|
|
128
145
|
clockIDGenUtil_service_1.ClockIDGenService,
|
|
129
|
-
config_1.ConfigService
|
|
146
|
+
config_1.ConfigService,
|
|
147
|
+
user_app_mapping_service_1.UserAppMappingService,
|
|
148
|
+
role_service_1.RoleService])
|
|
130
149
|
], UserService);
|
|
131
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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"}
|