@neohm/nestend 4.0.2 → 4.1.1
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 +46 -10
- package/dist/admin/controllers/admin.tenant.user.controller.d.ts +8 -1
- package/dist/admin/controllers/admin.tenant.user.controller.d.ts.map +1 -1
- package/dist/admin/controllers/admin.tenant.user.controller.js +75 -7
- package/dist/admin/controllers/admin.tenant.user.controller.js.map +1 -1
- package/dist/admin/dtos/add.client.membership.dto.d.ts +6 -0
- package/dist/admin/dtos/add.client.membership.dto.d.ts.map +1 -0
- package/dist/admin/dtos/add.client.membership.dto.js +41 -0
- package/dist/admin/dtos/add.client.membership.dto.js.map +1 -0
- package/dist/admin/es6.classes.d.ts +4 -2
- package/dist/admin/es6.classes.d.ts.map +1 -1
- package/dist/admin/es6.classes.js +4 -0
- package/dist/admin/es6.classes.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 +13 -5
- package/dist/admin/libraries/bulk.user.data.processor.js.map +1 -1
- package/dist/admin/libraries/client.membership.data.processor.d.ts +14 -0
- package/dist/admin/libraries/client.membership.data.processor.d.ts.map +1 -0
- package/dist/admin/libraries/client.membership.data.processor.js +56 -0
- package/dist/admin/libraries/client.membership.data.processor.js.map +1 -0
- package/dist/admin/libraries/client.user.data.processor.d.ts +1 -2
- package/dist/admin/libraries/client.user.data.processor.d.ts.map +1 -1
- package/dist/admin/libraries/client.user.data.processor.js +24 -31
- package/dist/admin/libraries/client.user.data.processor.js.map +1 -1
- package/dist/admin/libraries/client.user.delete.processor.d.ts.map +1 -1
- package/dist/admin/libraries/client.user.delete.processor.js +4 -0
- package/dist/admin/libraries/client.user.delete.processor.js.map +1 -1
- package/dist/admin/libraries/client.user.list.processor.d.ts.map +1 -1
- package/dist/admin/libraries/client.user.list.processor.js +14 -2
- package/dist/admin/libraries/client.user.list.processor.js.map +1 -1
- package/dist/admin/libraries/tenant.delete.processor.d.ts.map +1 -1
- package/dist/admin/libraries/tenant.delete.processor.js +22 -9
- package/dist/admin/libraries/tenant.delete.processor.js.map +1 -1
- package/dist/admin/libraries/user.data.processor.d.ts.map +1 -1
- package/dist/admin/libraries/user.data.processor.js +4 -1
- package/dist/admin/libraries/user.data.processor.js.map +1 -1
- package/dist/auth/auth.module.d.ts.map +1 -1
- package/dist/auth/auth.module.js +22 -3
- package/dist/auth/auth.module.js.map +1 -1
- package/dist/auth/controllers/auth.controller.d.ts +8 -7
- package/dist/auth/controllers/auth.controller.d.ts.map +1 -1
- package/dist/auth/controllers/auth.controller.js +36 -12
- package/dist/auth/controllers/auth.controller.js.map +1 -1
- package/dist/auth/controllers/impersonation.controller.d.ts +2 -2
- package/dist/auth/controllers/impersonation.controller.d.ts.map +1 -1
- package/dist/auth/controllers/tenant.invitation.controller.d.ts +18 -0
- package/dist/auth/controllers/tenant.invitation.controller.d.ts.map +1 -0
- package/dist/auth/controllers/tenant.invitation.controller.js +120 -0
- package/dist/auth/controllers/tenant.invitation.controller.js.map +1 -0
- package/dist/auth/controllers/tenant.member.controller.d.ts +18 -0
- package/dist/auth/controllers/tenant.member.controller.d.ts.map +1 -0
- package/dist/auth/controllers/tenant.member.controller.js +129 -0
- package/dist/auth/controllers/tenant.member.controller.js.map +1 -0
- package/dist/auth/controllers/user.invitation.controller.d.ts +12 -0
- package/dist/auth/controllers/user.invitation.controller.d.ts.map +1 -0
- package/dist/auth/controllers/user.invitation.controller.js +76 -0
- package/dist/auth/controllers/user.invitation.controller.js.map +1 -0
- package/dist/auth/controllers/user.organization.controller.d.ts +17 -0
- package/dist/auth/controllers/user.organization.controller.d.ts.map +1 -0
- package/dist/auth/controllers/user.organization.controller.js +88 -0
- package/dist/auth/controllers/user.organization.controller.js.map +1 -0
- package/dist/auth/dtos/invite.tenant.user.dto.d.ts +6 -0
- package/dist/auth/dtos/invite.tenant.user.dto.d.ts.map +1 -0
- package/dist/auth/dtos/invite.tenant.user.dto.js +45 -0
- package/dist/auth/dtos/invite.tenant.user.dto.js.map +1 -0
- package/dist/auth/dtos/member.roles.dto.d.ts +4 -0
- package/dist/auth/dtos/member.roles.dto.d.ts.map +1 -0
- package/dist/auth/dtos/member.roles.dto.js +28 -0
- package/dist/auth/dtos/member.roles.dto.js.map +1 -0
- package/dist/auth/dtos/switch.organization.dto.d.ts +5 -0
- package/dist/auth/dtos/switch.organization.dto.d.ts.map +1 -0
- package/dist/auth/dtos/switch.organization.dto.js +25 -0
- package/dist/auth/dtos/switch.organization.dto.js.map +1 -0
- package/dist/auth/dtos/tenant.invitation.list.dto.d.ts +5 -0
- package/dist/auth/dtos/tenant.invitation.list.dto.d.ts.map +1 -0
- package/dist/auth/dtos/tenant.invitation.list.dto.js +27 -0
- package/dist/auth/dtos/tenant.invitation.list.dto.js.map +1 -0
- package/dist/auth/dtos/tenant.member.list.dto.d.ts +5 -0
- package/dist/auth/dtos/tenant.member.list.dto.d.ts.map +1 -0
- package/dist/auth/dtos/tenant.member.list.dto.js +27 -0
- package/dist/auth/dtos/tenant.member.list.dto.js.map +1 -0
- package/dist/auth/entities/tenant.invitation.entity.d.ts +13 -0
- package/dist/auth/entities/tenant.invitation.entity.d.ts.map +1 -0
- package/dist/auth/entities/tenant.invitation.entity.js +52 -0
- package/dist/auth/entities/tenant.invitation.entity.js.map +1 -0
- package/dist/auth/entities/tenant.user.entity.d.ts +8 -0
- package/dist/auth/entities/tenant.user.entity.d.ts.map +1 -0
- package/dist/auth/entities/tenant.user.entity.js +35 -0
- package/dist/auth/entities/tenant.user.entity.js.map +1 -0
- package/dist/auth/entities/user.entity.d.ts +5 -0
- package/dist/auth/entities/user.entity.d.ts.map +1 -1
- package/dist/auth/entities/user.entity.js +17 -0
- package/dist/auth/entities/user.entity.js.map +1 -1
- package/dist/auth/entities/user.role.entity.d.ts +2 -2
- package/dist/auth/entities/user.role.entity.d.ts.map +1 -1
- package/dist/auth/entities/user.role.entity.js +2 -2
- package/dist/auth/entities/user.role.entity.js.map +1 -1
- package/dist/auth/enums/auth.default.enum.d.ts +3 -1
- package/dist/auth/enums/auth.default.enum.d.ts.map +1 -1
- package/dist/auth/enums/auth.default.enum.js +2 -0
- package/dist/auth/enums/auth.default.enum.js.map +1 -1
- package/dist/auth/enums/tenant.invitation.default.enum.d.ts +4 -0
- package/dist/auth/enums/tenant.invitation.default.enum.d.ts.map +1 -0
- package/dist/auth/enums/tenant.invitation.default.enum.js +8 -0
- package/dist/auth/enums/tenant.invitation.default.enum.js.map +1 -0
- package/dist/auth/enums/tenant.invitation.status.enum.d.ts +7 -0
- package/dist/auth/enums/tenant.invitation.status.enum.d.ts.map +1 -0
- package/dist/auth/enums/tenant.invitation.status.enum.js +11 -0
- package/dist/auth/enums/tenant.invitation.status.enum.js.map +1 -0
- package/dist/auth/enums/user.type.enum.d.ts.map +1 -1
- package/dist/auth/enums/user.type.enum.js.map +1 -1
- package/dist/auth/es6.classes.d.ts +15 -4
- package/dist/auth/es6.classes.d.ts.map +1 -1
- package/dist/auth/es6.classes.js +35 -2
- package/dist/auth/es6.classes.js.map +1 -1
- package/dist/auth/helpers/auth.d.ts +1 -1
- package/dist/auth/helpers/auth.d.ts.map +1 -1
- package/dist/auth/helpers/auth.js +7 -4
- package/dist/auth/helpers/auth.js.map +1 -1
- package/dist/auth/processors/change.password.data.processor.d.ts.map +1 -1
- package/dist/auth/processors/change.password.data.processor.js +1 -0
- package/dist/auth/processors/change.password.data.processor.js.map +1 -1
- package/dist/auth/processors/google.user.data.processor.js +1 -1
- package/dist/auth/processors/google.user.data.processor.js.map +1 -1
- package/dist/auth/processors/register.user.data.processor.js +1 -1
- package/dist/auth/processors/register.user.data.processor.js.map +1 -1
- package/dist/auth/processors/tenant.invitation.data.processor.d.ts +20 -0
- package/dist/auth/processors/tenant.invitation.data.processor.d.ts.map +1 -0
- package/dist/auth/processors/tenant.invitation.data.processor.js +112 -0
- package/dist/auth/processors/tenant.invitation.data.processor.js.map +1 -0
- package/dist/auth/processors/tenant.invitation.list.processor.d.ts +13 -0
- package/dist/auth/processors/tenant.invitation.list.processor.d.ts.map +1 -0
- package/dist/auth/processors/tenant.invitation.list.processor.js +67 -0
- package/dist/auth/processors/tenant.invitation.list.processor.js.map +1 -0
- package/dist/auth/processors/tenant.member.list.processor.d.ts +13 -0
- package/dist/auth/processors/tenant.member.list.processor.d.ts.map +1 -0
- package/dist/auth/processors/tenant.member.list.processor.js +66 -0
- package/dist/auth/processors/tenant.member.list.processor.js.map +1 -0
- package/dist/auth/services/admin.auth.service.d.ts.map +1 -1
- package/dist/auth/services/admin.auth.service.js +2 -2
- package/dist/auth/services/admin.auth.service.js.map +1 -1
- package/dist/auth/services/auth.service.d.ts +5 -0
- package/dist/auth/services/auth.service.d.ts.map +1 -1
- package/dist/auth/services/auth.service.js +51 -13
- package/dist/auth/services/auth.service.js.map +1 -1
- package/dist/auth/services/impersonation.service.d.ts +2 -2
- package/dist/auth/services/impersonation.service.d.ts.map +1 -1
- package/dist/auth/services/impersonation.service.js +1 -1
- package/dist/auth/services/impersonation.service.js.map +1 -1
- package/dist/auth/services/tenant.invitation.service.d.ts +26 -0
- package/dist/auth/services/tenant.invitation.service.d.ts.map +1 -0
- package/dist/auth/services/tenant.invitation.service.js +212 -0
- package/dist/auth/services/tenant.invitation.service.js.map +1 -0
- package/dist/auth/services/tenant.membership.service.d.ts +29 -0
- package/dist/auth/services/tenant.membership.service.d.ts.map +1 -0
- package/dist/auth/services/tenant.membership.service.js +178 -0
- package/dist/auth/services/tenant.membership.service.js.map +1 -0
- package/dist/auth/types/auth.types.d.ts +24 -2
- package/dist/auth/types/auth.types.d.ts.map +1 -1
- package/dist/auth/utilities/access.revocation.d.ts +2 -0
- package/dist/auth/utilities/access.revocation.d.ts.map +1 -1
- package/dist/auth/utilities/access.revocation.js +12 -0
- package/dist/auth/utilities/access.revocation.js.map +1 -1
- package/dist/auth/utilities/auth.utilities.d.ts +1 -0
- package/dist/auth/utilities/auth.utilities.d.ts.map +1 -1
- package/dist/auth/utilities/auth.utilities.js +4 -0
- package/dist/auth/utilities/auth.utilities.js.map +1 -1
- package/dist/auth/utilities/tenant.access.d.ts +8 -0
- package/dist/auth/utilities/tenant.access.d.ts.map +1 -0
- package/dist/auth/utilities/tenant.access.js +61 -0
- package/dist/auth/utilities/tenant.access.js.map +1 -0
- package/dist/common/es6.classes.d.ts +2 -2
- package/dist/constants/entity.constants.d.ts +2 -0
- package/dist/constants/entity.constants.d.ts.map +1 -1
- package/dist/constants/entity.constants.js +2 -0
- package/dist/constants/entity.constants.js.map +1 -1
- package/dist/constants/entity.maps.d.ts +4 -0
- package/dist/constants/entity.maps.d.ts.map +1 -1
- package/dist/constants/entity.maps.js +4 -0
- package/dist/constants/entity.maps.js.map +1 -1
- package/dist/constants/job.constants.d.ts +1 -0
- package/dist/constants/job.constants.d.ts.map +1 -1
- package/dist/constants/job.constants.js +1 -0
- package/dist/constants/job.constants.js.map +1 -1
- package/dist/index.d.ts +6 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +14 -3
- package/dist/index.js.map +1 -1
- package/dist/migrations/1749600000003.CreateSysUsersTable.d.ts.map +1 -1
- package/dist/migrations/1749600000003.CreateSysUsersTable.js +4 -0
- package/dist/migrations/1749600000003.CreateSysUsersTable.js.map +1 -1
- package/dist/migrations/1749600000006.CreateSysUserRolesJoinTable.d.ts.map +1 -1
- package/dist/migrations/1749600000006.CreateSysUserRolesJoinTable.js +8 -1
- package/dist/migrations/1749600000006.CreateSysUserRolesJoinTable.js.map +1 -1
- package/dist/migrations/1749600000030.CreateSysTenantUsersTable.d.ts +6 -0
- package/dist/migrations/1749600000030.CreateSysTenantUsersTable.d.ts.map +1 -0
- package/dist/migrations/1749600000030.CreateSysTenantUsersTable.js +33 -0
- package/dist/migrations/1749600000030.CreateSysTenantUsersTable.js.map +1 -0
- package/dist/migrations/1749600000031.CreateSysTenantInvitationsTable.d.ts +6 -0
- package/dist/migrations/1749600000031.CreateSysTenantInvitationsTable.d.ts.map +1 -0
- package/dist/migrations/1749600000031.CreateSysTenantInvitationsTable.js +43 -0
- package/dist/migrations/1749600000031.CreateSysTenantInvitationsTable.js.map +1 -0
- package/dist/notification/enums/email.notification.default.enum.d.ts +1 -0
- package/dist/notification/enums/email.notification.default.enum.d.ts.map +1 -1
- package/dist/notification/enums/email.notification.default.enum.js +1 -0
- package/dist/notification/enums/email.notification.default.enum.js.map +1 -1
- package/dist/notification/enums/email.template.identifier.enum.d.ts +2 -1
- package/dist/notification/enums/email.template.identifier.enum.d.ts.map +1 -1
- package/dist/notification/enums/email.template.identifier.enum.js +1 -0
- package/dist/notification/enums/email.template.identifier.enum.js.map +1 -1
- package/dist/notification/es6.classes.d.ts +2 -1
- package/dist/notification/es6.classes.d.ts.map +1 -1
- package/dist/notification/es6.classes.js +6 -1
- package/dist/notification/es6.classes.js.map +1 -1
- package/dist/notification/jobs/tenant.user.invited.mail.job.d.ts +14 -0
- package/dist/notification/jobs/tenant.user.invited.mail.job.d.ts.map +1 -0
- package/dist/notification/jobs/tenant.user.invited.mail.job.js +57 -0
- package/dist/notification/jobs/tenant.user.invited.mail.job.js.map +1 -0
- package/dist/notification/notification.module.d.ts.map +1 -1
- package/dist/notification/notification.module.js +3 -1
- package/dist/notification/notification.module.js.map +1 -1
- package/dist/notification/types/email.notification.types.d.ts +9 -0
- package/dist/notification/types/email.notification.types.d.ts.map +1 -1
- package/dist/tenant/middlewares/tenant.context.middleware.d.ts +2 -3
- package/dist/tenant/middlewares/tenant.context.middleware.d.ts.map +1 -1
- package/dist/tenant/middlewares/tenant.context.middleware.js +12 -23
- package/dist/tenant/middlewares/tenant.context.middleware.js.map +1 -1
- package/dist/tenant/services/tenant.service.d.ts +0 -2
- package/dist/tenant/services/tenant.service.d.ts.map +1 -1
- package/dist/tenant/services/tenant.service.js +0 -22
- package/dist/tenant/services/tenant.service.js.map +1 -1
- package/dist/tenant/types/tenant.types.d.ts +0 -5
- package/dist/tenant/types/tenant.types.d.ts.map +1 -1
- package/package.json +1 -1
- package/dist/tenant/enums/tenant.default.enum.d.ts +0 -4
- package/dist/tenant/enums/tenant.default.enum.d.ts.map +0 -1
- package/dist/tenant/enums/tenant.default.enum.js +0 -8
- package/dist/tenant/enums/tenant.default.enum.js.map +0 -1
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TenantMemberListProcessor = void 0;
|
|
4
|
+
const sort_direction_enum_1 = require("../../common/enums/sort.direction.enum");
|
|
5
|
+
const filter_value_type_enum_1 = require("../../common/enums/filter.value.type.enum");
|
|
6
|
+
const common_list_processor_1 = require("../../common/libraries/common.list.processor");
|
|
7
|
+
class TenantMemberListProcessor extends common_list_processor_1.CommonListProcessor {
|
|
8
|
+
constructor(listFilterService) {
|
|
9
|
+
super();
|
|
10
|
+
this.listFilterService = listFilterService;
|
|
11
|
+
this.config = {
|
|
12
|
+
query: `sys_tenant_users tu
|
|
13
|
+
join sys_users u on u.id = tu.user_id and u.deleted_at is null
|
|
14
|
+
left join lateral (
|
|
15
|
+
select coalesce(
|
|
16
|
+
json_agg(
|
|
17
|
+
json_build_object('id', ro.id, 'identifier', ro.identifier, 'name', ro.name)
|
|
18
|
+
order by ro.name
|
|
19
|
+
),
|
|
20
|
+
'[]'::json
|
|
21
|
+
) granted
|
|
22
|
+
from sys_user_roles ur
|
|
23
|
+
join sys_roles ro on ro.id = ur.role_id and ro.deleted_at is null
|
|
24
|
+
where ur.user_id = tu.user_id
|
|
25
|
+
and ur.tenant_id = tu.tenant_id
|
|
26
|
+
and ur.deleted_at is null
|
|
27
|
+
) rl on true`,
|
|
28
|
+
columns: [
|
|
29
|
+
{ key: 'u.id', identifier: 'user_id', type: filter_value_type_enum_1.FilterValueTypeEnum.UUID },
|
|
30
|
+
{ key: 'u.full_name', identifier: 'full_name', searchable: true },
|
|
31
|
+
{ key: 'u.email', identifier: 'email', searchable: true },
|
|
32
|
+
{
|
|
33
|
+
key: 'u.active',
|
|
34
|
+
identifier: 'active',
|
|
35
|
+
type: filter_value_type_enum_1.FilterValueTypeEnum.BOOLEAN,
|
|
36
|
+
},
|
|
37
|
+
{
|
|
38
|
+
key: 'tu.is_active',
|
|
39
|
+
identifier: 'membership_active',
|
|
40
|
+
type: filter_value_type_enum_1.FilterValueTypeEnum.BOOLEAN,
|
|
41
|
+
},
|
|
42
|
+
{
|
|
43
|
+
key: 'rl.granted',
|
|
44
|
+
identifier: 'roles',
|
|
45
|
+
type: filter_value_type_enum_1.FilterValueTypeEnum.JSON,
|
|
46
|
+
},
|
|
47
|
+
{
|
|
48
|
+
key: 'tu.created_at',
|
|
49
|
+
identifier: 'joined_at',
|
|
50
|
+
type: filter_value_type_enum_1.FilterValueTypeEnum.DATETIME,
|
|
51
|
+
},
|
|
52
|
+
],
|
|
53
|
+
predicates: ['tu.deleted_at is null'],
|
|
54
|
+
defaultSort: { field: 'full_name', direction: sort_direction_enum_1.SortDirection.ASC },
|
|
55
|
+
};
|
|
56
|
+
}
|
|
57
|
+
async process(payload) {
|
|
58
|
+
this.payload = payload;
|
|
59
|
+
return this.handle();
|
|
60
|
+
}
|
|
61
|
+
applyCustomPredicates() {
|
|
62
|
+
this.predicates.add('tu.tenant_id = :value', this.payload.tenant_id ?? null);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
exports.TenantMemberListProcessor = TenantMemberListProcessor;
|
|
66
|
+
//# sourceMappingURL=tenant.member.list.processor.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tenant.member.list.processor.js","sourceRoot":"","sources":["../../../src/auth/processors/tenant.member.list.processor.ts"],"names":[],"mappings":";;;AAAA,gFAAuE;AACvE,sFAAgF;AAChF,wFAAmF;AASnF,MAAa,yBAA0B,SAAQ,2CAAmB;IAiDhE,YAA+B,iBAAoC;QACjE,KAAK,EAAE,CAAC;QADqB,sBAAiB,GAAjB,iBAAiB,CAAmB;QA9CzD,WAAM,GAA2B;YACzC,KAAK,EAAE;;;;;;;;;;;;;;;mBAeQ;YACf,OAAO,EAAE;gBACP,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,IAAI,EAAE,4CAAmB,CAAC,IAAI,EAAE;gBACtE,EAAE,GAAG,EAAE,aAAa,EAAE,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,EAAE;gBACjE,EAAE,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE;gBACzD;oBACE,GAAG,EAAE,UAAU;oBACf,UAAU,EAAE,QAAQ;oBACpB,IAAI,EAAE,4CAAmB,CAAC,OAAO;iBAClC;gBACD;oBACE,GAAG,EAAE,cAAc;oBACnB,UAAU,EAAE,mBAAmB;oBAC/B,IAAI,EAAE,4CAAmB,CAAC,OAAO;iBAClC;gBACD;oBACE,GAAG,EAAE,YAAY;oBACjB,UAAU,EAAE,OAAO;oBACnB,IAAI,EAAE,4CAAmB,CAAC,IAAI;iBAC/B;gBACD;oBACE,GAAG,EAAE,eAAe;oBACpB,UAAU,EAAE,WAAW;oBACvB,IAAI,EAAE,4CAAmB,CAAC,QAAQ;iBACnC;aACF;YACD,UAAU,EAAE,CAAC,uBAAuB,CAAC;YACrC,WAAW,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,mCAAa,CAAC,GAAG,EAAE;SAClE,CAAC;IAIF,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAA4B;QACxC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;IAES,qBAAqB;QAC7B,IAAI,CAAC,UAAU,CAAC,GAAG,CACjB,uBAAuB,EACvB,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,IAAI,CAC/B,CAAC;IACJ,CAAC;CACF;AAhED,8DAgEC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin.auth.service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/admin.auth.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAkB,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,UAAU,EAAsB,MAAM,SAAS,CAAC;AAIzD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,EACL,wBAAwB,EACxB,aAAa,EACb,eAAe,EACf,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAI7B,qBACa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU;gBADV,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,UAAU;IASnC,YAAY,CAChB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,wBAAwB,CAAC;IA6B9B,mBAAmB,CACvB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,eAAe,CAAC;IAuBrB,WAAW,CACf,IAAI,EAAE,eAAe,EACrB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"admin.auth.service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/admin.auth.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAkB,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,UAAU,EAAsB,MAAM,SAAS,CAAC;AAIzD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,EACL,wBAAwB,EACxB,aAAa,EACb,eAAe,EACf,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAI7B,qBACa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU;gBADV,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,UAAU;IASnC,YAAY,CAChB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,wBAAwB,CAAC;IA6B9B,mBAAmB,CACvB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,eAAe,CAAC;IAuBrB,WAAW,CACf,IAAI,EAAE,eAAe,EACrB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,aAAa,CAAC;IAyDnB,OAAO,CACX,eAAe,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,aAAa,CAAC;IAiCnB,SAAS,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAajD,MAAM,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYpD,OAAO,CAAC,SAAS;IAIjB,OAAO,KAAK,gBAAgB,GAE3B;IAED,OAAO,KAAK,WAAW,GAEtB;CACF"}
|
|
@@ -67,7 +67,7 @@ let AdminAuthService = class AdminAuthService {
|
|
|
67
67
|
const jti = (0, crypto_1.randomUUID)();
|
|
68
68
|
const accessExpiry = process.env.ACCESS_TOKEN_EXPIRY;
|
|
69
69
|
const refreshExpiry = process.env.REFRESH_TOKEN_EXPIRY;
|
|
70
|
-
const sessionIdentifier = this.hashToken(`${
|
|
70
|
+
const sessionIdentifier = this.hashToken(`${(0, crypto_1.randomUUID)()}:${user.id}`);
|
|
71
71
|
const sessionExpiresAt = new Date(Date.now() + auth_utilities_1.AuthUtility.parseExpiryMs(accessExpiry));
|
|
72
72
|
await this.sessionRepo.save(this.sessionRepo.create({
|
|
73
73
|
user_id: user.id,
|
|
@@ -80,7 +80,7 @@ let AdminAuthService = class AdminAuthService {
|
|
|
80
80
|
secret: process.env.ACCESS_TOKEN_SECRET,
|
|
81
81
|
expiresIn: accessExpiry,
|
|
82
82
|
});
|
|
83
|
-
const refreshToken = await this.jwtService.signAsync({ sub: user.id, email: user.email }, {
|
|
83
|
+
const refreshToken = await this.jwtService.signAsync({ sub: user.id, email: user.email, jti: (0, crypto_1.randomUUID)() }, {
|
|
84
84
|
secret: process.env.REFRESH_TOKEN_SECRET,
|
|
85
85
|
expiresIn: refreshExpiry,
|
|
86
86
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin.auth.service.js","sourceRoot":"","sources":["../../../src/auth/services/admin.auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAmE;AACnE,qCAAyD;AACzD,qCAAyD;AACzD,mCAAgD;AAChD,yFAAmF;AACnF,uFAAiF;AACjF,qEAAgE;AAChE,6FAAsF;AACtF,+EAA2E;AAO3E,sDAAkD;AAClD,gEAA0D;AAGnD,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,YACmB,UAAsB,EACtB,UAAsB;QADtB,eAAU,GAAV,UAAU,CAAY;QACtB,eAAU,GAAV,UAAU,CAAY;IACtC,CAAC;IAQJ,KAAK,CAAC,YAAY,CAChB,cAAuB;QAEvB,MAAM,IAAI,GAAG,sBAAS,CAAC,SAAS,EAAiC,CAAC;QAClE,IAAI,CAAC,IAAI;YACP,MAAM,IAAI,kCAAe,CAAC,6CAA6C,CAAC,CAAC;QAE3E,MAAM,cAAc,GAAG,MAAM,yDAAyB,CAAC,IAAI,CAAC;YAC1D,KAAK,EAAE,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,EAAE;YACjC,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;SAC1B,CAAC,CAAC;QACH,MAAM,KAAK,GAAG,cAAc;aACzB,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC;aAC1C,MAAM,CAAC,CAAC,IAAI,EAAoC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAE9D,IACE,cAAc;YACd,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,KAAK,cAAc,CAAC,EACzD,CAAC;YACD,MAAM,IAAI,kCAAe,CACvB,6BAA6B,cAAc,SAAS,CACrD,CAAC;QACJ,CAAC;QAED,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IACzB,CAAC;IAMD,KAAK,CAAC,mBAAmB,CACvB,eAAuB,EACvB,QAAgB;QAEhB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU;aAC/B,aAAa,CAAC,mCAAe,CAAC;aAC9B,kBAAkB,CAAC,YAAY,CAAC;aAChC,SAAS,CAAC,qBAAqB,CAAC;aAChC,KAAK,CAAC,2DAA2D,EAAE;YAClE,KAAK,EAAE,eAAe;SACvB,CAAC;aACD,MAAM,EAAE,CAAC;QAEZ,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC5B,MAAM,4BAAW,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;YAChD,MAAM,IAAI,8BAAqB,CAAC,qBAAqB,CAAC,CAAC;QACzD,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,4BAAW,CAAC,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3E,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,8BAAqB,CAAC,qBAAqB,CAAC,CAAC;QACzD,CAAC;QAED,OAAQ,IAA8B,CAAC,QAAQ,CAAC;QAChD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,WAAW,CACf,IAAqB,EACrB,OAA2B;QAE3B,MAAM,GAAG,GAAG,IAAA,mBAAU,GAAE,CAAC;QACzB,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;QACrD,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"admin.auth.service.js","sourceRoot":"","sources":["../../../src/auth/services/admin.auth.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { JwtService } from '@nestjs/jwt';
|
|
2
2
|
import { DataSource } from 'typeorm';
|
|
3
3
|
import { UserEntity } from '../entities/user.entity';
|
|
4
|
+
import { SystemRoleEntity } from '../entities/system.role.entity';
|
|
4
5
|
import { CacheService } from '../../common/services/cache.service';
|
|
5
6
|
import { ScopeService } from './scope.service';
|
|
6
7
|
import { AuthenticatedAccess, AuthTokenPair, IssueTokensUser, TokenIssueContext } from '../types/auth.types';
|
|
@@ -11,6 +12,9 @@ export declare class AuthService {
|
|
|
11
12
|
private readonly scopeService;
|
|
12
13
|
constructor(jwtService: JwtService, cacheService: CacheService, dataSource: DataSource, scopeService: ScopeService);
|
|
13
14
|
validateRole(roleIdentifier?: string): Promise<AuthenticatedAccess>;
|
|
15
|
+
validateIdentity(): Promise<AuthenticatedAccess>;
|
|
16
|
+
private resolveAccess;
|
|
17
|
+
tenantRoles(userId: string, tenantId: string | null | undefined): Promise<SystemRoleEntity[]>;
|
|
14
18
|
private satisfiesRole;
|
|
15
19
|
private holdsGlobalAdmin;
|
|
16
20
|
private tierOf;
|
|
@@ -22,6 +26,7 @@ export declare class AuthService {
|
|
|
22
26
|
validateCredentials(email: string, password: string): Promise<UserEntity>;
|
|
23
27
|
issueTokens(user: IssueTokensUser, context?: TokenIssueContext): Promise<AuthTokenPair>;
|
|
24
28
|
refresh(rawRefreshToken: string, context?: TokenIssueContext): Promise<AuthTokenPair>;
|
|
29
|
+
private refreshedTenant;
|
|
25
30
|
revokeAllForUser(userUuid: string): Promise<void>;
|
|
26
31
|
revokeOne(rawRefreshToken: string): Promise<void>;
|
|
27
32
|
revokeAccessToken(jti: string, ttlSeconds: number): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/auth.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAkB,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,UAAU,EAAsB,MAAM,SAAS,CAAC;AAIzD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/auth.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAkB,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,UAAU,EAAsB,MAAM,SAAS,CAAC;AAIzD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAMlE,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,eAAe,EACf,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAI7B,qBACa,WAAW;IAEpB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAHZ,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,YAAY;IAiBvC,YAAY,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAcnE,gBAAgB,IAAI,OAAO,CAAC,mBAAmB,CAAC;YAIxC,aAAa;IA0BrB,WAAW,CACf,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAClC,OAAO,CAAC,gBAAgB,EAAE,CAAC;IA0B9B,OAAO,CAAC,aAAa;IAqBrB,OAAO,CAAC,gBAAgB;IAOxB,OAAO,CAAC,MAAM;IAad,OAAO,CAAC,QAAQ;IAShB,OAAO,CAAC,MAAM;IASd,OAAO,CAAC,uBAAuB;IAQ/B,iBAAiB,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAqBnC,cAAc,CAClB,eAAe,EAAE,MAAM,EACvB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,mBAAmB,CAAC;IA4BzB,mBAAmB,CACvB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,UAAU,CAAC;IAyBhB,WAAW,CACf,IAAI,EAAE,eAAe,EACrB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,aAAa,CAAC;IAmEnB,OAAO,CACX,eAAe,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,aAAa,CAAC;YA8CX,eAAe;IA+BvB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOjD,SAAS,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQjD,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjE,MAAM,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYpD,OAAO,CAAC,SAAS;IAIjB,OAAO,KAAK,gBAAgB,GAE3B;IAED,OAAO,KAAK,WAAW,GAEtB;CACF"}
|
|
@@ -18,6 +18,8 @@ const system_refresh_token_entity_1 = require("../entities/system.refresh.token.
|
|
|
18
18
|
const system_auth_session_entity_1 = require("../entities/system.auth.session.entity");
|
|
19
19
|
const user_entity_1 = require("../entities/user.entity");
|
|
20
20
|
const user_role_entity_1 = require("../entities/user.role.entity");
|
|
21
|
+
const tenant_user_entity_1 = require("../entities/tenant.user.entity");
|
|
22
|
+
const tenant_entity_1 = require("../../tenant/entities/tenant.entity");
|
|
21
23
|
const role_tier_enum_1 = require("../enums/role.tier.enum");
|
|
22
24
|
const tenant_role_enum_1 = require("../enums/tenant.role.enum");
|
|
23
25
|
const user_type_enum_1 = require("../enums/user.type.enum");
|
|
@@ -34,16 +36,19 @@ let AuthService = class AuthService {
|
|
|
34
36
|
this.scopeService = scopeService;
|
|
35
37
|
}
|
|
36
38
|
async validateRole(roleIdentifier) {
|
|
39
|
+
const access = await this.resolveAccess(roleIdentifier);
|
|
40
|
+
if (access.user.password_change_required)
|
|
41
|
+
throw new access_exception_1.AccessException('Change your one-time password before continuing.');
|
|
42
|
+
return access;
|
|
43
|
+
}
|
|
44
|
+
async validateIdentity() {
|
|
45
|
+
return this.resolveAccess();
|
|
46
|
+
}
|
|
47
|
+
async resolveAccess(roleIdentifier) {
|
|
37
48
|
const user = auth_1.Auth.user();
|
|
38
49
|
if (!user)
|
|
39
50
|
throw new access_exception_1.AccessException('Authentication required: no active session.');
|
|
40
|
-
const
|
|
41
|
-
where: { user_id: user.id },
|
|
42
|
-
relations: { role: true },
|
|
43
|
-
});
|
|
44
|
-
const roles = userRoles
|
|
45
|
-
.map((userRole) => userRole.role)
|
|
46
|
-
.filter((role) => !!role);
|
|
51
|
+
const roles = await this.tenantRoles(user.id, user.organization_id);
|
|
47
52
|
const holdsRole = !roleIdentifier || this.satisfiesRole(roleIdentifier, roles);
|
|
48
53
|
if (!holdsRole && !this.impersonationYieldsRole(user)) {
|
|
49
54
|
const requirement = this.tierOf(roleIdentifier)
|
|
@@ -53,6 +58,17 @@ let AuthService = class AuthService {
|
|
|
53
58
|
}
|
|
54
59
|
return { user, roles };
|
|
55
60
|
}
|
|
61
|
+
async tenantRoles(userId, tenantId) {
|
|
62
|
+
if (!tenantId)
|
|
63
|
+
return [];
|
|
64
|
+
const userRoles = await this.dataSource.getRepository(user_role_entity_1.UserRoleEntity).find({
|
|
65
|
+
where: { user_id: userId, tenant_id: tenantId },
|
|
66
|
+
relations: { role: true },
|
|
67
|
+
});
|
|
68
|
+
return userRoles
|
|
69
|
+
.map((userRole) => userRole.role)
|
|
70
|
+
.filter((role) => !!role);
|
|
71
|
+
}
|
|
56
72
|
satisfiesRole(required, roles) {
|
|
57
73
|
if (this.holdsGlobalAdmin(roles))
|
|
58
74
|
return true;
|
|
@@ -100,7 +116,7 @@ let AuthService = class AuthService {
|
|
|
100
116
|
if (!user)
|
|
101
117
|
throw new access_exception_1.AccessException('Authentication required: no active session.');
|
|
102
118
|
if (!user.organization_id)
|
|
103
|
-
throw new access_exception_1.AccessException('This
|
|
119
|
+
throw new access_exception_1.AccessException('This session is not working in an organization.');
|
|
104
120
|
const scopes = await this.scopeService.tenantScopes(user.organization_id);
|
|
105
121
|
if (!scopes.includes(scopeIdentifier))
|
|
106
122
|
throw new access_exception_1.AccessException('This feature is not enabled for your organization');
|
|
@@ -111,7 +127,7 @@ let AuthService = class AuthService {
|
|
|
111
127
|
.getRepository(user_entity_1.UserEntity)
|
|
112
128
|
.createQueryBuilder('user')
|
|
113
129
|
.addSelect('user.password')
|
|
114
|
-
.where('user.email = :email', { email })
|
|
130
|
+
.where('lower(user.email) = lower(:email)', { email })
|
|
115
131
|
.getOne();
|
|
116
132
|
if (!user || !user.password) {
|
|
117
133
|
await auth_utilities_1.AuthUtility.compareAgainstDummy(password);
|
|
@@ -131,8 +147,8 @@ let AuthService = class AuthService {
|
|
|
131
147
|
const jti = (0, crypto_1.randomUUID)();
|
|
132
148
|
const accessExpiry = process.env.ACCESS_TOKEN_EXPIRY;
|
|
133
149
|
const refreshExpiry = process.env.REFRESH_TOKEN_EXPIRY;
|
|
134
|
-
const tenantId = context?.
|
|
135
|
-
const sessionIdentifier = this.hashToken(`${
|
|
150
|
+
const tenantId = context?.tenant_id ?? null;
|
|
151
|
+
const sessionIdentifier = this.hashToken(`${(0, crypto_1.randomUUID)()}:${user.id}`);
|
|
136
152
|
const sessionExpiresAt = new Date(Date.now() + auth_utilities_1.AuthUtility.parseExpiryMs(accessExpiry));
|
|
137
153
|
await this.sessionRepo.save(this.sessionRepo.create({
|
|
138
154
|
user_id: user.id,
|
|
@@ -152,7 +168,7 @@ let AuthService = class AuthService {
|
|
|
152
168
|
secret: process.env.ACCESS_TOKEN_SECRET,
|
|
153
169
|
expiresIn: accessExpiry,
|
|
154
170
|
});
|
|
155
|
-
const refreshToken = await this.jwtService.signAsync({ sub: user.id, email: user.email }, {
|
|
171
|
+
const refreshToken = await this.jwtService.signAsync({ sub: user.id, email: user.email, jti: (0, crypto_1.randomUUID)() }, {
|
|
156
172
|
secret: process.env.REFRESH_TOKEN_SECRET,
|
|
157
173
|
expiresIn: refreshExpiry,
|
|
158
174
|
});
|
|
@@ -196,9 +212,31 @@ let AuthService = class AuthService {
|
|
|
196
212
|
await this.refreshTokenRepo.save(stored);
|
|
197
213
|
return this.issueTokens({ id: payload.sub, email: payload.email }, {
|
|
198
214
|
...context,
|
|
199
|
-
|
|
215
|
+
tenant_id: await this.refreshedTenant(payload.sub, stored.tenant_id),
|
|
200
216
|
});
|
|
201
217
|
}
|
|
218
|
+
async refreshedTenant(userId, tenantId) {
|
|
219
|
+
const user = await this.dataSource
|
|
220
|
+
.getRepository(user_entity_1.UserEntity)
|
|
221
|
+
.findOne({ where: { id: userId } });
|
|
222
|
+
if (!user?.active)
|
|
223
|
+
throw new common_1.UnauthorizedException('This account is no longer active');
|
|
224
|
+
if (!tenantId)
|
|
225
|
+
return undefined;
|
|
226
|
+
const tenantActive = await this.dataSource
|
|
227
|
+
.getRepository(tenant_entity_1.TenantEntity)
|
|
228
|
+
.existsBy({ id: tenantId, is_active: true });
|
|
229
|
+
if (user.user_type === user_type_enum_1.UserType.SYSTEM_USER) {
|
|
230
|
+
if (!tenantActive || !user.has_global_access)
|
|
231
|
+
throw new common_1.UnauthorizedException('This organization can no longer be accessed');
|
|
232
|
+
return tenantId;
|
|
233
|
+
}
|
|
234
|
+
const isMember = tenantActive &&
|
|
235
|
+
(await this.dataSource
|
|
236
|
+
.getRepository(tenant_user_entity_1.TenantUserEntity)
|
|
237
|
+
.existsBy({ user_id: userId, tenant_id: tenantId, is_active: true }));
|
|
238
|
+
return isMember ? tenantId : undefined;
|
|
239
|
+
}
|
|
202
240
|
async revokeAllForUser(userUuid) {
|
|
203
241
|
await this.refreshTokenRepo.update({ user_id: userUuid, revoked_at: (0, typeorm_1.IsNull)() }, { revoked_at: new Date() });
|
|
204
242
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../src/auth/services/auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAmE;AACnE,qCAAyD;AACzD,qCAAyD;AACzD,mCAAgD;AAChD,yFAAmF;AACnF,uFAAiF;AACjF,yDAAqD;AACrD,mEAA8D;AAE9D,4DAAmD;AACnD,gEAAuD;AACvD,4DAAmD;AACnD,uEAAmE;AACnE,mDAA+C;AAC/C,+EAA2E;AAO3E,0CAAuC;AACvC,gEAA0D;AAGnD,IAAM,WAAW,GAAjB,MAAM,WAAW;IACtB,YACmB,UAAsB,EACtB,YAA0B,EAC1B,UAAsB,EACtB,YAA0B;QAH1B,eAAU,GAAV,UAAU,CAAY;QACtB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,eAAU,GAAV,UAAU,CAAY;QACtB,iBAAY,GAAZ,YAAY,CAAc;IAC1C,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../src/auth/services/auth.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,14 +3,14 @@ import { AuditService } from '../../common/services/audit.service';
|
|
|
3
3
|
import { TenantEntity } from '../../tenant/entities/tenant.entity';
|
|
4
4
|
import { ImpersonationLoginDto } from '../dtos/impersonation.login.dto';
|
|
5
5
|
import { UserEntity } from '../entities/user.entity';
|
|
6
|
-
import {
|
|
6
|
+
import { OrganizationSession, TokenIssueContext } from '../types/auth.types';
|
|
7
7
|
import { AuthService } from './auth.service';
|
|
8
8
|
export declare class ImpersonationService {
|
|
9
9
|
private readonly authService;
|
|
10
10
|
private readonly auditService;
|
|
11
11
|
private readonly dataSource;
|
|
12
12
|
constructor(authService: AuthService, auditService: AuditService, dataSource: DataSource);
|
|
13
|
-
login(dto: ImpersonationLoginDto, context?: TokenIssueContext): Promise<
|
|
13
|
+
login(dto: ImpersonationLoginDto, context?: TokenIssueContext): Promise<OrganizationSession>;
|
|
14
14
|
accessibleTenants(): Promise<TenantEntity[]>;
|
|
15
15
|
assertGlobalAccess(user: UserEntity): void;
|
|
16
16
|
private requireTenant;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"impersonation.service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/impersonation.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAc,MAAM,SAAS,CAAC;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAEnE,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"impersonation.service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/impersonation.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAc,MAAM,SAAS,CAAC;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAEnE,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAS7C,qBACa,oBAAoB;IAE7B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAFV,WAAW,EAAE,WAAW,EACxB,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,UAAU;IAGnC,KAAK,CACT,GAAG,EAAE,qBAAqB,EAC1B,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,mBAAmB,CAAC;IA2BzB,iBAAiB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAclD,kBAAkB,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;YAW5B,aAAa;IAU3B,OAAO,KAAK,gBAAgB,GAE3B;IAED,OAAO,KAAK,cAAc,GAEzB;CACF"}
|
|
@@ -32,7 +32,7 @@ let ImpersonationService = class ImpersonationService {
|
|
|
32
32
|
const tenant = await this.requireTenant(dto.tenant_id);
|
|
33
33
|
const tokens = await this.authService.issueTokens(user, {
|
|
34
34
|
...context,
|
|
35
|
-
|
|
35
|
+
tenant_id: tenant.id,
|
|
36
36
|
});
|
|
37
37
|
await this.auditService.saveAuditLog({
|
|
38
38
|
sourceType: entity_constants_1.baseEntityConstants.user,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"impersonation.service.js","sourceRoot":"","sources":["../../../src/auth/services/impersonation.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAAiD;AACjD,4EAAmE;AACnE,uEAAmE;AACnE,+EAA2E;AAC3E,uEAAmE;AAEnE,yDAAqD;AACrD,4DAAmD;AAEnD,iDAA6C;AAC7C,uEAAuE;AAShE,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAC/B,YACmB,WAAwB,EACxB,YAA0B,EAC1B,UAAsB;QAFtB,gBAAW,GAAX,WAAW,CAAa;QACxB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,eAAU,GAAV,UAAU,CAAY;IACtC,CAAC;IAEJ,KAAK,CAAC,KAAK,CACT,GAA0B,EAC1B,OAA2B;QAE3B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,mBAAmB,CACrD,GAAG,CAAC,KAAK,EACT,GAAG,CAAC,QAAQ,CACb,CAAC;QACF,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAE9B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACvD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,EAAE;YACtD,GAAG,OAAO;YACV,
|
|
1
|
+
{"version":3,"file":"impersonation.service.js","sourceRoot":"","sources":["../../../src/auth/services/impersonation.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { DataSource } from 'typeorm';
|
|
2
|
+
import { SystemRoleEntity } from '../entities/system.role.entity';
|
|
3
|
+
import { TenantInvitationEntity } from '../entities/tenant.invitation.entity';
|
|
4
|
+
import { UserEntity } from '../entities/user.entity';
|
|
5
|
+
import { OrganizationSummary, PendingInvitation } from '../types/auth.types';
|
|
6
|
+
import { TenantUserInvitedMailJob } from '../../notification/jobs/tenant.user.invited.mail.job';
|
|
7
|
+
import { AuthService } from './auth.service';
|
|
8
|
+
export declare class TenantInvitationService {
|
|
9
|
+
private readonly authService;
|
|
10
|
+
private readonly dataSource;
|
|
11
|
+
private readonly invitedMailJob;
|
|
12
|
+
private readonly logger;
|
|
13
|
+
constructor(authService: AuthService, dataSource: DataSource, invitedMailJob: TenantUserInvitedMailJob);
|
|
14
|
+
pendingFor(user: UserEntity): Promise<PendingInvitation[]>;
|
|
15
|
+
accept(invitationId: string): Promise<OrganizationSummary>;
|
|
16
|
+
decline(invitationId: string): Promise<TenantInvitationEntity>;
|
|
17
|
+
revoke(invitationId: string, tenantId: string, actorId: string): Promise<TenantInvitationEntity>;
|
|
18
|
+
resend(invitationId: string, tenantId: string, actorId: string): Promise<TenantInvitationEntity>;
|
|
19
|
+
mailOneTimePassword(user: UserEntity, invitation: TenantInvitationEntity, oneTimePassword: string): Promise<void>;
|
|
20
|
+
static expiresAt(): Date;
|
|
21
|
+
grantableRoles(): Promise<SystemRoleEntity[]>;
|
|
22
|
+
private answerable;
|
|
23
|
+
private settle;
|
|
24
|
+
private get invitationRepository();
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=tenant.invitation.service.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tenant.invitation.service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/tenant.invitation.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAyC,MAAM,SAAS,CAAC;AAK5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAKrD,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7E,OAAO,EAAE,wBAAwB,EAAE,MAAM,sDAAsD,CAAC;AAEhG,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAU7C,qBACa,uBAAuB;IAIhC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,cAAc;IALjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4C;gBAGhD,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,wBAAwB;IAIrD,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IA8C1D,MAAM,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAwC1D,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAc9D,MAAM,CACV,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,sBAAsB,CAAC;IAuB5B,MAAM,CACV,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,sBAAsB,CAAC;IAgD5B,mBAAmB,CACvB,IAAI,EAAE,UAAU,EAChB,UAAU,EAAE,sBAAsB,EAClC,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC;IAqChB,MAAM,CAAC,SAAS,IAAI,IAAI;IAOlB,cAAc,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;YASrC,UAAU;YAwBV,MAAM;IAiBpB,OAAO,KAAK,oBAAoB,GAE/B;CACF"}
|
|
@@ -0,0 +1,212 @@
|
|
|
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 TenantInvitationService_1;
|
|
12
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
|
+
exports.TenantInvitationService = void 0;
|
|
14
|
+
const common_1 = require("@nestjs/common");
|
|
15
|
+
const typeorm_1 = require("typeorm");
|
|
16
|
+
const access_exception_1 = require("../../global/exceptions/access.exception");
|
|
17
|
+
const not_found_exception_1 = require("../../global/exceptions/not.found.exception");
|
|
18
|
+
const operation_exception_1 = require("../../global/exceptions/operation.exception");
|
|
19
|
+
const tenant_entity_1 = require("../../tenant/entities/tenant.entity");
|
|
20
|
+
const system_role_entity_1 = require("../entities/system.role.entity");
|
|
21
|
+
const tenant_invitation_entity_1 = require("../entities/tenant.invitation.entity");
|
|
22
|
+
const user_entity_1 = require("../entities/user.entity");
|
|
23
|
+
const tenant_invitation_status_enum_1 = require("../enums/tenant.invitation.status.enum");
|
|
24
|
+
const user_type_enum_1 = require("../enums/user.type.enum");
|
|
25
|
+
const tenant_invitation_default_enum_1 = require("../enums/tenant.invitation.default.enum");
|
|
26
|
+
const auth_utilities_1 = require("../utilities/auth.utilities");
|
|
27
|
+
const tenant_access_1 = require("../utilities/tenant.access");
|
|
28
|
+
const tenant_user_invited_mail_job_1 = require("../../notification/jobs/tenant.user.invited.mail.job");
|
|
29
|
+
const auth_service_1 = require("./auth.service");
|
|
30
|
+
let TenantInvitationService = TenantInvitationService_1 = class TenantInvitationService {
|
|
31
|
+
constructor(authService, dataSource, invitedMailJob) {
|
|
32
|
+
this.authService = authService;
|
|
33
|
+
this.dataSource = dataSource;
|
|
34
|
+
this.invitedMailJob = invitedMailJob;
|
|
35
|
+
this.logger = new common_1.Logger(TenantInvitationService_1.name);
|
|
36
|
+
}
|
|
37
|
+
async pendingFor(user) {
|
|
38
|
+
if (user.user_type === user_type_enum_1.UserType.SYSTEM_USER)
|
|
39
|
+
return [];
|
|
40
|
+
const invitations = await this.invitationRepository
|
|
41
|
+
.createQueryBuilder('i')
|
|
42
|
+
.innerJoinAndSelect('i.tenant', 't', 't.is_active = true and t.deleted_at is null')
|
|
43
|
+
.leftJoinAndSelect('i.creator', 'c')
|
|
44
|
+
.where('i.email = :email', { email: user.email.toLowerCase() })
|
|
45
|
+
.andWhere('i.status = :status', {
|
|
46
|
+
status: tenant_invitation_status_enum_1.TenantInvitationStatus.PENDING,
|
|
47
|
+
})
|
|
48
|
+
.andWhere('i.expires_at > now()')
|
|
49
|
+
.orderBy('i.created_at', 'DESC')
|
|
50
|
+
.getMany();
|
|
51
|
+
const roleIds = [...new Set(invitations.flatMap((i) => i.role_ids))];
|
|
52
|
+
const roles = roleIds.length
|
|
53
|
+
? await this.dataSource
|
|
54
|
+
.getRepository(system_role_entity_1.SystemRoleEntity)
|
|
55
|
+
.findBy({ id: (0, typeorm_1.In)(roleIds), is_active: true })
|
|
56
|
+
: [];
|
|
57
|
+
const roleById = new Map(roles.map((role) => [role.id, role]));
|
|
58
|
+
return invitations.map((invitation) => ({
|
|
59
|
+
id: invitation.id,
|
|
60
|
+
tenant_id: invitation.tenant_id,
|
|
61
|
+
tenant_name: invitation.tenant.name,
|
|
62
|
+
invited_by: invitation.creator?.full_name ?? null,
|
|
63
|
+
roles: invitation.role_ids
|
|
64
|
+
.map((roleId) => roleById.get(roleId))
|
|
65
|
+
.filter((role) => !!role)
|
|
66
|
+
.map(({ id, identifier, name }) => ({ id, identifier, name })),
|
|
67
|
+
expires_at: invitation.expires_at,
|
|
68
|
+
created_at: invitation.created_at,
|
|
69
|
+
}));
|
|
70
|
+
}
|
|
71
|
+
async accept(invitationId) {
|
|
72
|
+
const { user } = await this.authService.validateRole();
|
|
73
|
+
const invitation = await this.answerable(invitationId, user);
|
|
74
|
+
const tenant = await this.dataSource.getRepository(tenant_entity_1.TenantEntity).findOne({
|
|
75
|
+
where: { id: invitation.tenant_id, is_active: true },
|
|
76
|
+
select: { id: true, name: true, slug: true, logo_url: true },
|
|
77
|
+
});
|
|
78
|
+
if (!tenant)
|
|
79
|
+
throw new operation_exception_1.OperationException('This organization is no longer active.');
|
|
80
|
+
await this.dataSource.transaction(async (trx) => {
|
|
81
|
+
await this.settle(trx, invitation.id, tenant_invitation_status_enum_1.TenantInvitationStatus.ACCEPTED, user.id);
|
|
82
|
+
await tenant_access_1.TenantAccess.join(trx, user.id, tenant.id, invitation.role_ids, invitation.created_by);
|
|
83
|
+
await trx.update(user_entity_1.UserEntity, { id: user.id, organization_id: (0, typeorm_1.IsNull)() }, { organization_id: tenant.id });
|
|
84
|
+
});
|
|
85
|
+
return tenant;
|
|
86
|
+
}
|
|
87
|
+
async decline(invitationId) {
|
|
88
|
+
const { user } = await this.authService.validateRole();
|
|
89
|
+
const invitation = await this.answerable(invitationId, user);
|
|
90
|
+
await this.settle(this.dataSource.manager, invitation.id, tenant_invitation_status_enum_1.TenantInvitationStatus.DECLINED, user.id);
|
|
91
|
+
return this.invitationRepository.findOneByOrFail({ id: invitation.id });
|
|
92
|
+
}
|
|
93
|
+
async revoke(invitationId, tenantId, actorId) {
|
|
94
|
+
const exists = await this.invitationRepository.existsBy({
|
|
95
|
+
id: invitationId,
|
|
96
|
+
tenant_id: tenantId,
|
|
97
|
+
});
|
|
98
|
+
if (!exists)
|
|
99
|
+
throw new not_found_exception_1.NotFoundException('No invitation exists for this id');
|
|
100
|
+
const { affected } = await this.invitationRepository.update({
|
|
101
|
+
id: invitationId,
|
|
102
|
+
tenant_id: tenantId,
|
|
103
|
+
status: tenant_invitation_status_enum_1.TenantInvitationStatus.PENDING,
|
|
104
|
+
}, { status: tenant_invitation_status_enum_1.TenantInvitationStatus.REVOKED, updated_by: actorId });
|
|
105
|
+
if (affected !== 1)
|
|
106
|
+
throw new operation_exception_1.OperationException('Only a pending invitation can be revoked.');
|
|
107
|
+
return this.invitationRepository.findOneByOrFail({ id: invitationId });
|
|
108
|
+
}
|
|
109
|
+
async resend(invitationId, tenantId, actorId) {
|
|
110
|
+
const exists = await this.invitationRepository.existsBy({
|
|
111
|
+
id: invitationId,
|
|
112
|
+
tenant_id: tenantId,
|
|
113
|
+
});
|
|
114
|
+
if (!exists)
|
|
115
|
+
throw new not_found_exception_1.NotFoundException('No invitation exists for this id');
|
|
116
|
+
const { affected } = await this.invitationRepository.update({
|
|
117
|
+
id: invitationId,
|
|
118
|
+
tenant_id: tenantId,
|
|
119
|
+
status: tenant_invitation_status_enum_1.TenantInvitationStatus.PENDING,
|
|
120
|
+
}, { expires_at: TenantInvitationService_1.expiresAt(), updated_by: actorId });
|
|
121
|
+
if (affected !== 1)
|
|
122
|
+
throw new operation_exception_1.OperationException('Only a pending invitation can be resent.');
|
|
123
|
+
const invitation = await this.invitationRepository.findOneOrFail({
|
|
124
|
+
where: { id: invitationId },
|
|
125
|
+
relations: { tenant: true, creator: true },
|
|
126
|
+
});
|
|
127
|
+
const invitee = await this.dataSource.getRepository(user_entity_1.UserEntity).findOne({
|
|
128
|
+
where: { email: user_entity_1.UserEntity.emailMatching(invitation.email) },
|
|
129
|
+
});
|
|
130
|
+
if (invitee?.password_change_required) {
|
|
131
|
+
const oneTimePassword = auth_utilities_1.AuthUtility.generateOneTimePassword();
|
|
132
|
+
await this.dataSource
|
|
133
|
+
.getRepository(user_entity_1.UserEntity)
|
|
134
|
+
.update({ id: invitee.id }, { password: await auth_utilities_1.AuthUtility.hashPassword(oneTimePassword) });
|
|
135
|
+
await this.mailOneTimePassword(invitee, invitation, oneTimePassword);
|
|
136
|
+
}
|
|
137
|
+
return invitation;
|
|
138
|
+
}
|
|
139
|
+
async mailOneTimePassword(user, invitation, oneTimePassword) {
|
|
140
|
+
const [tenant, inviter, roles] = await Promise.all([
|
|
141
|
+
invitation.tenant ??
|
|
142
|
+
this.dataSource
|
|
143
|
+
.getRepository(tenant_entity_1.TenantEntity)
|
|
144
|
+
.findOneBy({ id: invitation.tenant_id }),
|
|
145
|
+
invitation.creator ??
|
|
146
|
+
(invitation.created_by
|
|
147
|
+
? this.dataSource
|
|
148
|
+
.getRepository(user_entity_1.UserEntity)
|
|
149
|
+
.findOneBy({ id: invitation.created_by })
|
|
150
|
+
: null),
|
|
151
|
+
this.dataSource
|
|
152
|
+
.getRepository(system_role_entity_1.SystemRoleEntity)
|
|
153
|
+
.findBy({ id: (0, typeorm_1.In)(invitation.role_ids) }),
|
|
154
|
+
]);
|
|
155
|
+
const data = {
|
|
156
|
+
user_name: user.full_name,
|
|
157
|
+
user_email: user.email,
|
|
158
|
+
tenant_name: tenant?.name ?? '',
|
|
159
|
+
invited_by: inviter?.full_name ?? '',
|
|
160
|
+
roles: roles.map((role) => role.name).join(', '),
|
|
161
|
+
one_time_password: oneTimePassword,
|
|
162
|
+
expires_on: invitation.expires_at.toISOString(),
|
|
163
|
+
};
|
|
164
|
+
try {
|
|
165
|
+
await this.invitedMailJob.dispatch(data);
|
|
166
|
+
}
|
|
167
|
+
catch (error) {
|
|
168
|
+
this.logger.warn(`Failed to queue the invitation email for ${user.email}: ${error.message}`);
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
static expiresAt() {
|
|
172
|
+
const expiry = process.env.TENANT_INVITATION_EXPIRY || tenant_invitation_default_enum_1.TenantInvitationDefault.EXPIRY;
|
|
173
|
+
return new Date(Date.now() + auth_utilities_1.AuthUtility.parseExpiryMs(expiry));
|
|
174
|
+
}
|
|
175
|
+
async grantableRoles() {
|
|
176
|
+
return this.dataSource.getRepository(system_role_entity_1.SystemRoleEntity).find({
|
|
177
|
+
where: { is_active: true },
|
|
178
|
+
select: { id: true, identifier: true, name: true, description: true },
|
|
179
|
+
order: { name: 'ASC' },
|
|
180
|
+
});
|
|
181
|
+
}
|
|
182
|
+
async answerable(invitationId, user) {
|
|
183
|
+
if (user.user_type === user_type_enum_1.UserType.SYSTEM_USER)
|
|
184
|
+
throw new access_exception_1.AccessException('This account cannot join an organization.');
|
|
185
|
+
const invitation = await this.invitationRepository.findOne({
|
|
186
|
+
where: { id: invitationId, email: user.email.toLowerCase() },
|
|
187
|
+
});
|
|
188
|
+
if (!invitation)
|
|
189
|
+
throw new not_found_exception_1.NotFoundException('No invitation exists for this id');
|
|
190
|
+
if (invitation.status !== tenant_invitation_status_enum_1.TenantInvitationStatus.PENDING)
|
|
191
|
+
throw new operation_exception_1.OperationException('This invitation has already been answered.');
|
|
192
|
+
if (invitation.expires_at.getTime() <= Date.now())
|
|
193
|
+
throw new operation_exception_1.OperationException('This invitation has expired.');
|
|
194
|
+
return invitation;
|
|
195
|
+
}
|
|
196
|
+
async settle(manager, invitationId, status, userId) {
|
|
197
|
+
const { affected } = await manager.update(tenant_invitation_entity_1.TenantInvitationEntity, { id: invitationId, status: tenant_invitation_status_enum_1.TenantInvitationStatus.PENDING }, { status, user_id: userId, responded_at: new Date(), updated_by: userId });
|
|
198
|
+
if (affected !== 1)
|
|
199
|
+
throw new operation_exception_1.OperationException('This invitation has already been answered.');
|
|
200
|
+
}
|
|
201
|
+
get invitationRepository() {
|
|
202
|
+
return this.dataSource.getRepository(tenant_invitation_entity_1.TenantInvitationEntity);
|
|
203
|
+
}
|
|
204
|
+
};
|
|
205
|
+
exports.TenantInvitationService = TenantInvitationService;
|
|
206
|
+
exports.TenantInvitationService = TenantInvitationService = TenantInvitationService_1 = __decorate([
|
|
207
|
+
(0, common_1.Injectable)(),
|
|
208
|
+
__metadata("design:paramtypes", [auth_service_1.AuthService,
|
|
209
|
+
typeorm_1.DataSource,
|
|
210
|
+
tenant_user_invited_mail_job_1.TenantUserInvitedMailJob])
|
|
211
|
+
], TenantInvitationService);
|
|
212
|
+
//# sourceMappingURL=tenant.invitation.service.js.map
|