@neohm/nestend 3.1.3 → 3.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +82 -66
- package/dist/admin/controllers/admin.role.controller.js +2 -2
- package/dist/admin/controllers/admin.role.controller.js.map +1 -1
- package/dist/admin/controllers/admin.scheduled.task.controller.d.ts +5 -6
- package/dist/admin/controllers/admin.scheduled.task.controller.d.ts.map +1 -1
- package/dist/admin/controllers/admin.scheduled.task.controller.js +9 -8
- package/dist/admin/controllers/admin.scheduled.task.controller.js.map +1 -1
- package/dist/admin/controllers/admin.tenant.controller.d.ts +5 -6
- package/dist/admin/controllers/admin.tenant.controller.d.ts.map +1 -1
- package/dist/admin/controllers/admin.tenant.controller.js +13 -12
- package/dist/admin/controllers/admin.tenant.controller.js.map +1 -1
- package/dist/admin/controllers/admin.tenant.user.controller.d.ts +30 -0
- package/dist/admin/controllers/admin.tenant.user.controller.d.ts.map +1 -0
- package/dist/admin/controllers/admin.tenant.user.controller.js +132 -0
- package/dist/admin/controllers/admin.tenant.user.controller.js.map +1 -0
- package/dist/admin/controllers/admin.user.controller.d.ts +6 -26
- package/dist/admin/controllers/admin.user.controller.d.ts.map +1 -1
- package/dist/admin/controllers/admin.user.controller.js +20 -98
- package/dist/admin/controllers/admin.user.controller.js.map +1 -1
- package/dist/admin/dtos/add.admin.role.dto.d.ts +4 -0
- package/dist/admin/dtos/add.admin.role.dto.d.ts.map +1 -0
- package/dist/admin/dtos/add.admin.role.dto.js +22 -0
- package/dist/admin/dtos/add.admin.role.dto.js.map +1 -0
- package/dist/admin/dtos/add.admin.user.dto.d.ts +1 -2
- package/dist/admin/dtos/add.admin.user.dto.d.ts.map +1 -1
- package/dist/admin/dtos/add.admin.user.dto.js +1 -6
- package/dist/admin/dtos/add.admin.user.dto.js.map +1 -1
- package/dist/admin/dtos/add.client.user.dto.d.ts +1 -0
- package/dist/admin/dtos/add.client.user.dto.d.ts.map +1 -1
- package/dist/admin/dtos/add.client.user.dto.js +12 -0
- package/dist/admin/dtos/add.client.user.dto.js.map +1 -1
- package/dist/admin/dtos/add.user.role.dto.d.ts +4 -0
- package/dist/admin/dtos/add.user.role.dto.d.ts.map +1 -0
- package/dist/admin/dtos/add.user.role.dto.js +22 -0
- package/dist/admin/dtos/add.user.role.dto.js.map +1 -0
- package/dist/admin/dtos/base.user.dto.d.ts +0 -1
- package/dist/admin/dtos/base.user.dto.d.ts.map +1 -1
- package/dist/admin/dtos/base.user.dto.js +0 -6
- package/dist/admin/dtos/base.user.dto.js.map +1 -1
- package/dist/admin/es6.classes.d.ts +4 -4
- package/dist/admin/es6.classes.d.ts.map +1 -1
- package/dist/admin/es6.classes.js +3 -2
- package/dist/admin/es6.classes.js.map +1 -1
- package/dist/admin/libraries/admin.user.data.processor.d.ts +3 -0
- package/dist/admin/libraries/admin.user.data.processor.d.ts.map +1 -1
- package/dist/admin/libraries/admin.user.data.processor.js +38 -2
- package/dist/admin/libraries/admin.user.data.processor.js.map +1 -1
- package/dist/admin/libraries/bulk.user.data.processor.d.ts.map +1 -1
- package/dist/admin/libraries/bulk.user.data.processor.js +0 -1
- package/dist/admin/libraries/bulk.user.data.processor.js.map +1 -1
- package/dist/admin/libraries/client.user.data.processor.d.ts +6 -0
- package/dist/admin/libraries/client.user.data.processor.d.ts.map +1 -1
- package/dist/admin/libraries/client.user.data.processor.js +74 -4
- package/dist/admin/libraries/client.user.data.processor.js.map +1 -1
- package/dist/auth/controllers/auth.controller.js +1 -1
- package/dist/index.d.ts +82 -180
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +141 -347
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
- package/dist/admin/services/admin.detail.service.d.ts +0 -12
- package/dist/admin/services/admin.detail.service.d.ts.map +0 -1
- package/dist/admin/services/admin.detail.service.js +0 -44
- package/dist/admin/services/admin.detail.service.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"es6.classes.d.ts","sourceRoot":"","sources":["../../src/admin/es6.classes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,4BAA4B,EAAE,MAAM,+CAA+C,CAAC;AAC7F,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAC9E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"es6.classes.d.ts","sourceRoot":"","sources":["../../src/admin/es6.classes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,4BAA4B,EAAE,MAAM,+CAA+C,CAAC;AAC7F,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAC9E,OAAO,EAAE,yBAAyB,EAAE,MAAM,4CAA4C,CAAC;AACvF,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC;AACnF,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,EAAE,yBAAyB,EAAE,MAAM,0CAA0C,CAAC;AACrF,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,EACL,sBAAsB,EACtB,iBAAiB,EAClB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AACvF,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAC3F,OAAO,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AACvF,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAG5D,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD,eAAO,MAAM,UAAU;;;;;;;CAyCtB,CAAC"}
|
|
@@ -4,9 +4,9 @@ exports.es6Classes = void 0;
|
|
|
4
4
|
const admin_role_controller_1 = require("./controllers/admin.role.controller");
|
|
5
5
|
const admin_scheduled_task_controller_1 = require("./controllers/admin.scheduled.task.controller");
|
|
6
6
|
const admin_tenant_controller_1 = require("./controllers/admin.tenant.controller");
|
|
7
|
+
const admin_tenant_user_controller_1 = require("./controllers/admin.tenant.user.controller");
|
|
7
8
|
const admin_user_controller_1 = require("./controllers/admin.user.controller");
|
|
8
9
|
const admin_access_service_1 = require("./services/admin.access.service");
|
|
9
|
-
const admin_detail_service_1 = require("./services/admin.detail.service");
|
|
10
10
|
const admin_user_data_processor_1 = require("./libraries/admin.user.data.processor");
|
|
11
11
|
const admin_user_delete_processor_1 = require("./libraries/admin.user.delete.processor");
|
|
12
12
|
const admin_user_list_processor_1 = require("./libraries/admin.user.list.processor");
|
|
@@ -38,8 +38,9 @@ exports.es6Classes = {
|
|
|
38
38
|
admin_scheduled_task_controller_1.AdminScheduledTaskController,
|
|
39
39
|
admin_tenant_controller_1.AdminTenantController,
|
|
40
40
|
admin_user_controller_1.AdminUserController,
|
|
41
|
+
admin_tenant_user_controller_1.AdminTenantUserController,
|
|
41
42
|
],
|
|
42
|
-
services: [admin_access_service_1.AdminAccessService
|
|
43
|
+
services: [admin_access_service_1.AdminAccessService],
|
|
43
44
|
libraries: [
|
|
44
45
|
admin_user_data_processor_1.AdminUserDataProcessor,
|
|
45
46
|
admin_user_delete_processor_1.AdminUserDeleteProcessor,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"es6.classes.js","sourceRoot":"","sources":["../../src/admin/es6.classes.ts"],"names":[],"mappings":";;;AAAA,+EAA0E;AAC1E,mGAA6F;AAC7F,mFAA8E;AAC9E,+EAA0E;AAC1E,0EAAqE;AACrE,
|
|
1
|
+
{"version":3,"file":"es6.classes.js","sourceRoot":"","sources":["../../src/admin/es6.classes.ts"],"names":[],"mappings":";;;AAAA,+EAA0E;AAC1E,mGAA6F;AAC7F,mFAA8E;AAC9E,6FAAuF;AACvF,+EAA0E;AAC1E,0EAAqE;AACrE,qFAA+E;AAC/E,yFAAmF;AACnF,qFAA+E;AAC/E,mFAA6E;AAC7E,uFAAiF;AACjF,2FAAqF;AACrF,uFAAiF;AACjF,yEAGyC;AACzC,6FAAuF;AACvF,iGAA2F;AAC3F,6FAAuF;AACvF,6EAAwE;AACxE,iFAA4E;AAC5E,6EAAwE;AACxE,kEAA4D;AAC5D,kEAA4D;AAC5D,oEAA8D;AAC9D,0EAA4D;AAC5D,0DAAqD;AACrD,oEAA8D;AAC9D,wDAAmD;AACnD,sEAAgE;AAChE,wDAAmD;AACnD,4EAAsE;AACtE,4DAAuD;AAE1C,QAAA,UAAU,GAAG;IACxB,WAAW,EAAE;QACX,2CAAmB;QACnB,8DAA4B;QAC5B,+CAAqB;QACrB,2CAAmB;QACnB,wDAAyB;KAC1B;IACD,QAAQ,EAAE,CAAC,yCAAkB,CAAU;IACvC,SAAS,EAAE;QACT,kDAAsB;QACtB,sDAAwB;QACxB,kDAAsB;QACtB,4CAAsB;QACtB,gDAAqB;QACrB,oDAAuB;QACvB,wDAAyB;QACzB,oDAAuB;QACvB,uCAAiB;QACjB,0DAA0B;QAC1B,8DAA4B;QAC5B,0DAA0B;QAC1B,2CAAmB;QACnB,+CAAqB;QACrB,2CAAmB;KACpB;IACD,IAAI,EAAE;QACJ,oCAAe;QACf,oCAAe;QACf,sCAAgB;QAChB,oCAAW;QACX,6BAAY;QACZ,sCAAgB;QAChB,2BAAW;QACX,wCAAiB;QACjB,2BAAW;QACX,8CAAoB;QACpB,+BAAa;KACd;IACD,IAAI,EAAE,EAAE;IACR,WAAW,EAAE,EAAE;CAChB,CAAC"}
|
|
@@ -7,11 +7,14 @@ export declare class AdminUserDataProcessor extends CommonDataProcessor {
|
|
|
7
7
|
constructor(actor: AdminUserEntity);
|
|
8
8
|
process(payload: AddAdminUserDto): Promise<AdminUserEntity>;
|
|
9
9
|
private validate;
|
|
10
|
+
private save;
|
|
10
11
|
private create;
|
|
12
|
+
private update;
|
|
11
13
|
private assertEmailAvailable;
|
|
12
14
|
private assertUsernameAvailable;
|
|
13
15
|
private resolveAdminRoles;
|
|
14
16
|
private grantAdminRoles;
|
|
17
|
+
private updateAdminRoles;
|
|
15
18
|
private stripSecrets;
|
|
16
19
|
}
|
|
17
20
|
//# sourceMappingURL=admin.user.data.processor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin.user.data.processor.d.ts","sourceRoot":"","sources":["../../../src/admin/libraries/admin.user.data.processor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAGxE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"admin.user.data.processor.d.ts","sourceRoot":"","sources":["../../../src/admin/libraries/admin.user.data.processor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAGxE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAK7D,qBAAa,sBAAuB,SAAQ,mBAAmB;IAGjD,OAAO,CAAC,QAAQ,CAAC,KAAK;IAFlC,SAAS,CAAC,OAAO,EAAE,eAAe,CAAC;gBAEN,KAAK,EAAE,eAAe;IAI7C,OAAO,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;YAMnD,QAAQ;YAQR,IAAI;YAMJ,MAAM;YAgBN,MAAM;YAgBN,oBAAoB;YAQpB,uBAAuB;YASvB,iBAAiB;YAiBjB,eAAe;YAcf,gBAAgB;IA2B9B,OAAO,CAAC,YAAY;CAIrB"}
|
|
@@ -15,7 +15,7 @@ class AdminUserDataProcessor extends common_data_processor_1.CommonDataProcessor
|
|
|
15
15
|
async process(payload) {
|
|
16
16
|
this.payload = payload;
|
|
17
17
|
await this.validate();
|
|
18
|
-
return this.
|
|
18
|
+
return this.save();
|
|
19
19
|
}
|
|
20
20
|
async validate() {
|
|
21
21
|
await this.assertEmailAvailable(this.payload.email);
|
|
@@ -23,6 +23,11 @@ class AdminUserDataProcessor extends common_data_processor_1.CommonDataProcessor
|
|
|
23
23
|
await this.resolveAdminRoles(this.payload.role_ids, 'role_ids');
|
|
24
24
|
this.throwExceptionOnError();
|
|
25
25
|
}
|
|
26
|
+
async save() {
|
|
27
|
+
if (this.payload?.id)
|
|
28
|
+
return this.update();
|
|
29
|
+
return this.create();
|
|
30
|
+
}
|
|
26
31
|
async create() {
|
|
27
32
|
const body = this.payload;
|
|
28
33
|
const adminUser = admin_user_entity_1.AdminUserEntity.create({
|
|
@@ -30,12 +35,22 @@ class AdminUserDataProcessor extends common_data_processor_1.CommonDataProcessor
|
|
|
30
35
|
email: body.email,
|
|
31
36
|
username: body.username,
|
|
32
37
|
password: await auth_utilities_1.AuthUtility.hashPassword(body.password),
|
|
33
|
-
attributes: body.attributes ?? {},
|
|
34
38
|
});
|
|
35
39
|
await adminUser.save();
|
|
36
40
|
await this.grantAdminRoles(adminUser.id, body.role_ids);
|
|
37
41
|
return this.stripSecrets(adminUser);
|
|
38
42
|
}
|
|
43
|
+
async update() {
|
|
44
|
+
const adminUser = await admin_user_entity_1.AdminUserEntity.findOne({
|
|
45
|
+
where: { id: this.payload.id },
|
|
46
|
+
});
|
|
47
|
+
adminUser.name = this.payload.name;
|
|
48
|
+
adminUser.email = this.payload.email;
|
|
49
|
+
adminUser.username = this.payload.username;
|
|
50
|
+
await adminUser.save();
|
|
51
|
+
await this.updateAdminRoles(adminUser.id, this.payload.role_ids);
|
|
52
|
+
return this.stripSecrets(adminUser);
|
|
53
|
+
}
|
|
39
54
|
async assertEmailAvailable(email, field = 'email') {
|
|
40
55
|
const existing = await admin_user_entity_1.AdminUserEntity.findOne({ where: { email } });
|
|
41
56
|
if (existing)
|
|
@@ -69,6 +84,27 @@ class AdminUserDataProcessor extends common_data_processor_1.CommonDataProcessor
|
|
|
69
84
|
if (links.length)
|
|
70
85
|
await system_admin_user_role_entity_1.SystemAdminUserRoleEntity.save(links);
|
|
71
86
|
}
|
|
87
|
+
async updateAdminRoles(adminUserId, roleIds = []) {
|
|
88
|
+
const existingRoles = await system_admin_user_role_entity_1.SystemAdminUserRoleEntity.find({
|
|
89
|
+
where: {
|
|
90
|
+
admin_user_id: adminUserId,
|
|
91
|
+
},
|
|
92
|
+
});
|
|
93
|
+
const existingRoleIds = new Set(existingRoles.map((role) => role.role_id));
|
|
94
|
+
for (const existingRole of existingRoles) {
|
|
95
|
+
if (!roleIds.includes(existingRole.role_id)) {
|
|
96
|
+
await existingRole.softRemove();
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
for (const roleId of roleIds) {
|
|
100
|
+
if (!existingRoleIds.has(roleId)) {
|
|
101
|
+
await system_admin_user_role_entity_1.SystemAdminUserRoleEntity.create({
|
|
102
|
+
admin_user_id: adminUserId,
|
|
103
|
+
role_id: roleId,
|
|
104
|
+
}).save();
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
}
|
|
72
108
|
stripSecrets(adminUser) {
|
|
73
109
|
delete adminUser.password;
|
|
74
110
|
return adminUser;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin.user.data.processor.js","sourceRoot":"","sources":["../../../src/admin/libraries/admin.user.data.processor.ts"],"names":[],"mappings":";;;AAAA,qCAA6B;AAC7B,wFAAmF;AACnF,6EAAwE;AACxE,2FAAqF;AACrF,qGAA8F;AAE9F,wEAAkE;
|
|
1
|
+
{"version":3,"file":"admin.user.data.processor.js","sourceRoot":"","sources":["../../../src/admin/libraries/admin.user.data.processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bulk.user.data.processor.d.ts","sourceRoot":"","sources":["../../../src/admin/libraries/bulk.user.data.processor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAG1D,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,YAAY,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAQ3D,qBAAa,qBAAsB,SAAQ,iBAAiB;IAG9C,OAAO,CAAC,QAAQ,CAAC,aAAa;IAF1C,SAAS,CAAC,OAAO,EAAE,eAAe,CAAC;gBAEN,aAAa,EAAE,aAAa;IAInD,OAAO,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;YAMlD,QAAQ;YAWR,MAAM;
|
|
1
|
+
{"version":3,"file":"bulk.user.data.processor.d.ts","sourceRoot":"","sources":["../../../src/admin/libraries/bulk.user.data.processor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAG1D,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,YAAY,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAQ3D,qBAAa,qBAAsB,SAAQ,iBAAiB;IAG9C,OAAO,CAAC,QAAQ,CAAC,aAAa;IAF1C,SAAS,CAAC,OAAO,EAAE,eAAe,CAAC;gBAEN,aAAa,EAAE,aAAa;IAInD,OAAO,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;YAMlD,QAAQ;YAWR,MAAM;IA2BpB,OAAO,CAAC,mBAAmB;YAiBb,eAAe;CAa9B"}
|
|
@@ -36,7 +36,6 @@ class BulkUserDataProcessor extends user_data_processor_1.UserDataProcessor {
|
|
|
36
36
|
contact_code: user.contact_code,
|
|
37
37
|
contact: user.contact,
|
|
38
38
|
active: user.active ?? true,
|
|
39
|
-
attributes: user.attributes ?? {},
|
|
40
39
|
})));
|
|
41
40
|
await user_entity_1.UserEntity.save(entities);
|
|
42
41
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bulk.user.data.processor.js","sourceRoot":"","sources":["../../../src/admin/libraries/bulk.user.data.processor.ts"],"names":[],"mappings":";;;AAAA,qCAA6B;AAC7B,+DAA0D;AAC1D,iEAA6D;AAC7D,oEAA2D;AAG3D,wEAAkE;AAUlE,MAAa,qBAAsB,SAAQ,uCAAiB;IAG1D,YAA6B,aAA4B;QACvD,KAAK,EAAE,CAAC;QADmB,kBAAa,GAAb,aAAa,CAAe;IAEzD,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAwB;QACpC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;IAEO,KAAK,CAAC,QAAQ;QACpB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC3E,IAAI,CAAC,MAAM;YACT,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE,8BAA8B,CAAC,CAAC;QAEnE,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAE7B,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAC/B,CAAC;IAEO,KAAK,CAAC,MAAM;QAClB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC;QAE1B,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAChC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAC5B,wBAAU,CAAC,MAAM,CAAC;YAChB,SAAS,EAAE,yBAAQ,CAAC,WAAW;YAC/B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,QAAQ,EAAE,MAAM,4BAAW,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC;YACvD,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,IAAI;
|
|
1
|
+
{"version":3,"file":"bulk.user.data.processor.js","sourceRoot":"","sources":["../../../src/admin/libraries/bulk.user.data.processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,13 @@ export declare class ClientUserDataProcessor extends UserDataProcessor {
|
|
|
14
14
|
constructor(tenantService: TenantService, emailNotificationService: EmailNotificationService, systemPropertyService: SystemPropertyService);
|
|
15
15
|
process(payload: AddClientUserDto): Promise<UserEntity>;
|
|
16
16
|
private validate;
|
|
17
|
+
private validateTenant;
|
|
18
|
+
private resolveRoles;
|
|
19
|
+
private save;
|
|
17
20
|
private create;
|
|
21
|
+
private update;
|
|
22
|
+
private grantRoles;
|
|
23
|
+
private updateRoles;
|
|
18
24
|
private notifyUser;
|
|
19
25
|
private supportContact;
|
|
20
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.user.data.processor.d.ts","sourceRoot":"","sources":["../../../src/admin/libraries/client.user.data.processor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAG7D,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAM/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,wDAAwD,CAAC;AAClG,OAAO,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAC;
|
|
1
|
+
{"version":3,"file":"client.user.data.processor.d.ts","sourceRoot":"","sources":["../../../src/admin/libraries/client.user.data.processor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAG7D,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAM/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,wDAAwD,CAAC;AAClG,OAAO,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAC;AAQtF,qBAAa,uBAAwB,SAAQ,iBAAiB;IAO1D,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,wBAAwB;IACzC,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IARxC,SAAS,CAAC,OAAO,EAAE,gBAAgB,CAAC;IACpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4C;IAEnE,OAAO,CAAC,MAAM,CAA6B;gBAGxB,aAAa,EAAE,aAAa,EAC5B,wBAAwB,EAAE,wBAAwB,EAClD,qBAAqB,EAAE,qBAAqB;IAKzD,OAAO,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,UAAU,CAAC;YAM/C,QAAQ;YAQR,cAAc;YAQd,YAAY;YAuBZ,IAAI;YAKJ,MAAM;YAsBN,MAAM;YAmBN,UAAU;YASV,WAAW;YA2BX,UAAU;YAyBV,cAAc;CAiB7B"}
|
|
@@ -9,6 +9,10 @@ const auth_utilities_1 = require("../../auth/utilities/auth.utilities");
|
|
|
9
9
|
const email_notification_default_enum_1 = require("../../notification/enums/email.notification.default.enum");
|
|
10
10
|
const email_template_identifier_enum_1 = require("../../notification/enums/email.template.identifier.enum");
|
|
11
11
|
const process_email_notification_1 = require("../../notification/libraries/process.email.notification");
|
|
12
|
+
const user_role_entity_1 = require("../../auth/entities/user.role.entity");
|
|
13
|
+
const access_exception_1 = require("../../global/exceptions/access.exception");
|
|
14
|
+
const typeorm_1 = require("typeorm");
|
|
15
|
+
const system_role_entity_1 = require("../../auth/entities/system.role.entity");
|
|
12
16
|
class ClientUserDataProcessor extends user_data_processor_1.UserDataProcessor {
|
|
13
17
|
constructor(tenantService, emailNotificationService, systemPropertyService) {
|
|
14
18
|
super();
|
|
@@ -21,16 +25,43 @@ class ClientUserDataProcessor extends user_data_processor_1.UserDataProcessor {
|
|
|
21
25
|
async process(payload) {
|
|
22
26
|
this.payload = payload;
|
|
23
27
|
await this.validate();
|
|
24
|
-
return this.
|
|
28
|
+
return this.save();
|
|
25
29
|
}
|
|
26
30
|
async validate() {
|
|
31
|
+
await this.validateTenant();
|
|
32
|
+
await this.assertEmailAvailable(this.payload.email);
|
|
33
|
+
await this.resolveRoles(this.payload.role_ids, 'role_ids');
|
|
34
|
+
this.throwExceptionOnError();
|
|
35
|
+
}
|
|
36
|
+
async validateTenant() {
|
|
27
37
|
const tenant = await this.tenantService.findByUuid(this.payload.tenant_id);
|
|
28
38
|
if (!tenant)
|
|
29
39
|
this.setColumnError('tenant_id', 'Tenant not found or inactive');
|
|
30
|
-
await this.assertEmailAvailable(this.payload.email);
|
|
31
|
-
this.throwExceptionOnError();
|
|
32
40
|
this.tenant = tenant;
|
|
33
41
|
}
|
|
42
|
+
async resolveRoles(roleIds, field) {
|
|
43
|
+
if (!roleIds?.length) {
|
|
44
|
+
return [];
|
|
45
|
+
}
|
|
46
|
+
const uniqueRoleIds = [...new Set(roleIds.map((role_id) => role_id))];
|
|
47
|
+
const roles = await system_role_entity_1.SystemRoleEntity.find({
|
|
48
|
+
where: {
|
|
49
|
+
id: (0, typeorm_1.In)(uniqueRoleIds),
|
|
50
|
+
},
|
|
51
|
+
});
|
|
52
|
+
const foundRoleIds = new Set(roles.map((role) => role.id));
|
|
53
|
+
for (const roleId of uniqueRoleIds) {
|
|
54
|
+
if (!foundRoleIds.has(roleId)) {
|
|
55
|
+
this.setColumnError(field, `Role '${roleId}' not found`);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
return roles;
|
|
59
|
+
}
|
|
60
|
+
async save() {
|
|
61
|
+
if (this.payload?.id)
|
|
62
|
+
return this.create();
|
|
63
|
+
return this.update();
|
|
64
|
+
}
|
|
34
65
|
async create() {
|
|
35
66
|
const body = this.payload;
|
|
36
67
|
const user = user_entity_1.UserEntity.create({
|
|
@@ -43,12 +74,51 @@ class ClientUserDataProcessor extends user_data_processor_1.UserDataProcessor {
|
|
|
43
74
|
contact_code: body.contact_code,
|
|
44
75
|
contact: body.contact,
|
|
45
76
|
active: body.active ?? true,
|
|
46
|
-
attributes: body.attributes ?? {},
|
|
47
77
|
});
|
|
48
78
|
await user.save();
|
|
79
|
+
await this.grantRoles(user);
|
|
49
80
|
await this.notifyUser(user);
|
|
50
81
|
return this.stripSecrets(user);
|
|
51
82
|
}
|
|
83
|
+
async update() {
|
|
84
|
+
const body = this.payload;
|
|
85
|
+
const user = await user_entity_1.UserEntity.findOne({ where: { id: body.id } });
|
|
86
|
+
if (!user)
|
|
87
|
+
throw new access_exception_1.AccessException('Invalid user id provided');
|
|
88
|
+
user.full_name = body.full_name;
|
|
89
|
+
user.email = body.email;
|
|
90
|
+
user.country = body.country;
|
|
91
|
+
user.contact_code = body.contact_code;
|
|
92
|
+
user.contact = body.contact;
|
|
93
|
+
user.active = body.active ?? true;
|
|
94
|
+
await user.save();
|
|
95
|
+
await this.updateRoles(user);
|
|
96
|
+
return this.stripSecrets(user);
|
|
97
|
+
}
|
|
98
|
+
async grantRoles(user) {
|
|
99
|
+
if (!this.payload?.role_ids?.length)
|
|
100
|
+
return;
|
|
101
|
+
const userRoles = [...new Set(this.payload.role_ids)].map((role_id) => user_role_entity_1.UserRoleEntity.create({ user_id: user.id, role_id }));
|
|
102
|
+
await user_role_entity_1.UserRoleEntity.save(userRoles);
|
|
103
|
+
}
|
|
104
|
+
async updateRoles(user) {
|
|
105
|
+
const existingRoles = await user_role_entity_1.UserRoleEntity.find({
|
|
106
|
+
where: {
|
|
107
|
+
user_id: user.id,
|
|
108
|
+
},
|
|
109
|
+
});
|
|
110
|
+
const existingRoleIds = new Set(existingRoles.map((role) => role.role_id));
|
|
111
|
+
const roleIds = new Set((this.payload?.role_ids ?? []).map((role_id) => role_id));
|
|
112
|
+
for (const existingRole of existingRoles)
|
|
113
|
+
if (!roleIds.has(existingRole.role_id))
|
|
114
|
+
await existingRole.softRemove();
|
|
115
|
+
for (const roleId of roleIds)
|
|
116
|
+
if (!existingRoleIds.has(roleId))
|
|
117
|
+
await user_role_entity_1.UserRoleEntity.create({
|
|
118
|
+
user_id: user.id,
|
|
119
|
+
role_id: roleId,
|
|
120
|
+
}).save();
|
|
121
|
+
}
|
|
52
122
|
async notifyUser(user) {
|
|
53
123
|
const notificationData = {
|
|
54
124
|
identifier: email_template_identifier_enum_1.EmailTemplateIdentifier.TENANT_USER_ONBOARDED,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.user.data.processor.js","sourceRoot":"","sources":["../../../src/admin/libraries/client.user.data.processor.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AACxC,+DAA0D;AAC1D,iEAA6D;AAC7D,oEAA2D;AAI3D,wEAAkE;AAElE,8GAAoG;AACpG,4GAAkG;AAClG,wGAAmG;
|
|
1
|
+
{"version":3,"file":"client.user.data.processor.js","sourceRoot":"","sources":["../../../src/admin/libraries/client.user.data.processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -135,7 +135,7 @@ __decorate([
|
|
|
135
135
|
(0, common_1.Post)('change-password'),
|
|
136
136
|
(0, common_1.HttpCode)(common_1.HttpStatus.OK),
|
|
137
137
|
(0, swagger_1.ApiBearerAuth)(),
|
|
138
|
-
(0, swagger_1.ApiOperation)({ summary:
|
|
138
|
+
(0, swagger_1.ApiOperation)({ summary: `Change the authenticated user's password.` }),
|
|
139
139
|
__param(0, (0, common_1.Body)()),
|
|
140
140
|
__metadata("design:type", Function),
|
|
141
141
|
__metadata("design:paramtypes", [change_password_dto_1.ChangePasswordDto]),
|