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.
Files changed (69) hide show
  1. package/dist/module/meta/controller/entity.controller.d.ts +1 -1
  2. package/dist/module/meta/controller/entity.controller.js +14 -11
  3. package/dist/module/meta/controller/entity.controller.js.map +1 -1
  4. package/dist/module/meta/entity/app-master.entity.d.ts +5 -0
  5. package/dist/module/meta/entity/app-master.entity.js +30 -0
  6. package/dist/module/meta/entity/app-master.entity.js.map +1 -0
  7. package/dist/module/meta/entity/user-app-mapping.entity.d.ts +7 -0
  8. package/dist/module/meta/entity/user-app-mapping.entity.js +41 -0
  9. package/dist/module/meta/entity/user-app-mapping.entity.js.map +1 -0
  10. package/dist/module/meta/entity.module.js +9 -1
  11. package/dist/module/meta/entity.module.js.map +1 -1
  12. package/dist/module/meta/repository/user-app-mapping.repository.d.ts +8 -0
  13. package/dist/module/meta/repository/user-app-mapping.repository.js +43 -0
  14. package/dist/module/meta/repository/user-app-mapping.repository.js.map +1 -0
  15. package/dist/module/meta/service/entity-list.service.d.ts +2 -2
  16. package/dist/module/meta/service/entity-list.service.js +18 -7
  17. package/dist/module/meta/service/entity-list.service.js.map +1 -1
  18. package/dist/module/meta/service/entity-service-impl.service.d.ts +3 -3
  19. package/dist/module/meta/service/entity-service-impl.service.js +6 -6
  20. package/dist/module/meta/service/entity-service-impl.service.js.map +1 -1
  21. package/dist/module/meta/service/entity.service.d.ts +2 -2
  22. package/dist/module/meta/service/user-app-mapping.service.d.ts +7 -0
  23. package/dist/module/meta/service/user-app-mapping.service.js +31 -0
  24. package/dist/module/meta/service/user-app-mapping.service.js.map +1 -0
  25. package/dist/module/module/controller/module-access.controller.d.ts +5 -5
  26. package/dist/module/module/controller/module-access.controller.js +28 -16
  27. package/dist/module/module/controller/module-access.controller.js.map +1 -1
  28. package/dist/module/module/repository/module-access.repository.d.ts +10 -6
  29. package/dist/module/module/repository/module-access.repository.js +45 -29
  30. package/dist/module/module/repository/module-access.repository.js.map +1 -1
  31. package/dist/module/module/service/module-access.service.d.ts +9 -5
  32. package/dist/module/module/service/module-access.service.js +12 -10
  33. package/dist/module/module/service/module-access.service.js.map +1 -1
  34. package/dist/module/user/dto/create-user.dto.d.ts +1 -0
  35. package/dist/module/user/dto/create-user.dto.js.map +1 -1
  36. package/dist/module/user/entity/user-role-mapping.entity.js +1 -1
  37. package/dist/module/user/entity/user-role-mapping.entity.js.map +1 -1
  38. package/dist/module/user/service/login.service.d.ts +3 -1
  39. package/dist/module/user/service/login.service.js +11 -4
  40. package/dist/module/user/service/login.service.js.map +1 -1
  41. package/dist/module/user/service/role.service.d.ts +1 -1
  42. package/dist/module/user/service/role.service.js +4 -1
  43. package/dist/module/user/service/role.service.js.map +1 -1
  44. package/dist/module/user/service/user-session.service.d.ts +1 -1
  45. package/dist/module/user/service/user-session.service.js +2 -2
  46. package/dist/module/user/service/user-session.service.js.map +1 -1
  47. package/dist/module/user/service/user.service.d.ts +6 -2
  48. package/dist/module/user/service/user.service.js +25 -3
  49. package/dist/module/user/service/user.service.js.map +1 -1
  50. package/dist/tsconfig.build.tsbuildinfo +1 -1
  51. package/package.json +1 -1
  52. package/src/module/meta/controller/entity.controller.ts +27 -12
  53. package/src/module/meta/entity/app-master.entity.ts +13 -0
  54. package/src/module/meta/entity/user-app-mapping.entity.ts +21 -0
  55. package/src/module/meta/entity.module.ts +10 -1
  56. package/src/module/meta/repository/user-app-mapping.repository.ts +29 -0
  57. package/src/module/meta/service/entity-list.service.ts +29 -7
  58. package/src/module/meta/service/entity-service-impl.service.ts +31 -19
  59. package/src/module/meta/service/entity.service.ts +2 -1
  60. package/src/module/meta/service/user-app-mapping.service.ts +17 -0
  61. package/src/module/module/controller/module-access.controller.ts +48 -21
  62. package/src/module/module/repository/module-access.repository.ts +69 -50
  63. package/src/module/module/service/module-access.service.ts +15 -13
  64. package/src/module/user/dto/create-user.dto.ts +1 -0
  65. package/src/module/user/entity/user-role-mapping.entity.ts +2 -2
  66. package/src/module/user/service/login.service.ts +23 -3
  67. package/src/module/user/service/role.service.ts +5 -1
  68. package/src/module/user/service/user-session.service.ts +2 -2
  69. package/src/module/user/service/user.service.ts +76 -5
@@ -22,22 +22,29 @@ let ModuleAccessController = class ModuleAccessController {
22
22
  this.moduleAccessService = moduleAccessService;
23
23
  this.menuRepository = menuRepository;
24
24
  }
