@neohm/nestend 4.0.1 → 4.1.0
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 +61 -12
- package/dist/admin/controllers/admin.api.key.controller.d.ts +3 -1
- package/dist/admin/controllers/admin.api.key.controller.d.ts.map +1 -1
- package/dist/admin/controllers/admin.api.key.controller.js +6 -3
- package/dist/admin/controllers/admin.api.key.controller.js.map +1 -1
- package/dist/admin/controllers/admin.scope.controller.d.ts +2 -0
- package/dist/admin/controllers/admin.scope.controller.d.ts.map +1 -1
- package/dist/admin/controllers/admin.scope.controller.js +45 -5
- package/dist/admin/controllers/admin.scope.controller.js.map +1 -1
- 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/dtos/add.scope.dto.d.ts +1 -0
- package/dist/admin/dtos/add.scope.dto.d.ts.map +1 -1
- package/dist/admin/dtos/add.scope.dto.js +9 -0
- package/dist/admin/dtos/add.scope.dto.js.map +1 -1
- package/dist/admin/dtos/scope.list.dto.d.ts +1 -0
- package/dist/admin/dtos/scope.list.dto.d.ts.map +1 -1
- package/dist/admin/dtos/scope.list.dto.js +22 -0
- package/dist/admin/dtos/scope.list.dto.js.map +1 -1
- package/dist/admin/es6.classes.d.ts +5 -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/api.key.data.processor.d.ts +3 -1
- package/dist/admin/libraries/api.key.data.processor.d.ts.map +1 -1
- package/dist/admin/libraries/api.key.data.processor.js +3 -6
- package/dist/admin/libraries/api.key.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 +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/scope.data.processor.d.ts +1 -0
- package/dist/admin/libraries/scope.data.processor.d.ts.map +1 -1
- package/dist/admin/libraries/scope.data.processor.js +20 -0
- package/dist/admin/libraries/scope.data.processor.js.map +1 -1
- package/dist/admin/libraries/scope.list.processor.d.ts +2 -0
- package/dist/admin/libraries/scope.list.processor.d.ts.map +1 -1
- package/dist/admin/libraries/scope.list.processor.js +23 -1
- package/dist/admin/libraries/scope.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 +28 -5
- 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/scope.entity.d.ts +2 -0
- package/dist/auth/entities/scope.entity.d.ts.map +1 -1
- package/dist/auth/entities/scope.entity.js +9 -0
- package/dist/auth/entities/scope.entity.js.map +1 -1
- 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/api.key.service.d.ts +3 -1
- package/dist/auth/services/api.key.service.d.ts.map +1 -1
- package/dist/auth/services/api.key.service.js +6 -3
- package/dist/auth/services/api.key.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/scope.service.d.ts +6 -0
- package/dist/auth/services/scope.service.d.ts.map +1 -1
- package/dist/auth/services/scope.service.js +40 -9
- package/dist/auth/services/scope.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/1749600000025.CreateSysScopesTable.d.ts.map +1 -1
- package/dist/migrations/1749600000025.CreateSysScopesTable.js +7 -0
- package/dist/migrations/1749600000025.CreateSysScopesTable.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/package.json +1 -1
|
@@ -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
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tenant.invitation.service.js","sourceRoot":"","sources":["../../../src/auth/services/tenant.invitation.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import { DataSource } from 'typeorm';
|
|
2
|
+
import { DeleteResult } from '../../common/types/common.response.types';
|
|
3
|
+
import { RefreshTokenDto } from '../dtos/refresh.token.dto';
|
|
4
|
+
import { SwitchOrganizationDto } from '../dtos/switch.organization.dto';
|
|
5
|
+
import { SystemRoleEntity } from '../entities/system.role.entity';
|
|
6
|
+
import { TenantUserEntity } from '../entities/tenant.user.entity';
|
|
7
|
+
import { UserEntity } from '../entities/user.entity';
|
|
8
|
+
import { AuthTokenPair, OrganizationSession, OrganizationSummary, TokenIssueContext } from '../types/auth.types';
|
|
9
|
+
import { AuthService } from './auth.service';
|
|
10
|
+
export declare class TenantMembershipService {
|
|
11
|
+
private readonly authService;
|
|
12
|
+
private readonly dataSource;
|
|
13
|
+
constructor(authService: AuthService, dataSource: DataSource);
|
|
14
|
+
organizationsOf(userId: string): Promise<OrganizationSummary[]>;
|
|
15
|
+
sessionOrganization(user: UserEntity): Promise<OrganizationSummary | null>;
|
|
16
|
+
landingTenant(user: UserEntity): Promise<string | undefined>;
|
|
17
|
+
switchOrganization(dto: SwitchOrganizationDto, context?: TokenIssueContext): Promise<OrganizationSession>;
|
|
18
|
+
leave(tenantId: string, dto: RefreshTokenDto, context?: TokenIssueContext): Promise<AuthTokenPair>;
|
|
19
|
+
setMemberRoles(userId: string, tenantId: string, roleIds: string[], actorId?: string, guardAdmin?: boolean): Promise<SystemRoleEntity[]>;
|
|
20
|
+
removeMember(userId: string, tenantId: string, actorId: string, guardAdmin?: boolean): Promise<DeleteResult>;
|
|
21
|
+
private assertLiveRoles;
|
|
22
|
+
setMemberActive(userId: string, tenantId: string, active: boolean, actorId?: string, guardAdmin?: boolean): Promise<TenantUserEntity>;
|
|
23
|
+
private requireMembership;
|
|
24
|
+
private assertAdminRemains;
|
|
25
|
+
private assertTenantUser;
|
|
26
|
+
private get tenantRepository();
|
|
27
|
+
private get userRepository();
|
|
28
|
+
}
|
|
29
|
+
//# sourceMappingURL=tenant.membership.service.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tenant.membership.service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/tenant.membership.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAkB,MAAM,SAAS,CAAC;AAIrD,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAExE,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAIrD,OAAO,EACL,aAAa,EACb,mBAAmB,EACnB,mBAAmB,EACnB,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAO7C,qBACa,uBAAuB;IAEhC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU;gBADV,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU;IAInC,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAmB/D,mBAAmB,CACvB,IAAI,EAAE,UAAU,GACf,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC;IAahC,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAe5D,kBAAkB,CACtB,GAAG,EAAE,qBAAqB,EAC1B,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,mBAAmB,CAAC;IA6BzB,KAAK,CACT,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,eAAe,EACpB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,aAAa,CAAC;IAsBnB,cAAc,CAClB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,UAAO,GAChB,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAexB,YAAY,CAChB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,UAAU,UAAO,GAChB,OAAO,CAAC,YAAY,CAAC;YAWV,eAAe;IAyBvB,eAAe,CACnB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,OAAO,EACf,OAAO,CAAC,EAAE,MAAM,EAChB,UAAU,UAAO,GAChB,OAAO,CAAC,gBAAgB,CAAC;YAiBd,iBAAiB;YAiBjB,kBAAkB;IAiChC,OAAO,CAAC,gBAAgB;IAOxB,OAAO,KAAK,gBAAgB,GAE3B;IAED,OAAO,KAAK,cAAc,GAEzB;CACF"}
|
|
@@ -0,0 +1,178 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.TenantMembershipService = void 0;
|
|
13
|
+
const common_1 = require("@nestjs/common");
|
|
14
|
+
const typeorm_1 = require("typeorm");
|
|
15
|
+
const access_exception_1 = require("../../global/exceptions/access.exception");
|
|
16
|
+
const not_found_exception_1 = require("../../global/exceptions/not.found.exception");
|
|
17
|
+
const operation_exception_1 = require("../../global/exceptions/operation.exception");
|
|
18
|
+
const tenant_entity_1 = require("../../tenant/entities/tenant.entity");
|
|
19
|
+
const system_role_entity_1 = require("../entities/system.role.entity");
|
|
20
|
+
const tenant_user_entity_1 = require("../entities/tenant.user.entity");
|
|
21
|
+
const user_entity_1 = require("../entities/user.entity");
|
|
22
|
+
const user_role_entity_1 = require("../entities/user.role.entity");
|
|
23
|
+
const tenant_role_enum_1 = require("../enums/tenant.role.enum");
|
|
24
|
+
const user_type_enum_1 = require("../enums/user.type.enum");
|
|
25
|
+
const access_revocation_1 = require("../utilities/access.revocation");
|
|
26
|
+
const tenant_access_1 = require("../utilities/tenant.access");
|
|
27
|
+
const auth_service_1 = require("./auth.service");
|
|
28
|
+
let TenantMembershipService = class TenantMembershipService {
|
|
29
|
+
constructor(authService, dataSource) {
|
|
30
|
+
this.authService = authService;
|
|
31
|
+
this.dataSource = dataSource;
|
|
32
|
+
}
|
|
33
|
+
async organizationsOf(userId) {
|
|
34
|
+
return this.tenantRepository
|
|
35
|
+
.createQueryBuilder('t')
|
|
36
|
+
.select(['t.id', 't.name', 't.slug', 't.logo_url'])
|
|
37
|
+
.innerJoin(tenant_user_entity_1.TenantUserEntity, 'tu', 'tu.tenant_id = t.id and tu.deleted_at is null and tu.is_active = true')
|
|
38
|
+
.where('tu.user_id = :userId', { userId })
|
|
39
|
+
.andWhere('t.is_active = true')
|
|
40
|
+
.orderBy('t.name', 'ASC')
|
|
41
|
+
.getMany();
|
|
42
|
+
}
|
|
43
|
+
async sessionOrganization(user) {
|
|
44
|
+
if (!user.organization_id)
|
|
45
|
+
return null;
|
|
46
|
+
return this.tenantRepository.findOne({
|
|
47
|
+
where: { id: user.organization_id },
|
|
48
|
+
select: { id: true, name: true, slug: true, logo_url: true },
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
async landingTenant(user) {
|
|
52
|
+
if (user.user_type === user_type_enum_1.UserType.SYSTEM_USER)
|
|
53
|
+
return undefined;
|
|
54
|
+
const organizations = await this.organizationsOf(user.id);
|
|
55
|
+
const remembered = organizations.find((tenant) => tenant.id === user.organization_id);
|
|
56
|
+
return (remembered ?? organizations[0])?.id;
|
|
57
|
+
}
|
|
58
|
+
async switchOrganization(dto, context) {
|
|
59
|
+
const { user } = await this.authService.validateRole();
|
|
60
|
+
this.assertTenantUser(user);
|
|
61
|
+
const organizations = await this.organizationsOf(user.id);
|
|
62
|
+
const tenant = organizations.find((organization) => organization.id === dto.tenant_id);
|
|
63
|
+
if (!tenant)
|
|
64
|
+
throw new access_exception_1.AccessException('You are not a member of this organization.');
|
|
65
|
+
await this.authService.logout(dto.refresh_token);
|
|
66
|
+
await this.userRepository.update({ id: user.id }, { organization_id: tenant.id });
|
|
67
|
+
const tokens = await this.authService.issueTokens(user, {
|
|
68
|
+
...context,
|
|
69
|
+
tenant_id: tenant.id,
|
|
70
|
+
});
|
|
71
|
+
return { ...tokens, tenant_id: tenant.id, tenant_name: tenant.name };
|
|
72
|
+
}
|
|
73
|
+
async leave(tenantId, dto, context) {
|
|
74
|
+
const { user } = await this.authService.validateRole();
|
|
75
|
+
this.assertTenantUser(user);
|
|
76
|
+
await this.requireMembership(user.id, tenantId);
|
|
77
|
+
await this.assertAdminRemains(tenantId, user.id);
|
|
78
|
+
await this.dataSource.transaction((trx) => tenant_access_1.TenantAccess.remove(trx, user.id, tenantId));
|
|
79
|
+
await this.authService.logout(dto.refresh_token);
|
|
80
|
+
const row = await this.userRepository.findOneByOrFail({ id: user.id });
|
|
81
|
+
return this.authService.issueTokens(row, {
|
|
82
|
+
...context,
|
|
83
|
+
tenant_id: await this.landingTenant(row),
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
async setMemberRoles(userId, tenantId, roleIds, actorId, guardAdmin = true) {
|
|
87
|
+
await this.requireMembership(userId, tenantId);
|
|
88
|
+
await this.assertLiveRoles(roleIds);
|
|
89
|
+
if (guardAdmin)
|
|
90
|
+
await this.assertAdminRemains(tenantId, userId, roleIds);
|
|
91
|
+
await this.dataSource.transaction((trx) => tenant_access_1.TenantAccess.reconcileRoles(trx, userId, tenantId, roleIds, actorId));
|
|
92
|
+
return this.authService.tenantRoles(userId, tenantId);
|
|
93
|
+
}
|
|
94
|
+
async removeMember(userId, tenantId, actorId, guardAdmin = true) {
|
|
95
|
+
const membership = await this.requireMembership(userId, tenantId);
|
|
96
|
+
if (guardAdmin)
|
|
97
|
+
await this.assertAdminRemains(tenantId, userId);
|
|
98
|
+
await this.dataSource.transaction((trx) => tenant_access_1.TenantAccess.remove(trx, userId, tenantId));
|
|
99
|
+
return { id: membership.id, deleted: true, deleted_by: actorId };
|
|
100
|
+
}
|
|
101
|
+
async assertLiveRoles(roleIds) {
|
|
102
|
+
const unique = [...new Set(roleIds)];
|
|
103
|
+
if (!unique.length)
|
|
104
|
+
return;
|
|
105
|
+
const found = await this.dataSource
|
|
106
|
+
.getRepository(system_role_entity_1.SystemRoleEntity)
|
|
107
|
+
.findBy({ id: (0, typeorm_1.In)(unique), is_active: true });
|
|
108
|
+
const foundIds = new Set(found.map((role) => role.id));
|
|
109
|
+
const missing = unique.filter((roleId) => !foundIds.has(roleId));
|
|
110
|
+
if (missing.length)
|
|
111
|
+
throw new common_1.BadRequestException({
|
|
112
|
+
message: 'Validation failed',
|
|
113
|
+
errors: {
|
|
114
|
+
role_ids: missing.map((roleId) => `Role '${roleId}' not found or inactive`),
|
|
115
|
+
},
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
async setMemberActive(userId, tenantId, active, actorId, guardAdmin = true) {
|
|
119
|
+
const membership = await this.requireMembership(userId, tenantId);
|
|
120
|
+
if (!active && guardAdmin)
|
|
121
|
+
await this.assertAdminRemains(tenantId, userId);
|
|
122
|
+
await this.dataSource.transaction(async (trx) => {
|
|
123
|
+
await trx.update(tenant_user_entity_1.TenantUserEntity, { id: membership.id }, { is_active: active, ...(actorId ? { updated_by: actorId } : {}) });
|
|
124
|
+
if (!active)
|
|
125
|
+
await access_revocation_1.AccessRevocation.revokeTenant(trx, userId, tenantId);
|
|
126
|
+
});
|
|
127
|
+
return this.dataSource
|
|
128
|
+
.getRepository(tenant_user_entity_1.TenantUserEntity)
|
|
129
|
+
.findOneByOrFail({ id: membership.id });
|
|
130
|
+
}
|
|
131
|
+
async requireMembership(userId, tenantId) {
|
|
132
|
+
const membership = await this.dataSource
|
|
133
|
+
.getRepository(tenant_user_entity_1.TenantUserEntity)
|
|
134
|
+
.findOne({ where: { user_id: userId, tenant_id: tenantId } });
|
|
135
|
+
if (!membership)
|
|
136
|
+
throw new not_found_exception_1.NotFoundException('No such member of this organization');
|
|
137
|
+
return membership;
|
|
138
|
+
}
|
|
139
|
+
async assertAdminRemains(tenantId, userId, nextRoleIds) {
|
|
140
|
+
const adminRole = await this.dataSource
|
|
141
|
+
.getRepository(system_role_entity_1.SystemRoleEntity)
|
|
142
|
+
.findOne({ where: { identifier: tenant_role_enum_1.TenantRole.GLOBAL_ADMIN } });
|
|
143
|
+
if (!adminRole)
|
|
144
|
+
return;
|
|
145
|
+
if (nextRoleIds?.includes(adminRole.id))
|
|
146
|
+
return;
|
|
147
|
+
const admins = await this.dataSource
|
|
148
|
+
.getRepository(user_role_entity_1.UserRoleEntity)
|
|
149
|
+
.createQueryBuilder('ur')
|
|
150
|
+
.innerJoin(tenant_user_entity_1.TenantUserEntity, 'tu', 'tu.user_id = ur.user_id and tu.tenant_id = ur.tenant_id and tu.deleted_at is null and tu.is_active = true')
|
|
151
|
+
.innerJoin(user_entity_1.UserEntity, 'u', 'u.id = ur.user_id and u.deleted_at is null')
|
|
152
|
+
.select('ur.user_id', 'user_id')
|
|
153
|
+
.where('ur.tenant_id = :tenantId', { tenantId })
|
|
154
|
+
.andWhere('ur.role_id = :roleId', { roleId: adminRole.id })
|
|
155
|
+
.distinct(true)
|
|
156
|
+
.getRawMany();
|
|
157
|
+
const isAdmin = admins.some((admin) => admin.user_id === userId);
|
|
158
|
+
if (isAdmin && admins.length === 1)
|
|
159
|
+
throw new operation_exception_1.OperationException('The organization needs at least one global.admin.');
|
|
160
|
+
}
|
|
161
|
+
assertTenantUser(user) {
|
|
162
|
+
if (user.user_type === user_type_enum_1.UserType.SYSTEM_USER)
|
|
163
|
+
throw new access_exception_1.AccessException('A global-access account changes organization through the impersonation login.');
|
|
164
|
+
}
|
|
165
|
+
get tenantRepository() {
|
|
166
|
+
return this.dataSource.getRepository(tenant_entity_1.TenantEntity);
|
|
167
|
+
}
|
|
168
|
+
get userRepository() {
|
|
169
|
+
return this.dataSource.getRepository(user_entity_1.UserEntity);
|
|
170
|
+
}
|
|
171
|
+
};
|
|
172
|
+
exports.TenantMembershipService = TenantMembershipService;
|
|
173
|
+
exports.TenantMembershipService = TenantMembershipService = __decorate([
|
|
174
|
+
(0, common_1.Injectable)(),
|
|
175
|
+
__metadata("design:paramtypes", [auth_service_1.AuthService,
|
|
176
|
+
typeorm_1.DataSource])
|
|
177
|
+
], TenantMembershipService);
|
|
178
|
+
//# sourceMappingURL=tenant.membership.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tenant.membership.service.js","sourceRoot":"","sources":["../../../src/auth/services/tenant.membership.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import type { UserEntity } from '../entities/user.entity';
|
|
|
2
2
|
import type { SystemRoleEntity } from '../entities/system.role.entity';
|
|
3
3
|
import type { AdminUserEntity } from '../entities/admin.user.entity';
|
|
4
4
|
import type { SystemAdminRoleEntity } from '../entities/system.admin.role.entity';
|
|
5
|
+
import type { TenantEntity } from '../../tenant/entities/tenant.entity';
|
|
5
6
|
export interface RequestUser {
|
|
6
7
|
userId: string;
|
|
7
8
|
email: string;
|
|
@@ -42,12 +43,33 @@ export interface IssueTokensUser {
|
|
|
42
43
|
export interface TokenIssueContext {
|
|
43
44
|
ip_address?: string;
|
|
44
45
|
user_agent?: string;
|
|
45
|
-
|
|
46
|
+
tenant_id?: string;
|
|
46
47
|
}
|
|
47
|
-
export interface
|
|
48
|
+
export interface OrganizationSession extends AuthTokenPair {
|
|
48
49
|
tenant_id: string;
|
|
49
50
|
tenant_name: string;
|
|
50
51
|
}
|
|
52
|
+
export type OrganizationSummary = Pick<TenantEntity, 'id' | 'name' | 'slug' | 'logo_url'>;
|
|
53
|
+
export interface PendingInvitation {
|
|
54
|
+
id: string;
|
|
55
|
+
tenant_id: string;
|
|
56
|
+
tenant_name: string;
|
|
57
|
+
invited_by: string | null;
|
|
58
|
+
roles: {
|
|
59
|
+
id: string;
|
|
60
|
+
identifier: string;
|
|
61
|
+
name: string;
|
|
62
|
+
}[];
|
|
63
|
+
expires_at: Date;
|
|
64
|
+
created_at: Date;
|
|
65
|
+
}
|
|
66
|
+
export interface CurrentUserProfile {
|
|
67
|
+
user: UserEntity;
|
|
68
|
+
roles: SystemRoleEntity[];
|
|
69
|
+
organization: string | null;
|
|
70
|
+
organizations: OrganizationSummary[];
|
|
71
|
+
invitations: PendingInvitation[];
|
|
72
|
+
}
|
|
51
73
|
export interface AuthModuleOptions {
|
|
52
74
|
dataSourceName?: string;
|
|
53
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.types.d.ts","sourceRoot":"","sources":["../../../src/auth/types/auth.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.types.d.ts","sourceRoot":"","sources":["../../../src/auth/types/auth.types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { EntityManager } from 'typeorm';
|
|
2
2
|
export declare class AccessRevocation {
|
|
3
3
|
static revokeAll(manager: EntityManager, userId: string, isAdmin: boolean): Promise<void>;
|
|
4
|
+
static revokeOrganization(manager: EntityManager, tenantId: string): Promise<void>;
|
|
5
|
+
static revokeTenant(manager: EntityManager, userId: string, tenantId: string): Promise<void>;
|
|
4
6
|
}
|
|
5
7
|
//# sourceMappingURL=access.revocation.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access.revocation.d.ts","sourceRoot":"","sources":["../../../src/auth/utilities/access.revocation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAU,MAAM,SAAS,CAAC;AAgBhD,qBAAa,gBAAgB;WACd,SAAS,CACpB,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"access.revocation.d.ts","sourceRoot":"","sources":["../../../src/auth/utilities/access.revocation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAU,MAAM,SAAS,CAAC;AAgBhD,qBAAa,gBAAgB;WACd,SAAS,CACpB,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,IAAI,CAAC;WAiBH,kBAAkB,CAC7B,OAAO,EAAE,aAAa,EACtB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;WAkBH,YAAY,CACvB,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;CAgBjB"}
|
|
@@ -10,6 +10,18 @@ class AccessRevocation {
|
|
|
10
10
|
await manager.update(system_auth_session_entity_1.SystemAuthSessionEntity, { user_id: userId, is_admin: isAdmin, invalidated_at: (0, typeorm_1.IsNull)() }, { invalidated_at: now });
|
|
11
11
|
await manager.update(system_refresh_token_entity_1.SystemRefreshTokenEntity, { user_id: userId, is_admin: isAdmin, revoked_at: (0, typeorm_1.IsNull)() }, { revoked_at: now });
|
|
12
12
|
}
|
|
13
|
+
static async revokeOrganization(manager, tenantId) {
|
|
14
|
+
const now = new Date();
|
|
15
|
+
const where = { is_admin: false, tenant_id: tenantId };
|
|
16
|
+
await manager.update(system_auth_session_entity_1.SystemAuthSessionEntity, { ...where, invalidated_at: (0, typeorm_1.IsNull)() }, { invalidated_at: now });
|
|
17
|
+
await manager.update(system_refresh_token_entity_1.SystemRefreshTokenEntity, { ...where, revoked_at: (0, typeorm_1.IsNull)() }, { revoked_at: now });
|
|
18
|
+
}
|
|
19
|
+
static async revokeTenant(manager, userId, tenantId) {
|
|
20
|
+
const now = new Date();
|
|
21
|
+
const where = { user_id: userId, is_admin: false, tenant_id: tenantId };
|
|
22
|
+
await manager.update(system_auth_session_entity_1.SystemAuthSessionEntity, { ...where, invalidated_at: (0, typeorm_1.IsNull)() }, { invalidated_at: now });
|
|
23
|
+
await manager.update(system_refresh_token_entity_1.SystemRefreshTokenEntity, { ...where, revoked_at: (0, typeorm_1.IsNull)() }, { revoked_at: now });
|
|
24
|
+
}
|
|
13
25
|
}
|
|
14
26
|
exports.AccessRevocation = AccessRevocation;
|
|
15
27
|
//# sourceMappingURL=access.revocation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access.revocation.js","sourceRoot":"","sources":["../../../src/auth/utilities/access.revocation.ts"],"names":[],"mappings":";;;AAAA,qCAAgD;AAChD,uFAAiF;AACjF,yFAAmF;AAcnF,MAAa,gBAAgB;IAC3B,MAAM,CAAC,KAAK,CAAC,SAAS,CACpB,OAAsB,EACtB,MAAc,EACd,OAAgB;QAEhB,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QAEvB,MAAM,OAAO,CAAC,MAAM,CAClB,oDAAuB,EACvB,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE,IAAA,gBAAM,GAAE,EAAE,EAChE,EAAE,cAAc,EAAE,GAAG,EAAE,CACxB,CAAC;QAEF,MAAM,OAAO,CAAC,MAAM,CAClB,sDAAwB,EACxB,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,IAAA,gBAAM,GAAE,EAAE,EAC5D,EAAE,UAAU,EAAE,GAAG,EAAE,CACpB,CAAC;IACJ,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"access.revocation.js","sourceRoot":"","sources":["../../../src/auth/utilities/access.revocation.ts"],"names":[],"mappings":";;;AAAA,qCAAgD;AAChD,uFAAiF;AACjF,yFAAmF;AAcnF,MAAa,gBAAgB;IAC3B,MAAM,CAAC,KAAK,CAAC,SAAS,CACpB,OAAsB,EACtB,MAAc,EACd,OAAgB;QAEhB,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QAEvB,MAAM,OAAO,CAAC,MAAM,CAClB,oDAAuB,EACvB,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE,IAAA,gBAAM,GAAE,EAAE,EAChE,EAAE,cAAc,EAAE,GAAG,EAAE,CACxB,CAAC;QAEF,MAAM,OAAO,CAAC,MAAM,CAClB,sDAAwB,EACxB,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,IAAA,gBAAM,GAAE,EAAE,EAC5D,EAAE,UAAU,EAAE,GAAG,EAAE,CACpB,CAAC;IACJ,CAAC;IAGD,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAC7B,OAAsB,EACtB,QAAgB;QAEhB,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC;QAEvD,MAAM,OAAO,CAAC,MAAM,CAClB,oDAAuB,EACvB,EAAE,GAAG,KAAK,EAAE,cAAc,EAAE,IAAA,gBAAM,GAAE,EAAE,EACtC,EAAE,cAAc,EAAE,GAAG,EAAE,CACxB,CAAC;QAEF,MAAM,OAAO,CAAC,MAAM,CAClB,sDAAwB,EACxB,EAAE,GAAG,KAAK,EAAE,UAAU,EAAE,IAAA,gBAAM,GAAE,EAAE,EAClC,EAAE,UAAU,EAAE,GAAG,EAAE,CACpB,CAAC;IACJ,CAAC;IAGD,MAAM,CAAC,KAAK,CAAC,YAAY,CACvB,OAAsB,EACtB,MAAc,EACd,QAAgB;QAEhB,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC;QAExE,MAAM,OAAO,CAAC,MAAM,CAClB,oDAAuB,EACvB,EAAE,GAAG,KAAK,EAAE,cAAc,EAAE,IAAA,gBAAM,GAAE,EAAE,EACtC,EAAE,cAAc,EAAE,GAAG,EAAE,CACxB,CAAC;QAEF,MAAM,OAAO,CAAC,MAAM,CAClB,sDAAwB,EACxB,EAAE,GAAG,KAAK,EAAE,UAAU,EAAE,IAAA,gBAAM,GAAE,EAAE,EAClC,EAAE,UAAU,EAAE,GAAG,EAAE,CACpB,CAAC;IACJ,CAAC;CACF;AA/DD,4CA+DC"}
|
|
@@ -3,6 +3,7 @@ export declare class AuthUtility {
|
|
|
3
3
|
static hashPassword(plain: string): Promise<string>;
|
|
4
4
|
static comparePassword(plain: string, hashed: string): Promise<boolean>;
|
|
5
5
|
static compareAgainstDummy(plain: string): Promise<false>;
|
|
6
|
+
static generateOneTimePassword(): string;
|
|
6
7
|
static parseExpiryMs(expiry: string): number;
|
|
7
8
|
}
|
|
8
9
|
//# sourceMappingURL=auth.utilities.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.utilities.d.ts","sourceRoot":"","sources":["../../../src/auth/utilities/auth.utilities.ts"],"names":[],"mappings":"AAIA,qBAAa,WAAW;IAMtB,OAAO,CAAC,MAAM,CAAC,SAAS,CAAgC;IAGxD,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAKnD,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;WAW1D,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.utilities.d.ts","sourceRoot":"","sources":["../../../src/auth/utilities/auth.utilities.ts"],"names":[],"mappings":"AAIA,qBAAa,WAAW;IAMtB,OAAO,CAAC,MAAM,CAAC,SAAS,CAAgC;IAGxD,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAKnD,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;WAW1D,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;IAO/D,MAAM,CAAC,uBAAuB,IAAI,MAAM;IAQxC,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;CAqB7C"}
|
|
@@ -16,6 +16,10 @@ class AuthUtility {
|
|
|
16
16
|
await (0, bcrypt_1.compare)(plain, await AuthUtility.dummyHash);
|
|
17
17
|
return false;
|
|
18
18
|
}
|
|
19
|
+
static generateOneTimePassword() {
|
|
20
|
+
const alphabet = String(auth_default_enum_1.AuthDefault.ONE_TIME_PASSWORD_ALPHABET);
|
|
21
|
+
return Array.from({ length: Number(auth_default_enum_1.AuthDefault.ONE_TIME_PASSWORD_LENGTH) }, () => alphabet[(0, crypto_1.randomInt)(alphabet.length)]).join('');
|
|
22
|
+
}
|
|
19
23
|
static parseExpiryMs(expiry) {
|
|
20
24
|
const unit = expiry.slice(-1);
|
|
21
25
|
const value = parseInt(expiry.slice(0, -1), 10);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.utilities.js","sourceRoot":"","sources":["../../../src/auth/utilities/auth.utilities.ts"],"names":[],"mappings":";;;AAAA,mCAAuC;AACvC,
|
|
1
|
+
{"version":3,"file":"auth.utilities.js","sourceRoot":"","sources":["../../../src/auth/utilities/auth.utilities.ts"],"names":[],"mappings":";;;AAAA,mCAAuC;AACvC,mCAA+C;AAC/C,kEAAyD;AAEzD,MAAa,WAAW;IAStB,MAAM,CAAC,YAAY,CAAC,KAAa;QAC/B,OAAO,IAAA,aAAI,EAAC,KAAK,EAAE,+BAAW,CAAC,kBAAkB,CAAC,CAAC;IACrD,CAAC;IAGD,MAAM,CAAC,eAAe,CAAC,KAAa,EAAE,MAAc;QAClD,OAAO,IAAA,gBAAO,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAChC,CAAC;IASD,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,KAAa;QAC5C,WAAW,CAAC,SAAS,KAAK,WAAW,CAAC,YAAY,CAAC,IAAA,mBAAU,GAAE,CAAC,CAAC;QACjE,MAAM,IAAA,gBAAO,EAAC,KAAK,EAAE,MAAM,WAAW,CAAC,SAAS,CAAC,CAAC;QAClD,OAAO,KAAK,CAAC;IACf,CAAC;IAGD,MAAM,CAAC,uBAAuB;QAC5B,MAAM,QAAQ,GAAG,MAAM,CAAC,+BAAW,CAAC,0BAA0B,CAAC,CAAC;QAChE,OAAO,KAAK,CAAC,IAAI,CACf,EAAE,MAAM,EAAE,MAAM,CAAC,+BAAW,CAAC,wBAAwB,CAAC,EAAE,EACxD,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAA,kBAAS,EAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAC3C,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACb,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,MAAc;QACjC,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9B,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAEhD,IAAI,KAAK,CAAC,KAAK,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,iCAAiC,MAAM,GAAG,CAAC,CAAC;QAC9D,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,GAAG;gBACN,OAAO,KAAK,GAAG,IAAI,CAAC;YACtB,KAAK,GAAG;gBACN,OAAO,KAAK,GAAG,EAAE,GAAG,IAAI,CAAC;YAC3B,KAAK,GAAG;gBACN,OAAO,KAAK,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;YAChC,KAAK,GAAG;gBACN,OAAO,KAAK,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;YACrC;gBACE,MAAM,IAAI,KAAK,CACb,wBAAwB,IAAI,SAAS,MAAM,uBAAuB,CACnE,CAAC;QACN,CAAC;IACH,CAAC;;AA5DH,kCA6DC;AAvDgB,qBAAS,GAA2B,IAAI,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { EntityManager } from 'typeorm';
|
|
2
|
+
export declare class TenantAccess {
|
|
3
|
+
static join(manager: EntityManager, userId: string, tenantId: string, roleIds: string[], actorId?: string): Promise<void>;
|
|
4
|
+
static reconcileRoles(manager: EntityManager, userId: string, tenantId: string, roleIds: string[], actorId?: string): Promise<void>;
|
|
5
|
+
static remove(manager: EntityManager, userId: string, tenantId: string): Promise<void>;
|
|
6
|
+
private static liveRoleIds;
|
|
7
|
+
}
|
|
8
|
+
//# sourceMappingURL=tenant.access.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tenant.access.d.ts","sourceRoot":"","sources":["../../../src/auth/utilities/tenant.access.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAM,MAAM,SAAS,CAAC;AAa5C,qBAAa,YAAY;WAEV,IAAI,CACf,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;WA6BH,cAAc,CACzB,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;WA8BH,MAAM,CACjB,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC;mBAQK,WAAW;CAajC"}
|