25
- async getRoles() {
26
- return this.moduleAccessService.getRoles();
25
+ async getRoles(req) {
26
+ const appcode = req.user.appcode;
27
+ return this.moduleAccessService.getRoles({ appcode });
27
28
  }
28
- async getModules() {
29
- return this.moduleAccessService.getModules();
29
+ async getModules(req) {
30
+ const appcode = req.user.appcode;
31
+ return this.moduleAccessService.getModules({
32
+ appcode,
33
+ });
30
34
  }
31
- async getAccessListing(roleIds) {
35
+ async getAccessListing(roleIds, req) {
32
36
  const roleIdArray = roleIds.split(',').map(Number);
33
- return this.moduleAccessService.getAccessListing(roleIdArray);
37
+ const appcode = req.user.appcode;
38
+ return this.moduleAccessService.getAccessListing(roleIdArray, appcode);
34
39
  }
35
- async getMenuListing(mainModIds) {
40
+ async getMenuListing(mainModIds, req) {
36
41
  const mainModArray = mainModIds.split(',').map(String);
37
- return this.moduleAccessService.getMenuListing(mainModArray);
42
+ const appcode = req.user.appcode;
43
+ return this.moduleAccessService.getMenuListing(mainModArray, appcode);
38
44
  }
39
- async updateModuleAccess(moduleAccessData) {
40
- return this.moduleAccessService.updateModuleAccess(moduleAccessData);
45
+ async updateModuleAccess(moduleAccessData, req) {
46
+ const appcode = req.user.appcode;
47
+ return this.moduleAccessService.updateModuleAccess(moduleAccessData, appcode);
41
48
  }
42
49
  async getModuleUIConfig(moduleCode, req) {
43
50
  const userId = req.user.userId;
@@ -46,41 +53,46 @@ let ModuleAccessController = class ModuleAccessController {
46
53
  if (!roles || roles.length === 0) {
47
54
  throw new common_1.BadRequestException('User has no roles');
48
55
  }
49
- return this.moduleAccessService.getModuleUIConfig(moduleCode, roles.map(id => Number(id)));
56
+ return this.moduleAccessService.getModuleUIConfig(moduleCode, roles.map((id) => Number(id)));
50
57
  }
51
58
  };
52
59
  exports.ModuleAccessController = ModuleAccessController;
53
60
  __decorate([
54
61
  (0, common_1.Get)('roles'),
62
+ __param(0, (0, common_1.Request)()),
55
63
  __metadata("design:type", Function),
56
- __metadata("design:paramtypes", []),
64
+ __metadata("design:paramtypes", [Object]),
57
65
  __metadata("design:returntype", Promise)
58
66
  ], ModuleAccessController.prototype, "getRoles", null);
59
67
  __decorate([
60
68
  (0, common_1.Get)('modules'),
69
+ __param(0, (0, common_1.Request)()),
61
70
  __metadata("design:type", Function),
62
- __metadata("design:paramtypes", []),
71
+ __metadata("design:paramtypes", [Object]),
63
72
  __metadata("design:returntype", Promise)
64
73
  ], ModuleAccessController.prototype, "getModules", null);
65
74
  __decorate([
66
75
  (0, common_1.Get)('access-listing'),
67
76
  __param(0, (0, common_1.Query)('roles')),
77
+ __param(1, (0, common_1.Request)()),
68
78
  __metadata("design:type", Function),
69
- __metadata("design:paramtypes", [String]),
79
+ __metadata("design:paramtypes", [String, Object]),
70
80
  __metadata("design:returntype", Promise)
71
81
  ], ModuleAccessController.prototype, "getAccessListing", null);
72
82
  __decorate([
73
83
  (0, common_1.Get)('menu-listing'),
74
84
  __param(0, (0, common_1.Query)('mainmod')),
85
+ __param(1, (0, common_1.Request)()),
75
86
  __metadata("design:type", Function),
76
- __metadata("design:paramtypes", [String]),
87
+ __metadata("design:paramtypes", [String, Object]),
77
88
  __metadata("design:returntype", Promise)
78
89
  ], ModuleAccessController.prototype, "getMenuListing", null);
79
90
  __decorate([
80
91
  (0, common_1.Post)('update'),
81
92
  __param(0, (0, common_1.Body)()),
93
+ __param(1, (0, common_1.Request)()),
82
94
  __metadata("design:type", Function),
83
- __metadata("design:paramtypes", [Array]),
95
+ __metadata("design:paramtypes", [Array, Object]),
84
96
  __metadata("design:returntype", Promise)
85
97
  ], ModuleAccessController.prototype, "updateModuleAccess", null);
86
98
  __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"module-access.controller.js","sourceRoot":"","sources":["../../../../src/module/module/controller/module-access.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAiI;AACjI,4EAAuE;AACvE,2DAAgE;AAIhE,mEAA+D;AAIxD,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IACjC,YAA6B,mBAAwC,EACxC,cAA8B;QAD9B,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,mBAAc,GAAd,cAAc,CAAgB;IACxD,CAAC;IAGE,AAAN,KAAK,CAAC,QAAQ;QACZ,OAAO,IAAI,CAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAC;IAC7C,CAAC;IAGK,AAAN,KAAK,CAAC,UAAU;QACd,OAAO,IAAI,CAAC,mBAAmB,CAAC,UAAU,EAAE,CAAC;IAC/C,CAAC;IAGK,AAAN,KAAK,CAAC,gBAAgB,CAAiB,OAAe;QACpD,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACnD,OAAO,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAChE,CAAC;IAGK,AAAN,KAAK,CAAC,cAAc,CAAmB,UAAkB;QACvD,MAAM,YAAY,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACvD,OAAO,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;IAC/D,CAAC;IAGK,AAAN,KAAK,CAAC,kBAAkB,CAAS,gBAAuB;QACtD,OAAO,IAAI,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;IACvE,CAAC;IAKK,AAAN,KAAK,CAAC,iBAAiB,CAAuB,UAAkB,EAAa,GAAG;QAC9E,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;QAC/B,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC;QACjC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,MAAM,EAAC,OAAO,CAAC,CAAC;QAErE,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,4BAAmB,CAAC,mBAAmB,CAAC,CAAC;QACrD,CAAC;QAED,OAAO,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC7F,CAAC;CAIF,CAAA;AAjDY,wDAAsB;AAM3B;IADL,IAAA,YAAG,EAAC,OAAO,CAAC;;;;sDAGZ;AAGK;IADL,IAAA,YAAG,EAAC,SAAS,CAAC;;;;wDAGd;AAGK;IADL,IAAA,YAAG,EAAC,gBAAgB,CAAC;IACE,WAAA,IAAA,cAAK,EAAC,OAAO,CAAC,CAAA;;;;8DAGrC;AAGK;IADL,IAAA,YAAG,EAAC,cAAc,CAAC;IACE,WAAA,IAAA,cAAK,EAAC,SAAS,CAAC,CAAA;;;;4DAGrC;AAGK;IADL,IAAA,aAAI,EAAC,QAAQ,CAAC;IACW,WAAA,IAAA,aAAI,GAAE,CAAA;;;;gEAE/B;AAKK;IADL,IAAA,YAAG,EAAC,WAAW,CAAC;IACQ,WAAA,IAAA,cAAK,EAAC,aAAa,CAAC,CAAA;IAAsB,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;+DAU3E;iCA7CU,sBAAsB;IAFlC,IAAA,mBAAU,EAAC,eAAe,CAAC;IAC3B,IAAA,kBAAS,EAAC,wBAAY,CAAC;qCAE4B,2CAAmB;QACxB,gCAAc;GAFhD,sBAAsB,CAiDlC"}
1
+ {"version":3,"file":"module-access.controller.js","sourceRoot":"","sources":["../../../../src/module/module/controller/module-access.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAYwB;AACxB,4EAAuE;AACvE,2DAAgE;AAIhE,mEAA+D;AAIxD,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IACjC,YACmB,mBAAwC,EACxC,cAA8B;QAD9B,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,mBAAc,GAAd,cAAc,CAAgB;IAC9C,CAAC;IAGE,AAAN,KAAK,CAAC,QAAQ,CAAY,GAAG;QAC3B,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC;QACjC,OAAO,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IACxD,CAAC;IAGK,AAAN,KAAK,CAAC,UAAU,CAAY,GAAG;QAC7B,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC;QAEjC,OAAO,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC;YACzC,OAAO;SACR,CAAC,CAAC;IACL,CAAC;IAGK,AAAN,KAAK,CAAC,gBAAgB,CAAiB,OAAe,EAAa,GAAG;QACpE,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACnD,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC;QACjC,OAAO,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACzE,CAAC;IAGK,AAAN,KAAK,CAAC,cAAc,CAAmB,UAAkB,EAAa,GAAG;QACvE,MAAM,YAAY,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC;QACjC,OAAO,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IACxE,CAAC;IAGK,AAAN,KAAK,CAAC,kBAAkB,CAAS,gBAAuB,EAAa,GAAG;QACtE,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC;QACjC,OAAO,IAAI,CAAC,mBAAmB,CAAC,kBAAkB,CAChD,gBAAgB,EAChB,OAAO,CACR,CAAC;IACJ,CAAC;IAKK,AAAN,KAAK,CAAC,iBAAiB,CACC,UAAkB,EAC7B,GAAG;QAEd,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;QAC/B,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC;QACjC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAEtE,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,4BAAmB,CAAC,mBAAmB,CAAC,CAAC;QACrD,CAAC;QAED,OAAO,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAC/C,UAAU,EACV,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAC9B,CAAC;IACJ,CAAC;CACF,CAAA;AAhEY,wDAAsB;AAO3B;IADL,IAAA,YAAG,EAAC,OAAO,CAAC;IACG,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;sDAGxB;AAGK;IADL,IAAA,YAAG,EAAC,SAAS,CAAC;IACG,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;wDAM1B;AAGK;IADL,IAAA,YAAG,EAAC,gBAAgB,CAAC;IACE,WAAA,IAAA,cAAK,EAAC,OAAO,CAAC,CAAA;IAAmB,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;8DAIjE;AAGK;IADL,IAAA,YAAG,EAAC,cAAc,CAAC;IACE,WAAA,IAAA,cAAK,EAAC,SAAS,CAAC,CAAA;IAAsB,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;4DAIpE;AAGK;IADL,IAAA,aAAI,EAAC,QAAQ,CAAC;IACW,WAAA,IAAA,aAAI,GAAE,CAAA;IAA2B,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;gEAMnE;AAKK;IADL,IAAA,YAAG,EAAC,WAAW,CAAC;IAEd,WAAA,IAAA,cAAK,EAAC,aAAa,CAAC,CAAA;IACpB,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;+DAcX;iCA/DU,sBAAsB;IAFlC,IAAA,mBAAU,EAAC,eAAe,CAAC;IAC3B,IAAA,kBAAS,EAAC,wBAAY,CAAC;qCAGkB,2CAAmB;QACxB,gCAAc;GAHtC,sBAAsB,CAgElC"}
@@ -9,15 +9,19 @@ export declare class ModuleAccessRepository {
9
9
  private readonly moduleAccessRepo;
10
10
  private readonly moduleActionRepo;
11
11
  constructor(roleRepo: Repository<Role>, moduleRepo: Repository<ModuleData>, moduleAccessRepo: Repository<ModuleAccess>, moduleActionRepo: Repository<ModuleAction>);
12
- getRoles(): Promise<{
12
+ getRoles({ appcode }: {
13
+ appcode: string;
14
+ }): Promise<{
13
15
  label: string;
14
16
  value: number;
15
17
  }[]>;
16
- getModules(): Promise<{
18
+ getModules({ appcode }: {
19
+ appcode: string;
20
+ }): Promise<{
17
21
  label: string;
18
22
  value: number;
19
23
  }[]>;
20
- getAccessListing(roleIds: number[]): Promise<{
24
+ getAccessListing(roleIds: number[], appcode: string): Promise<{
21
25
  role_code: string;
22
26
  name: string;
23
27
  permission: {
@@ -26,7 +30,7 @@ export declare class ModuleAccessRepository {
26
30
  code: string;
27
31
  }[];
28
32
  }[]>;
29
- getMenuListing(mainModIds: string[]): Promise<{
33
+ getMenuListing(mainModIds: string[], appcode: string): Promise<{
30
34
  name: string;
31
35
  code: string;
32
36
  permission: {
@@ -40,8 +44,8 @@ export declare class ModuleAccessRepository {
40
44
  module_code: string;
41
45
  action_type: string;
42
46
  access_flag: number;
43
- app_code: string;
44
- }[]): Promise<boolean>;
47
+ appcode: string;
48
+ }[], appcode: string): Promise<boolean>;
45
49
  getModuleUIConfig(moduleCode: string, roleIds: number[]): Promise<{
46
50
  entity_type: string;
47
51
  title: string;
@@ -27,77 +27,93 @@ let ModuleAccessRepository = class ModuleAccessRepository {
27
27
  this.moduleAccessRepo = moduleAccessRepo;
28
28
  this.moduleActionRepo = moduleActionRepo;
29
29
  }
30
- async getRoles() {
31
- const roles = await this.roleRepo.find();
32
- return roles.map(role => ({
30
+ async getRoles({ appcode }) {
31
+ const roles = await this.roleRepo.find({
32
+ where: { appcode: appcode },
33
+ });
34
+ return roles.map((role) => ({
33
35
  label: role.name,
34
36
  value: role.id,
35
37
  }));
36
38
  }
37
- async getModules() {
38
- const modules = await this.moduleRepo.find({ where: { module_level: 'MAINMOD' } });
39
- return modules.map(mod => ({
39
+ async getModules({ appcode }) {
40
+ const modules = await this.moduleRepo.find({
41
+ where: { module_level: 'MAINMOD', appcode: appcode },
42
+ });
43
+ return modules.map((mod) => ({
40
44
  label: mod.name,
41
45
  value: mod.id,
42
46
  }));
43
47
  }
44
- async getAccessListing(roleIds) {
45
- const roles = await this.roleRepo.find({ where: { id: (0, typeorm_2.In)(roleIds) } });
46
- const roleCodes = roles.map(role => role.code);
48
+ async getAccessListing(roleIds, appcode) {
49
+ const roles = await this.roleRepo.find({
50
+ where: { id: (0, typeorm_2.In)(roleIds), appcode: appcode },
51
+ });
52
+ const roleCodes = roles.map((role) => role.code);
47
53
  const moduleAccesses = await this.moduleAccessRepo.find({
48
- where: { role_code: (0, typeorm_2.In)(roleCodes) },
54
+ where: { role_code: (0, typeorm_2.In)(roleCodes), appcode: appcode },
49
55
  });
50
- return roles.map(role => ({
56
+ return roles.map((role) => ({
51
57
  role_code: role.code,
52
58
  name: role.name,
53
59
  permission: moduleAccesses
54
- .filter(access => access.role_code === role.code)
55
- .map(access => ({
60
+ .filter((access) => access.role_code === role.code)
61
+ .map((access) => ({
56
62
  action: access.action_type,
57
63
  access: access.access_flag,
58
64
  code: access.module_code,
59
65
  })),
60
66
  }));
61
67
  }
62
- async getMenuListing(mainModIds) {
68
+ async getMenuListing(mainModIds, appcode) {
63
69
  const mainModules = mainModIds.length === 1 && mainModIds[0] === '-1'
64
- ? await this.moduleRepo.find({ where: { module_level: 'MAINMOD' } })
65
- : await this.moduleRepo.find({ where: { id: (0, typeorm_2.In)(mainModIds), module_level: 'MAINMOD' } });
70
+ ? await this.moduleRepo.find({
71
+ where: { module_level: 'MAINMOD', appcode: appcode },
72
+ })
73
+ : await this.moduleRepo.find({
74
+ where: {
75
+ id: (0, typeorm_2.In)(mainModIds),
76
+ module_level: 'MAINMOD',
77
+ appcode: appcode,
78
+ },
79
+ });
66
80
  if (!mainModules.length)
67
81
  return [];
68
- const wbsCodes = mainModules.map(mod => mod.wbs_code);
82
+ const wbsCodes = mainModules.map((mod) => mod.wbs_code);
69
83
  const modules = await this.moduleRepo
70
84
  .createQueryBuilder('module')
71
- .where(wbsCodes.map(code => `module.wbs_code LIKE :code${code}`).join(' OR '), Object.fromEntries(wbsCodes.map(code => [`code${code}`, `${code}%`])))
85
+ .where(wbsCodes
86
+ .map((code) => `module.wbs_code LIKE :code${code}`)
87
+ .join(' OR '), Object.fromEntries(wbsCodes.map((code) => [`code${code}`, `${code}%`])))
72
88
  .getMany();
73
89
  const moduleActions = await this.moduleActionRepo.find();
74
90
  const buildHierarchy = (parentWbs) => modules
75
- .filter(mod => mod.wbs_code.startsWith(`${parentWbs}.`) &&
91
+ .filter((mod) => mod.wbs_code.startsWith(`${parentWbs}.`) &&
76
92
  mod.wbs_code.split('.').length === parentWbs.split('.').length + 1)
77
- .map(mod => ({
93
+ .map((mod) => ({
78
94
  name: mod.name,
79
95
  code: mod.module_code,
80
96
  permission: moduleActions
81
- .filter(action => action.module_code === mod.module_code)
82
- .map(action => ({
97
+ .filter((action) => action.module_code === mod.module_code)
98
+ .map((action) => ({
83
99
  action: action.action_type,
84
100
  name: action.action_type,
85
101
  })),
86
102
  submod: buildHierarchy(mod.wbs_code),
87
103
  }));
88
- return mainModules.map(mod => ({
104
+ return mainModules.map((mod) => ({
89
105
  name: mod.name,
90
106
  code: mod.module_code,
91
107
  permission: moduleActions
92
- .filter(action => action.module_code === mod.module_code)
93
- .map(action => ({
108
+ .filter((action) => action.module_code === mod.module_code)
109
+ .map((action) => ({
94
110
  action: action.action_type,
95
111
  name: action.action_type,
96
112
  })),
97
113
  submod: buildHierarchy(mod.wbs_code),
98
114
  }));
99
115
  }
100
- async updateModuleAccess(accessList) {
116
+ async updateModuleAccess(accessList, appcode) {
101
117
  try {
102
118
  for (const access of accessList) {
103
119
  const existing = await this.moduleAccessRepo.findOne({
@@ -105,7 +121,7 @@ let ModuleAccessRepository = class ModuleAccessRepository {
105
121
  role_code: access.role_code,
106
122
  module_code: access.module_code,
107
123
  action_type: access.action_type,
108
- appcode: access.app_code,
124
+ appcode: access.appcode || appcode,
109
125
  },
110
126
  });
111
127
  if (existing) {
@@ -133,7 +149,7 @@ let ModuleAccessRepository = class ModuleAccessRepository {
133
149
  const roles = await this.roleRepo.find({
134
150
  where: { id: (0, typeorm_2.In)(roleIds) },
135
151
  });
136
- const roleCodes = roles.map(role => role.code);
152
+ const roleCodes = roles.map((role) => role.code);
137
153
  const actions = await this.moduleAccessRepo.find({
138
154
  where: {
139
155
  module_code: moduleCode,
@@ -141,7 +157,7 @@ let ModuleAccessRepository = class ModuleAccessRepository {
141
157
  access_flag: 1,
142
158
  },
143
159
  });
144
- const uniqueActions = [...new Set(actions.map(a => a.action_type))];
160
+ const uniqueActions = [...new Set(actions.map((a) => a.action_type))];
145
161
  return {
146
162
  entity_type: module.entity_type,
147
163
  title: module.title,
@@ -1 +1 @@
1
- {"version":3,"file":"module-access.repository.js","sourceRoot":"","sources":["../../../../src/module/module/repository/module-access.repository.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"module-access.repository.js","sourceRoot":"","sources":["../../../../src/module/module/repository/module-access.repository.ts"],"names":[],"mappings":"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"}
@@ -2,15 +2,19 @@ import { ModuleAccessRepository } from '../repository/module-access.repository';
2
2
  export declare class ModuleAccessService {
3
3
  private readonly moduleAccessRepository;
4
4
  constructor(moduleAccessRepository: ModuleAccessRepository);
5
- getRoles(): Promise<{
5
+ getRoles({ appcode }: {
6
+ appcode: string;
7
+ }): Promise<{
6
8
  label: string;
7
9
  value: number;
8
10
  }[]>;
9
- getModules(): Promise<{
11
+ getModules({ appcode }: {
12
+ appcode: string;
13
+ }): Promise<{
10
14
  label: string;
11
15
  value: number;
12
16
  }[]>;
13
- getAccessListing(roleIds: number[]): Promise<{
17
+ getAccessListing(roleIds: number[], appcode: string): Promise<{
14
18
  role_code: string;
15
19
  name: string;
16
20
  permission: {
@@ -19,7 +23,7 @@ export declare class ModuleAccessService {
19
23
  code: string;
20
24
  }[];
21
25
  }[]>;
22
- getMenuListing(mainModIds: string[]): Promise<{
26
+ getMenuListing(mainModIds: string[], appcode: string): Promise<{
23
27
  name: string;
24
28
  code: string;
25
29
  permission: {
@@ -28,7 +32,7 @@ export declare class ModuleAccessService {
28
32
  }[];
29
33
  submod: any[];
30
34
  }[]>;
31
- updateModuleAccess(moduleAccessData: any[]): Promise<{
35
+ updateModuleAccess(moduleAccessData: any[], appcode: string): Promise<{
32
36
  success: boolean;
33
37
  msg: string;
34
38
  }>;
@@ -16,23 +16,25 @@ let ModuleAccessService = class ModuleAccessService {
16
16
  constructor(moduleAccessRepository) {
17
17
  this.moduleAccessRepository = moduleAccessRepository;
18
18
  }
19
- async getRoles() {
20
- return this.moduleAccessRepository.getRoles();
19
+ async getRoles({ appcode }) {
20
+ return this.moduleAccessRepository.getRoles({ appcode });
21
21
  }
22
- async getModules() {
23
- return this.moduleAccessRepository.getModules();
22
+ async getModules({ appcode }) {
23
+ return this.moduleAccessRepository.getModules({
24
+ appcode,
25
+ });
24
26
  }
25
- async getAccessListing(roleIds) {
26
- return this.moduleAccessRepository.getAccessListing(roleIds);
27
+ async getAccessListing(roleIds, appcode) {
28
+ return this.moduleAccessRepository.getAccessListing(roleIds, appcode);
27
29
  }
28
- async getMenuListing(mainModIds) {
29
- return this.moduleAccessRepository.getMenuListing(mainModIds);
30
+ async getMenuListing(mainModIds, appcode) {
31
+ return this.moduleAccessRepository.getMenuListing(mainModIds, appcode);
30
32
  }
31
- async updateModuleAccess(moduleAccessData) {
33
+ async updateModuleAccess(moduleAccessData, appcode) {
32
34
  if (!moduleAccessData || moduleAccessData.length === 0) {
33
35
  return { success: false, msg: 'No data provided' };
34
36
  }
35
- const result = await this.moduleAccessRepository.updateModuleAccess(moduleAccessData);
37
+ const result = await this.moduleAccessRepository.updateModuleAccess(moduleAccessData, appcode);
36
38
  if (result) {
37
39
  return { success: true, msg: 'Module access updated successfully' };
38
40
  }
@@ -1 +1 @@
1
- {"version":3,"file":"module-access.service.js","sourceRoot":"","sources":["../../../../src/module/module/service/module-access.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAyE;AACzE,qFAAgF;AASzE,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC9B,YACmB,sBAA8C;QAA9C,2BAAsB,GAAtB,sBAAsB,CAAwB;IAC9D,CAAC;IAEJ,KAAK,CAAC,QAAQ;QACZ,OAAO,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,UAAU;QACd,OAAO,IAAI,CAAC,sBAAsB,CAAC,UAAU,EAAE,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,OAAiB;QACtC,OAAO,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,UAAoB;QACvC,OAAO,IAAI,CAAC,sBAAsB,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,gBAAuB;QAEvB,IAAI,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,kBAAkB,EAAE,CAAC;QACrD,CAAC;QAED,MAAM,MAAM,GACV,MAAM,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;QAEzE,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,oCAAoC,EAAE,CAAC;QACtE,CAAC;aAAM,CAAC;YACN,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,gCAAgC,EAAE,CAAC;QACnE,CAAC;IACH,CAAC;IAID,KAAK,CAAC,iBAAiB,CAAC,UAAkB,EAAE,OAAiB;QAC3D,OAAO,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC5E,CAAC;CAIF,CAAA;AA9CY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;qCAGgC,iDAAsB;GAFtD,mBAAmB,CA8C/B"}
1
+ {"version":3,"file":"module-access.service.js","sourceRoot":"","sources":["../../../../src/module/module/service/module-access.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAyE;AACzE,qFAAgF;AASzE,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC9B,YACmB,sBAA8C;QAA9C,2BAAsB,GAAtB,sBAAsB,CAAwB;IAC9D,CAAC;IAEJ,KAAK,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAuB;QAC7C,OAAO,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAE,OAAO,EAAuB;QAC/C,OAAO,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC;YAC5C,OAAO;SACR,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,OAAiB,EAAE,OAAe;QACvD,OAAO,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,UAAoB,EAAE,OAAe;QACxD,OAAO,IAAI,CAAC,sBAAsB,CAAC,cAAc,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACzE,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,gBAAuB,EACvB,OAAe;QAEf,IAAI,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,kBAAkB,EAAE,CAAC;QACrD,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,CACjE,gBAAgB,EAChB,OAAO,CACR,CAAC;QAEF,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,oCAAoC,EAAE,CAAC;QACtE,CAAC;aAAM,CAAC;YACN,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,gCAAgC,EAAE,CAAC;QACnE,CAAC;IACH,CAAC;IAID,KAAK,CAAC,iBAAiB,CAAC,UAAkB,EAAE,OAAiB;QAC3D,OAAO,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC5E,CAAC;CACF,CAAA;AAhDY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;qCAGgC,iDAAsB;GAFtD,mBAAmB,CAgD/B"}
@@ -11,4 +11,5 @@ export declare class CreateUserDto extends BaseEntity {
11
11
  invitation_status: string;
12
12
  is_defaultadmin: number;
13
13
  is_customer: number;
14
+ appcode: string;
14
15
  }
@@ -1 +1 @@
1
- {"version":3,"file":"create-user.dto.js","sourceRoot":"","sources":["../../../../src/module/user/dto/create-user.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAgE;AAChE,6EAAkE;AAClE,uEAAoE;AACpE,yDAA2C;AAE3C,MAAa,aAAc,SAAQ,+BAAU;IAC3C;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,iCAAe,CAAC;IACrC,CAAC;CAgDF;AApDD,sCAoDC;AA1CC;IAJC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,yBAAO,EAAC,qBAAqB,EAAE,EAAE,OAAO,EAAE,wBAAwB,EAAE,CAAC;IACrE,IAAA,0BAAM,GAAE;;iDACU;AAMnB;IAJC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,yBAAO,EAAC,qBAAqB,EAAE,EAAE,OAAO,EAAE,uBAAuB,EAAE,CAAC;IACpE,IAAA,0BAAM,GAAE;;gDACS;AAQlB;IANC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,yBAAO,EACN,sEAAsE,EACtE,EAAE,OAAO,EAAE,mBAAmB,EAAE,CACjC;;+CACgB;AAYjB;IAVC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,yBAAO,EACN,sEAAsE,EACtE;QACE,OAAO,EACL,gJAAgJ;KACnJ,CACF;IACA,IAAA,0BAAM,GAAE;;+CACQ;AAMjB;IAJC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,yBAAO,EAAC,aAAa,EAAE,EAAE,OAAO,EAAE,4BAA4B,EAAE,CAAC;IACjE,IAAA,0BAAM,GAAE;;6CACM;AAGf;IADC,IAAA,0BAAM,GAAE;;4CACI"}
1
+ {"version":3,"file":"create-user.dto.js","sourceRoot":"","sources":["../../../../src/module/user/dto/create-user.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAgE;AAChE,6EAAkE;AAClE,uEAAoE;AACpE,yDAA2C;AAE3C,MAAa,aAAc,SAAQ,+BAAU;IAC3C;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,iCAAe,CAAC;IACrC,CAAC;CAiDF;AArDD,sCAqDC;AA3CC;IAJC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,yBAAO,EAAC,qBAAqB,EAAE,EAAE,OAAO,EAAE,wBAAwB,EAAE,CAAC;IACrE,IAAA,0BAAM,GAAE;;iDACU;AAMnB;IAJC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,yBAAO,EAAC,qBAAqB,EAAE,EAAE,OAAO,EAAE,uBAAuB,EAAE,CAAC;IACpE,IAAA,0BAAM,GAAE;;gDACS;AAQlB;IANC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,yBAAO,EACN,sEAAsE,EACtE,EAAE,OAAO,EAAE,mBAAmB,EAAE,CACjC;;+CACgB;AAYjB;IAVC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,yBAAO,EACN,sEAAsE,EACtE;QACE,OAAO,EACL,gJAAgJ;KACnJ,CACF;IACA,IAAA,0BAAM,GAAE;;+CACQ;AAMjB;IAJC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,yBAAO,EAAC,aAAa,EAAE,EAAE,OAAO,EAAE,4BAA4B,EAAE,CAAC;IACjE,IAAA,0BAAM,GAAE;;6CACM;AAGf;IADC,IAAA,0BAAM,GAAE;;4CACI"}
@@ -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,EAAC,IAAI,EAAE,SAAS,EAAC,CAAC;;oDACN;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,EAAC,IAAI,EAAE,SAAS,EAAC,CAAC;;gDACV;0BAvBL,eAAe;IAD3B,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,sBAAsB,EAAE,CAAC;;GAC5B,eAAe,CAwB3B"}
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
- constructor(userService: UserService, userSessionService: UserSessionService, configService: ConfigService);
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, appcode);
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":"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"}
1
+ {"version":3,"file":"login.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/login.service.ts"],"names":[],"mappings":"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"}
@@ -9,6 +9,6 @@ export declare class RoleService extends EntityServiceImpl {
9
9
  private readonly entityManager;
10
10
  private readonly moduleAccessRepo;
11
11
  constructor(roleRepository: RoleRepository, entityManager: EntityManager, moduleAccessRepo: Repository<ModuleAccess>);
12
- createEntity(entityData: BaseEntity, loggedInUser: UserData | null): Promise<BaseEntity>;
12
+ createEntity(entityData: BaseEntity, loggedInUser: UserData | null, manager?: EntityManager, appcode?: string): Promise<BaseEntity>;
13
13
  updateEntity(entityData: BaseEntity, loggedInUser: UserData | null): Promise<BaseEntity>;
14
14
  }
@@ -27,8 +27,11 @@ let RoleService = class RoleService extends entity_service_impl_service_1.Entity
27
27
  this.entityManager = entityManager;
28
28
  this.moduleAccessRepo = moduleAccessRepo;
29
29
  }
30
- async createEntity(entityData, loggedInUser) {
30
+ async createEntity(entityData, loggedInUser, manager, appcode) {
31
31
  let role = entityData;
32
+ if (appcode) {
33
+ role.appcode = appcode;
34
+ }
32
35
  if (await this.roleRepository.isRoleNameExists(role.name, { organization_id: entityData.organization_id })) {
33
36
  throw new common_1.BadRequestException('Role name already exists.');
34
37
  }
@@ -1 +1 @@
1
- {"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/role.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/role.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAiE;AACjE,gGAAmF;AAInF,uEAA+D;AAC/D,mEAA+D;AAC/D,qCAAoD;AACpD,6CAAmD;AACnD,mFAAwE;AAIjE,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,+CAAiB;IAChD,YACmB,cAA8B,EAC9B,aAA4B,EAE5B,gBAA0C;QAE3D,KAAK,EAAE,CAAC;QALS,mBAAc,GAAd,cAAc,CAAgB;QAC9B,kBAAa,GAAb,aAAa,CAAe;QAE5B,qBAAgB,GAAhB,gBAAgB,CAA0B;IAG7D,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,UAAsB,EACtB,YAA6B,EAC7B,OAAuB,EACvB,OAAgB;QAEhB,IAAI,IAAI,GAAG,UAAkB,CAAC;QAC9B,IAAG,OAAO,EAAC,CAAC;YACV,IAAI,CAAC,OAAO,GAAG,OAAO,CAAE;QAC1B,CAAC;QACD,IAAI,MAAM,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAC,EAAC,eAAe,EAAC,UAAU,CAAC,eAAe,EAAC,CAAC,EAAE,CAAC;YACvG,MAAM,IAAI,4BAAmB,CAAC,2BAA2B,CAAC,CAAC;QAC7D,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB;YACvC,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,iCAAe,EAAE,IAAI,CAAC,iBAAiB,CAAC;YACnE,CAAC,CAAC,IAAI,CAAC;QAET,IAAI,IAAI,CAAC,iBAAiB,IAAI,CAAC,UAAU,EAAE,CAAC;YAC1C,MAAM,IAAI,4BAAmB,CAAC,wBAAwB,CAAC,CAAC;QAC1D,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC/D,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC;gBACzD,KAAK,EAAE,EAAE,SAAS,EAAE,UAAU,CAAC,IAAI,EAAE;aACtC,CAAC,CAAC;YAEH,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACvD,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC;gBAC3B,SAAS,EAAE,SAAS,CAAC,IAAI;gBACzB,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC,CACH,CAAC;YAEF,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACtD,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,UAAsB,EACtB,YAA6B;QAE7B,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;YACrB,MAAM,IAAI,4BAAmB,CAAC,uBAAuB,CAAC,CAAC;QACzD,CAAC;QACD,MAAM,IAAI,GAAG,UAAkB,CAAC;QAEhC,IAAI,UAAU,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YAErC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAC3C,iCAAe,EACf,UAAU,CAAC,EAAE,CACd,CAAC;YAEF,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,MAAM,IAAI,4BAAmB,CAAC,gBAAgB,CAAC,CAAC;YAClD,CAAC;YAED,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;;;;oFAIuB,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC;YAElG,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC/B,MAAM,IAAI,4BAAmB,CAC3B,8DAA8D,CAC/D,CAAC;YACJ,CAAC;YAED,IAAI,IAAI,CAAC,SAAS,KAAK,CAAC,EAAE,CAAC;gBACzB,MAAM,IAAI,4BAAmB,CAAC,+BAA+B,CAAC,CAAC;YACjE,CAAC;QACH,CAAC;QAED,IACE,MAAM,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,UAAU,CAAC,IAAI,EAAE,EAAC,aAAa,EAAC,UAAU,CAAC,EAAE,EAAC,eAAe,EAAC,YAAY,EAAE,eAAe,EAAC,CAAC,EACxI,CAAC;YACD,MAAM,IAAI,4BAAmB,CAAC,2BAA2B,CAAC,CAAC;QAC7D,CAAC;QAEH,MAAM,EAAC,iBAAiB,EAAE,GAAG,eAAe,EAAC,GAAG,IAAI,CAAC;QACrD,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,YAAY,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;QAE1E,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CACzC,iCAAe,EACf,IAAI,CAAC,iBAAiB,CACvB,CAAC;YAEF,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,MAAM,IAAI,4BAAmB,CAAC,uBAAuB,CAAC,CAAC;YACzD,CAAC;YAED,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YAE7D,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC;gBACzD,KAAK,EAAE,EAAE,SAAS,EAAE,UAAU,CAAC,IAAI,EAAE;aACtC,CAAC,CAAC;YAEH,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACvD,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC;gBAC3B,SAAS,EAAE,IAAI,CAAC,IAAI;gBACpB,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC,CACH,CAAC;YAEF,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACtD,CAAC;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;CACF,CAAA;AAjIY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;IAKR,WAAA,IAAA,0BAAgB,EAAC,mCAAY,CAAC,CAAA;qCAFE,gCAAc;QACf,uBAAa;QAEV,oBAAU;GALpC,WAAW,CAiIvB"}
@@ -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: user.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;QACtB,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,IAAI,CAAC,OAAO,EAAE,CAAC;QACzE,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
+ {"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"}