@ackplus/nest-auth 2.0.0-beta.9 → 2.0.2
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 +83 -130
- package/dist/index.d.ts +2 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -2
- package/dist/index.js.map +1 -1
- package/dist/lib/admin-console/admin-console.module.js +1 -1
- package/dist/lib/admin-console/admin-console.module.js.map +1 -1
- package/dist/lib/admin-console/controllers/admin-auth.controller.d.ts +3 -3
- package/dist/lib/admin-console/controllers/admin-auth.controller.d.ts.map +1 -1
- package/dist/lib/admin-console/controllers/admin-auth.controller.js +30 -12
- package/dist/lib/admin-console/controllers/admin-auth.controller.js.map +1 -1
- package/dist/lib/admin-console/controllers/admin-console.controller.d.ts +1 -1
- package/dist/lib/admin-console/controllers/admin-console.controller.d.ts.map +1 -1
- package/dist/lib/admin-console/controllers/admin-console.controller.js +19 -9
- package/dist/lib/admin-console/controllers/admin-console.controller.js.map +1 -1
- package/dist/lib/admin-console/controllers/admin-permissions.controller.d.ts.map +1 -1
- package/dist/lib/admin-console/controllers/admin-permissions.controller.js +19 -1
- package/dist/lib/admin-console/controllers/admin-permissions.controller.js.map +1 -1
- package/dist/lib/admin-console/controllers/admin-roles.controller.d.ts.map +1 -1
- package/dist/lib/admin-console/controllers/admin-roles.controller.js +15 -1
- package/dist/lib/admin-console/controllers/admin-roles.controller.js.map +1 -1
- package/dist/lib/admin-console/controllers/admin-tenants.controller.d.ts.map +1 -1
- package/dist/lib/admin-console/controllers/admin-tenants.controller.js +15 -1
- package/dist/lib/admin-console/controllers/admin-tenants.controller.js.map +1 -1
- package/dist/lib/admin-console/controllers/admin-users.controller.d.ts +13 -17
- package/dist/lib/admin-console/controllers/admin-users.controller.d.ts.map +1 -1
- package/dist/lib/admin-console/controllers/admin-users.controller.js +35 -13
- package/dist/lib/admin-console/controllers/admin-users.controller.js.map +1 -1
- package/dist/lib/admin-console/dto/admin-user.dto.d.ts +4 -2
- package/dist/lib/admin-console/dto/admin-user.dto.d.ts.map +1 -1
- package/dist/lib/admin-console/dto/admin-user.dto.js +16 -8
- package/dist/lib/admin-console/dto/admin-user.dto.js.map +1 -1
- package/dist/lib/admin-console/services/admin-console-config.service.d.ts.map +1 -1
- package/dist/lib/admin-console/services/admin-console-config.service.js +10 -4
- package/dist/lib/admin-console/services/admin-console-config.service.js.map +1 -1
- package/dist/lib/admin-console/services/admin-user-management.service.d.ts +1 -1
- package/dist/lib/admin-console/services/admin-user-management.service.d.ts.map +1 -1
- package/dist/lib/admin-console/services/admin-user-management.service.js +1 -1
- package/dist/lib/admin-console/services/admin-user-management.service.js.map +1 -1
- package/dist/lib/admin-console/static/index.html +632 -567
- package/dist/lib/admin-console/static/nest-auth.json +3502 -157
- package/dist/lib/audit/services/audit.service.d.ts +2 -0
- package/dist/lib/audit/services/audit.service.d.ts.map +1 -1
- package/dist/lib/audit/services/audit.service.js +23 -0
- package/dist/lib/audit/services/audit.service.js.map +1 -1
- package/dist/lib/auth/auth.module.d.ts.map +1 -1
- package/dist/lib/auth/auth.module.js +6 -0
- package/dist/lib/auth/auth.module.js.map +1 -1
- package/dist/lib/auth/controllers/auth.controller.d.ts +3 -2
- package/dist/lib/auth/controllers/auth.controller.d.ts.map +1 -1
- package/dist/lib/auth/controllers/auth.controller.js +48 -24
- package/dist/lib/auth/controllers/auth.controller.js.map +1 -1
- package/dist/lib/auth/controllers/mfa.controller.d.ts.map +1 -1
- package/dist/lib/auth/controllers/mfa.controller.js +6 -1
- package/dist/lib/auth/controllers/mfa.controller.js.map +1 -1
- package/dist/lib/auth/dto/credentials/social-credentials.dto.d.ts +2 -0
- package/dist/lib/auth/dto/credentials/social-credentials.dto.d.ts.map +1 -1
- package/dist/lib/auth/dto/credentials/social-credentials.dto.js +28 -0
- package/dist/lib/auth/dto/credentials/social-credentials.dto.js.map +1 -1
- package/dist/lib/auth/dto/requests/verify-2fa.request.dto.d.ts.map +1 -1
- package/dist/lib/auth/dto/requests/verify-2fa.request.dto.js +2 -0
- package/dist/lib/auth/dto/requests/verify-2fa.request.dto.js.map +1 -1
- package/dist/lib/auth/dto/responses/auth.response.dto.d.ts +3 -5
- package/dist/lib/auth/dto/responses/auth.response.dto.d.ts.map +1 -1
- package/dist/lib/auth/dto/responses/auth.response.dto.js +11 -27
- package/dist/lib/auth/dto/responses/auth.response.dto.js.map +1 -1
- package/dist/lib/auth/entities/otp.entity.d.ts +1 -1
- package/dist/lib/auth/entities/otp.entity.d.ts.map +1 -1
- package/dist/lib/auth/entities/otp.entity.js.map +1 -1
- package/dist/lib/auth/entities/trusted-device.entity.d.ts.map +1 -1
- package/dist/lib/auth/entities/trusted-device.entity.js +1 -1
- package/dist/lib/auth/entities/trusted-device.entity.js.map +1 -1
- package/dist/lib/auth/events/login-failed.event.d.ts +15 -0
- package/dist/lib/auth/events/login-failed.event.d.ts.map +1 -0
- package/dist/lib/auth/events/login-failed.event.js +11 -0
- package/dist/lib/auth/events/login-failed.event.js.map +1 -0
- package/dist/lib/auth/events/user-logged-in.event.d.ts +3 -1
- package/dist/lib/auth/events/user-logged-in.event.d.ts.map +1 -1
- package/dist/lib/auth/events/user-logged-in.event.js.map +1 -1
- package/dist/lib/auth/events/user-registered.event.d.ts +2 -1
- package/dist/lib/auth/events/user-registered.event.d.ts.map +1 -1
- package/dist/lib/auth/events/user-registered.event.js.map +1 -1
- package/dist/lib/auth/guards/auth.guard.d.ts.map +1 -1
- package/dist/lib/auth/guards/auth.guard.js +1 -1
- package/dist/lib/auth/guards/auth.guard.js.map +1 -1
- package/dist/lib/auth/index.d.ts +1 -0
- package/dist/lib/auth/index.d.ts.map +1 -1
- package/dist/lib/auth/index.js +1 -0
- package/dist/lib/auth/index.js.map +1 -1
- package/dist/lib/auth/interceptors/token-response.interceptor.d.ts.map +1 -1
- package/dist/lib/auth/interceptors/token-response.interceptor.js +4 -3
- package/dist/lib/auth/interceptors/token-response.interceptor.js.map +1 -1
- package/dist/lib/auth/services/auth.service.d.ts +17 -6
- package/dist/lib/auth/services/auth.service.d.ts.map +1 -1
- package/dist/lib/auth/services/auth.service.js +271 -287
- package/dist/lib/auth/services/auth.service.js.map +1 -1
- package/dist/lib/auth/services/logout.service.d.ts +14 -0
- package/dist/lib/auth/services/logout.service.d.ts.map +1 -0
- package/dist/lib/auth/services/logout.service.js +74 -0
- package/dist/lib/auth/services/logout.service.js.map +1 -0
- package/dist/lib/auth/services/mfa.service.d.ts +2 -0
- package/dist/lib/auth/services/mfa.service.d.ts.map +1 -1
- package/dist/lib/auth/services/mfa.service.js +29 -6
- package/dist/lib/auth/services/mfa.service.js.map +1 -1
- package/dist/lib/auth/services/otp-flow.service.d.ts.map +1 -1
- package/dist/lib/auth/services/otp-flow.service.js +1 -2
- package/dist/lib/auth/services/otp-flow.service.js.map +1 -1
- package/dist/lib/auth/services/password.service.d.ts +2 -1
- package/dist/lib/auth/services/password.service.d.ts.map +1 -1
- package/dist/lib/auth/services/password.service.js +19 -6
- package/dist/lib/auth/services/password.service.js.map +1 -1
- package/dist/lib/auth/services/session-token.service.d.ts +37 -0
- package/dist/lib/auth/services/session-token.service.d.ts.map +1 -0
- package/dist/lib/auth/services/session-token.service.js +151 -0
- package/dist/lib/auth/services/session-token.service.js.map +1 -0
- package/dist/lib/auth/services/verification.service.d.ts.map +1 -1
- package/dist/lib/auth/services/verification.service.js +0 -5
- package/dist/lib/auth/services/verification.service.js.map +1 -1
- package/dist/lib/auth.constants.d.ts +15 -0
- package/dist/lib/auth.constants.d.ts.map +1 -1
- package/dist/lib/auth.constants.js +11 -0
- package/dist/lib/auth.constants.js.map +1 -1
- package/dist/lib/core/decorators/current-user.decorator.d.ts +3 -0
- package/dist/lib/core/decorators/current-user.decorator.d.ts.map +1 -0
- package/dist/lib/core/decorators/current-user.decorator.js +13 -0
- package/dist/lib/core/decorators/current-user.decorator.js.map +1 -0
- package/dist/lib/core/entities.d.ts +5 -3
- package/dist/lib/core/entities.d.ts.map +1 -1
- package/dist/lib/core/entities.js +5 -2
- package/dist/lib/core/entities.js.map +1 -1
- package/dist/lib/core/index.d.ts +3 -0
- package/dist/lib/core/index.d.ts.map +1 -1
- package/dist/lib/core/index.js +3 -0
- package/dist/lib/core/index.js.map +1 -1
- package/dist/lib/core/interfaces/auth-module-options.interface.d.ts +28 -5
- package/dist/lib/core/interfaces/auth-module-options.interface.d.ts.map +1 -1
- package/dist/lib/core/interfaces/session-options.interface.d.ts +5 -1
- package/dist/lib/core/interfaces/session-options.interface.d.ts.map +1 -1
- package/dist/lib/core/interfaces/session-options.interface.js +1 -0
- package/dist/lib/core/interfaces/session-options.interface.js.map +1 -1
- package/dist/lib/core/interfaces/token-payload.interface.d.ts +3 -1
- package/dist/lib/core/interfaces/token-payload.interface.d.ts.map +1 -1
- package/dist/lib/core/providers/apple-auth.provider.d.ts +13 -7
- package/dist/lib/core/providers/apple-auth.provider.d.ts.map +1 -1
- package/dist/lib/core/providers/apple-auth.provider.js +166 -7
- package/dist/lib/core/providers/apple-auth.provider.js.map +1 -1
- package/dist/lib/core/providers/base-auth.provider.d.ts +2 -0
- package/dist/lib/core/providers/base-auth.provider.d.ts.map +1 -1
- package/dist/lib/core/providers/base-auth.provider.js.map +1 -1
- package/dist/lib/core/providers/email-auth.provider.d.ts.map +1 -1
- package/dist/lib/core/providers/email-auth.provider.js +13 -2
- package/dist/lib/core/providers/email-auth.provider.js.map +1 -1
- package/dist/lib/core/providers/github-auth.provider.d.ts +3 -0
- package/dist/lib/core/providers/github-auth.provider.d.ts.map +1 -1
- package/dist/lib/core/providers/github-auth.provider.js +73 -24
- package/dist/lib/core/providers/github-auth.provider.js.map +1 -1
- package/dist/lib/core/providers/google-auth.provider.d.ts +1 -0
- package/dist/lib/core/providers/google-auth.provider.d.ts.map +1 -1
- package/dist/lib/core/providers/google-auth.provider.js +7 -1
- package/dist/lib/core/providers/google-auth.provider.js.map +1 -1
- package/dist/lib/core/providers/jwt-auth.provider.d.ts +2 -1
- package/dist/lib/core/providers/jwt-auth.provider.d.ts.map +1 -1
- package/dist/lib/core/providers/passwordless-auth.provider.d.ts +3 -1
- package/dist/lib/core/providers/passwordless-auth.provider.d.ts.map +1 -1
- package/dist/lib/core/providers/passwordless-auth.provider.js +11 -1
- package/dist/lib/core/providers/passwordless-auth.provider.js.map +1 -1
- package/dist/lib/core/providers/phone-auth.provider.d.ts.map +1 -1
- package/dist/lib/core/providers/phone-auth.provider.js +13 -2
- package/dist/lib/core/providers/phone-auth.provider.js.map +1 -1
- package/dist/lib/core/services/auth-config.service.d.ts.map +1 -1
- package/dist/lib/core/services/auth-config.service.js +6 -0
- package/dist/lib/core/services/auth-config.service.js.map +1 -1
- package/dist/lib/core/services/jwt.service.d.ts.map +1 -1
- package/dist/lib/core/services/jwt.service.js +10 -5
- package/dist/lib/core/services/jwt.service.js.map +1 -1
- package/dist/lib/core/swagger/api-responses.decorator.d.ts +15 -0
- package/dist/lib/core/swagger/api-responses.decorator.d.ts.map +1 -0
- package/dist/lib/core/swagger/api-responses.decorator.js +57 -0
- package/dist/lib/core/swagger/api-responses.decorator.js.map +1 -0
- package/dist/lib/nest-auth.module.d.ts.map +1 -1
- package/dist/lib/nest-auth.module.js +18 -2
- package/dist/lib/nest-auth.module.js.map +1 -1
- package/dist/lib/permission/events/permission-created.event.d.ts +9 -0
- package/dist/lib/permission/events/permission-created.event.d.ts.map +1 -0
- package/dist/lib/permission/events/permission-created.event.js +11 -0
- package/dist/lib/permission/events/permission-created.event.js.map +1 -0
- package/dist/lib/permission/events/permission-deleted.event.d.ts +9 -0
- package/dist/lib/permission/events/permission-deleted.event.d.ts.map +1 -0
- package/dist/lib/permission/events/permission-deleted.event.js +11 -0
- package/dist/lib/permission/events/permission-deleted.event.js.map +1 -0
- package/dist/lib/permission/events/permission-updated.event.d.ts +10 -0
- package/dist/lib/permission/events/permission-updated.event.d.ts.map +1 -0
- package/dist/lib/permission/events/permission-updated.event.js +11 -0
- package/dist/lib/permission/events/permission-updated.event.js.map +1 -0
- package/dist/lib/permission/index.d.ts +3 -0
- package/dist/lib/permission/index.d.ts.map +1 -1
- package/dist/lib/permission/index.js +3 -0
- package/dist/lib/permission/index.js.map +1 -1
- package/dist/lib/permission/services/permission.service.d.ts +3 -1
- package/dist/lib/permission/services/permission.service.d.ts.map +1 -1
- package/dist/lib/permission/services/permission.service.js +16 -4
- package/dist/lib/permission/services/permission.service.js.map +1 -1
- package/dist/lib/request-context/request-context.d.ts +1 -1
- package/dist/lib/request-context/request-context.d.ts.map +1 -1
- package/dist/lib/request-context/request-context.js +3 -3
- package/dist/lib/request-context/request-context.js.map +1 -1
- package/dist/lib/role/entities/role.entity.d.ts +3 -1
- package/dist/lib/role/entities/role.entity.d.ts.map +1 -1
- package/dist/lib/role/entities/role.entity.js +7 -1
- package/dist/lib/role/entities/role.entity.js.map +1 -1
- package/dist/lib/role/events/role-created.event.d.ts +9 -0
- package/dist/lib/role/events/role-created.event.d.ts.map +1 -0
- package/dist/lib/role/events/role-created.event.js +11 -0
- package/dist/lib/role/events/role-created.event.js.map +1 -0
- package/dist/lib/role/events/role-deleted.event.d.ts +9 -0
- package/dist/lib/role/events/role-deleted.event.d.ts.map +1 -0
- package/dist/lib/role/events/role-deleted.event.js +11 -0
- package/dist/lib/role/events/role-deleted.event.js.map +1 -0
- package/dist/lib/role/events/role-updated.event.d.ts +10 -0
- package/dist/lib/role/events/role-updated.event.d.ts.map +1 -0
- package/dist/lib/role/events/role-updated.event.js +11 -0
- package/dist/lib/role/events/role-updated.event.js.map +1 -0
- package/dist/lib/role/index.d.ts +3 -0
- package/dist/lib/role/index.d.ts.map +1 -1
- package/dist/lib/role/index.js +3 -0
- package/dist/lib/role/index.js.map +1 -1
- package/dist/lib/role/services/role.service.d.ts +3 -1
- package/dist/lib/role/services/role.service.d.ts.map +1 -1
- package/dist/lib/role/services/role.service.js +29 -41
- package/dist/lib/role/services/role.service.js.map +1 -1
- package/dist/lib/role/utils/access-role-resolver.util.d.ts +20 -0
- package/dist/lib/role/utils/access-role-resolver.util.d.ts.map +1 -0
- package/dist/lib/role/utils/access-role-resolver.util.js +63 -0
- package/dist/lib/role/utils/access-role-resolver.util.js.map +1 -0
- package/dist/lib/session/services/session-manager.service.d.ts +8 -3
- package/dist/lib/session/services/session-manager.service.d.ts.map +1 -1
- package/dist/lib/session/services/session-manager.service.js +30 -11
- package/dist/lib/session/services/session-manager.service.js.map +1 -1
- package/dist/lib/session/session.module.d.ts.map +1 -1
- package/dist/lib/session/session.module.js +5 -1
- package/dist/lib/session/session.module.js.map +1 -1
- package/dist/lib/tenant/decorators/current-tenant.decorator.d.ts.map +1 -1
- package/dist/lib/tenant/decorators/current-tenant.decorator.js.map +1 -1
- package/dist/lib/tenant/entities/tenant.entity.d.ts +1 -1
- package/dist/lib/tenant/entities/tenant.entity.d.ts.map +1 -1
- package/dist/lib/tenant/entities/tenant.entity.js +1 -1
- package/dist/lib/tenant/entities/tenant.entity.js.map +1 -1
- package/dist/lib/tenant/index.d.ts +1 -1
- package/dist/lib/tenant/index.d.ts.map +1 -1
- package/dist/lib/tenant/index.js +1 -1
- package/dist/lib/tenant/index.js.map +1 -1
- package/dist/lib/tenant/tenant-context/services/base-tenant-context.service.d.ts +1 -1
- package/dist/lib/tenant/tenant-context/services/base-tenant-context.service.d.ts.map +1 -1
- package/dist/lib/tenant/tenant-context/services/disabled-tenant-context.service.d.ts +1 -1
- package/dist/lib/tenant/tenant-context/services/disabled-tenant-context.service.d.ts.map +1 -1
- package/dist/lib/tenant/tenant-context/tenant-context.interface.d.ts +1 -1
- package/dist/lib/tenant/tenant-context/tenant-context.interface.d.ts.map +1 -1
- package/dist/lib/user/entities/platform-access.entity.d.ts +16 -0
- package/dist/lib/user/entities/platform-access.entity.d.ts.map +1 -0
- package/dist/lib/user/entities/platform-access.entity.js +95 -0
- package/dist/lib/user/entities/platform-access.entity.js.map +1 -0
- package/dist/lib/user/entities/user-access.entity.d.ts +22 -0
- package/dist/lib/user/entities/user-access.entity.d.ts.map +1 -0
- package/dist/lib/{tenant → user}/entities/user-access.entity.js +35 -4
- package/dist/lib/user/entities/user-access.entity.js.map +1 -0
- package/dist/lib/user/entities/user.entity.d.ts +10 -12
- package/dist/lib/user/entities/user.entity.d.ts.map +1 -1
- package/dist/lib/user/entities/user.entity.js +91 -73
- package/dist/lib/user/entities/user.entity.js.map +1 -1
- package/dist/lib/user/services/access-key.service.d.ts +1 -0
- package/dist/lib/user/services/access-key.service.d.ts.map +1 -1
- package/dist/lib/user/services/access-key.service.js +19 -3
- package/dist/lib/user/services/access-key.service.js.map +1 -1
- package/dist/lib/user/services/user.service.d.ts +27 -22
- package/dist/lib/user/services/user.service.d.ts.map +1 -1
- package/dist/lib/user/services/user.service.js +135 -84
- package/dist/lib/user/services/user.service.js.map +1 -1
- package/dist/lib/user/user.module.d.ts.map +1 -1
- package/dist/lib/user/user.module.js +3 -2
- package/dist/lib/user/user.module.js.map +1 -1
- package/package.json +35 -20
- package/dist/lib/tenant/entities/user-access.entity.d.ts +0 -19
- package/dist/lib/tenant/entities/user-access.entity.d.ts.map +0 -1
- package/dist/lib/tenant/entities/user-access.entity.js.map +0 -1
|
@@ -16,6 +16,7 @@ exports.RoleService = void 0;
|
|
|
16
16
|
const common_1 = require("@nestjs/common");
|
|
17
17
|
const typeorm_1 = require("@nestjs/typeorm");
|
|
18
18
|
const typeorm_2 = require("typeorm");
|
|
19
|
+
const event_emitter_1 = require("@nestjs/event-emitter");
|
|
19
20
|
const auth_config_service_1 = require("../../core/services/auth-config.service");
|
|
20
21
|
const auth_constants_1 = require("../../auth.constants");
|
|
21
22
|
const permission_entity_1 = require("../../permission/entities/permission.entity");
|
|
@@ -23,14 +24,19 @@ const utils_1 = require("../../utils");
|
|
|
23
24
|
const role_entity_1 = require("../entities/role.entity");
|
|
24
25
|
const role_permission_entity_1 = require("../entities/role-permission.entity");
|
|
25
26
|
const role_mapper_util_1 = require("../utils/role-mapper.util");
|
|
27
|
+
const role_created_event_1 = require("../events/role-created.event");
|
|
28
|
+
const role_updated_event_1 = require("../events/role-updated.event");
|
|
29
|
+
const role_deleted_event_1 = require("../events/role-deleted.event");
|
|
26
30
|
let RoleService = class RoleService {
|
|
27
31
|
roleRepository;
|
|
28
32
|
dataSource;
|
|
29
33
|
authConfigService;
|
|
30
|
-
|
|
34
|
+
eventEmitter;
|
|
35
|
+
constructor(roleRepository, dataSource, authConfigService, eventEmitter) {
|
|
31
36
|
this.roleRepository = roleRepository;
|
|
32
37
|
this.dataSource = dataSource;
|
|
33
38
|
this.authConfigService = authConfigService;
|
|
39
|
+
this.eventEmitter = eventEmitter;
|
|
34
40
|
}
|
|
35
41
|
getDefaultRoleGuard() {
|
|
36
42
|
return this.authConfigService.getRoleGuards()[0] ?? auth_constants_1.DEFAULT_GUARD_NAME;
|
|
@@ -104,44 +110,20 @@ let RoleService = class RoleService {
|
|
|
104
110
|
.where('permission.guard = :guard', { guard: roleGuard })
|
|
105
111
|
.andWhere('permission.name IN (:...names)', { names: normalizedNames })
|
|
106
112
|
.getMany();
|
|
107
|
-
const
|
|
108
|
-
const missingNames = normalizedNames.filter((name) => !
|
|
109
|
-
if (
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
.
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
for (const permission of permissionsWithOtherGuards) {
|
|
120
|
-
const guards = guardMismatchMap.get(permission.name) ?? new Set();
|
|
121
|
-
guards.add(permission.guard);
|
|
122
|
-
guardMismatchMap.set(permission.name, guards);
|
|
123
|
-
}
|
|
124
|
-
const guardMismatchNames = missingNames.filter((name) => guardMismatchMap.has(name));
|
|
125
|
-
const invalidNames = missingNames.filter((name) => !guardMismatchMap.has(name));
|
|
126
|
-
const errors = [];
|
|
127
|
-
if (guardMismatchNames.length) {
|
|
128
|
-
const details = guardMismatchNames
|
|
129
|
-
.map((name) => `${name} [${Array.from(guardMismatchMap.get(name) ?? []).sort().join(', ')}]`)
|
|
130
|
-
.join(', ');
|
|
131
|
-
errors.push(`Guard mismatch for permissions: ${details}. Expected guard '${roleGuard}'`);
|
|
132
|
-
}
|
|
133
|
-
if (invalidNames.length) {
|
|
134
|
-
errors.push(`Unknown permissions: ${invalidNames.join(', ')}`);
|
|
113
|
+
const byName = new Map(matchingPermissions.map((p) => [p.name, p]));
|
|
114
|
+
const missingNames = normalizedNames.filter((name) => !byName.has(name));
|
|
115
|
+
if (missingNames.length) {
|
|
116
|
+
const list = missingNames.join(', ');
|
|
117
|
+
throw new common_1.BadRequestException({
|
|
118
|
+
message: missingNames.length === 1
|
|
119
|
+
? `Permission '${missingNames[0]}' was not found for guard '${roleGuard}'.`
|
|
120
|
+
: `Permissions were not found for guard '${roleGuard}': ${list}.`,
|
|
121
|
+
code: 'ROLE_PERMISSION_VALIDATION_FAILED',
|
|
122
|
+
guard: roleGuard,
|
|
123
|
+
missingPermissions: missingNames,
|
|
124
|
+
});
|
|
135
125
|
}
|
|
136
|
-
|
|
137
|
-
message: errors.join('. '),
|
|
138
|
-
code: 'ROLE_PERMISSION_VALIDATION_FAILED',
|
|
139
|
-
invalidPermissions: invalidNames,
|
|
140
|
-
guardMismatches: guardMismatchNames.map((name) => ({
|
|
141
|
-
name,
|
|
142
|
-
guards: Array.from(guardMismatchMap.get(name) ?? []).sort(),
|
|
143
|
-
})),
|
|
144
|
-
});
|
|
126
|
+
return normalizedNames.map((name) => byName.get(name));
|
|
145
127
|
}
|
|
146
128
|
async replaceRolePermissions(manager, roleId, permissions) {
|
|
147
129
|
const rolePermissionRepo = manager.getRepository(role_permission_entity_1.NestAuthRolePermission);
|
|
@@ -172,7 +154,7 @@ let RoleService = class RoleService {
|
|
|
172
154
|
const resolvedGuard = this.resolveAndValidateGuard(guard);
|
|
173
155
|
const normalizedTenantId = tenantId?.trim() || null;
|
|
174
156
|
const roleTenantId = isSystem ? null : normalizedTenantId;
|
|
175
|
-
|
|
157
|
+
const createdRole = await this.dataSource.transaction(async (manager) => {
|
|
176
158
|
await this.ensureRoleIsUnique(manager, {
|
|
177
159
|
name: normalizedName,
|
|
178
160
|
guard: resolvedGuard,
|
|
@@ -202,6 +184,8 @@ let RoleService = class RoleService {
|
|
|
202
184
|
await this.replaceRolePermissions(manager, savedRole.id, resolvedPermissions);
|
|
203
185
|
return this.getHydratedRole(manager, savedRole.id, true);
|
|
204
186
|
});
|
|
187
|
+
await this.eventEmitter.emitAsync(auth_constants_1.NestAuthEvents.ROLE_CREATED, new role_created_event_1.RoleCreatedEvent({ role: createdRole }));
|
|
188
|
+
return createdRole;
|
|
205
189
|
}
|
|
206
190
|
async getRoleById(id, options) {
|
|
207
191
|
if (!id) {
|
|
@@ -299,7 +283,7 @@ let RoleService = class RoleService {
|
|
|
299
283
|
return query.getMany();
|
|
300
284
|
}
|
|
301
285
|
async updateRole(id, data) {
|
|
302
|
-
|
|
286
|
+
const updatedRole = await this.dataSource.transaction(async (manager) => {
|
|
303
287
|
const role = await this.getHydratedRole(manager, id, true);
|
|
304
288
|
if (!role) {
|
|
305
289
|
throw new common_1.NotFoundException({
|
|
@@ -348,6 +332,8 @@ let RoleService = class RoleService {
|
|
|
348
332
|
}
|
|
349
333
|
return this.getHydratedRole(manager, role.id, true);
|
|
350
334
|
});
|
|
335
|
+
await this.eventEmitter.emitAsync(auth_constants_1.NestAuthEvents.ROLE_UPDATED, new role_updated_event_1.RoleUpdatedEvent({ role: updatedRole, updatedFields: Object.keys(data ?? {}) }));
|
|
336
|
+
return updatedRole;
|
|
351
337
|
}
|
|
352
338
|
async updateRolePermissions(id, permissionNames) {
|
|
353
339
|
return this.updateRole(id, { permissions: permissionNames });
|
|
@@ -361,6 +347,7 @@ let RoleService = class RoleService {
|
|
|
361
347
|
});
|
|
362
348
|
}
|
|
363
349
|
await this.roleRepository.remove(role);
|
|
350
|
+
await this.eventEmitter.emitAsync(auth_constants_1.NestAuthEvents.ROLE_DELETED, new role_deleted_event_1.RoleDeletedEvent({ role }));
|
|
364
351
|
}
|
|
365
352
|
};
|
|
366
353
|
exports.RoleService = RoleService;
|
|
@@ -369,6 +356,7 @@ exports.RoleService = RoleService = __decorate([
|
|
|
369
356
|
__param(0, (0, typeorm_1.InjectRepository)(role_entity_1.NestAuthRole)),
|
|
370
357
|
__metadata("design:paramtypes", [typeorm_2.Repository,
|
|
371
358
|
typeorm_2.DataSource,
|
|
372
|
-
auth_config_service_1.AuthConfigService
|
|
359
|
+
auth_config_service_1.AuthConfigService,
|
|
360
|
+
event_emitter_1.EventEmitter2])
|
|
373
361
|
], RoleService);
|
|
374
362
|
//# sourceMappingURL=role.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../../src/lib/role/services/role.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../../src/lib/role/services/role.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { NestAuthRole } from '../entities/role.entity';
|
|
2
|
+
type ResolveRolesParams = {
|
|
3
|
+
userId: string;
|
|
4
|
+
tenantId: string | null;
|
|
5
|
+
};
|
|
6
|
+
export declare class AccessRoleResolver {
|
|
7
|
+
static resolveRolesAndPermissionsForTenantContext(params: ResolveRolesParams): Promise<{
|
|
8
|
+
roles: any[];
|
|
9
|
+
permissions: string[];
|
|
10
|
+
}>;
|
|
11
|
+
static isPlatformAccess(): Promise<boolean>;
|
|
12
|
+
static resolvePlatformAccess(userId: string): Promise<NestAuthRole[]>;
|
|
13
|
+
static resolvePlatformAccessRolesAndPermissions(userId: string): Promise<{
|
|
14
|
+
roles: NestAuthRole[];
|
|
15
|
+
permissions: string[];
|
|
16
|
+
}>;
|
|
17
|
+
static isPlatformAdminUser(userId: string): Promise<boolean>;
|
|
18
|
+
}
|
|
19
|
+
export {};
|
|
20
|
+
//# sourceMappingURL=access-role-resolver.util.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"access-role-resolver.util.d.ts","sourceRoot":"","sources":["../../../../src/lib/role/utils/access-role-resolver.util.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAIvD,KAAK,kBAAkB,GAAG;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CAE3B,CAAC;AAEF,qBAAa,kBAAkB;WAKd,0CAA0C,CACnD,MAAM,EAAE,kBAAkB,GAC3B,OAAO,CAAC;QAAE,KAAK,EAAE,GAAG,EAAE,CAAC;QAAC,WAAW,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;WA0BtC,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC;WASpC,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;WAS9D,wCAAwC,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,YAAY,EAAE,CAAC;QAAC,WAAW,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;WAcnH,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAKrE"}
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AccessRoleResolver = void 0;
|
|
4
|
+
const lodash_1 = require("lodash");
|
|
5
|
+
const typeorm_1 = require("typeorm");
|
|
6
|
+
const platform_access_entity_1 = require("../../user/entities/platform-access.entity");
|
|
7
|
+
const user_access_entity_1 = require("../../user/entities/user-access.entity");
|
|
8
|
+
const role_mapper_util_1 = require("./role-mapper.util");
|
|
9
|
+
const auth_config_service_1 = require("../../core/services/auth-config.service");
|
|
10
|
+
const request_context_1 = require("../../request-context");
|
|
11
|
+
class AccessRoleResolver {
|
|
12
|
+
static async resolveRolesAndPermissionsForTenantContext(params) {
|
|
13
|
+
const { userId, tenantId } = params;
|
|
14
|
+
const platformAccess = await user_access_entity_1.NestAuthUserAccess.findOne({
|
|
15
|
+
where: {
|
|
16
|
+
userId,
|
|
17
|
+
tenantId: tenantId == null ? (0, typeorm_1.IsNull)() : tenantId,
|
|
18
|
+
},
|
|
19
|
+
relations: ['roles', 'roles.rolePermissions', 'roles.rolePermissions.permission'],
|
|
20
|
+
});
|
|
21
|
+
const mergedRoles = platformAccess?.roles ?? [];
|
|
22
|
+
const uniqRoleMap = new Map(mergedRoles.map((r) => [r.id, r]));
|
|
23
|
+
const roles = Array.from(uniqRoleMap.values());
|
|
24
|
+
const permissions = (0, lodash_1.chain)(roles)
|
|
25
|
+
.map((role) => (0, role_mapper_util_1.getRolePermissionNames)(role))
|
|
26
|
+
.flatten()
|
|
27
|
+
.uniq()
|
|
28
|
+
.value();
|
|
29
|
+
return { roles, permissions };
|
|
30
|
+
}
|
|
31
|
+
static async isPlatformAccess() {
|
|
32
|
+
const authConfig = auth_config_service_1.AuthConfigService.getOptions();
|
|
33
|
+
if (authConfig.platformAccess?.enabled === true) {
|
|
34
|
+
return await authConfig.platformAccess.validate(request_context_1.RequestContext.currentRequest());
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
return false;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
static async resolvePlatformAccess(userId) {
|
|
41
|
+
const platformAccess = await platform_access_entity_1.NestAuthPlatformAccess.findOne({
|
|
42
|
+
where: { userId, isActive: true },
|
|
43
|
+
relations: ['roles'],
|
|
44
|
+
});
|
|
45
|
+
return platformAccess?.roles ?? [];
|
|
46
|
+
}
|
|
47
|
+
static async resolvePlatformAccessRolesAndPermissions(userId) {
|
|
48
|
+
const tenantAccess = await this.resolvePlatformAccess(userId);
|
|
49
|
+
const roles = tenantAccess ?? [];
|
|
50
|
+
const permissions = (0, lodash_1.chain)(roles)
|
|
51
|
+
.map((role) => (0, role_mapper_util_1.getRolePermissionNames)(role))
|
|
52
|
+
.flatten()
|
|
53
|
+
.uniq()
|
|
54
|
+
.value();
|
|
55
|
+
return { roles, permissions };
|
|
56
|
+
}
|
|
57
|
+
static async isPlatformAdminUser(userId) {
|
|
58
|
+
const platformAccessRoles = await this.resolvePlatformAccess(userId);
|
|
59
|
+
return (platformAccessRoles?.length ?? 0) > 0;
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
exports.AccessRoleResolver = AccessRoleResolver;
|
|
63
|
+
//# sourceMappingURL=access-role-resolver.util.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"access-role-resolver.util.js","sourceRoot":"","sources":["../../../../src/lib/role/utils/access-role-resolver.util.ts"],"names":[],"mappings":";;;AAAA,mCAA+B;AAC/B,qCAAiC;AACjC,uFAAoF;AACpF,+EAA4E;AAC5E,yDAA4D;AAE5D,iFAA4E;AAC5E,2DAAuD;AAQvD,MAAa,kBAAkB;IAK3B,MAAM,CAAC,KAAK,CAAC,0CAA0C,CACnD,MAA0B;QAE1B,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;QAEpC,MAAM,cAAc,GAAG,MAAM,uCAAkB,CAAC,OAAO,CAAC;YACpD,KAAK,EAAE;gBACH,MAAM;gBACN,QAAQ,EAAE,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,IAAA,gBAAM,GAAE,CAAC,CAAC,CAAC,QAAQ;aAC5C;YACR,SAAS,EAAE,CAAC,OAAO,EAAE,uBAAuB,EAAE,kCAAkC,CAAC;SACpF,CAAC,CAAA;QAEF,MAAM,WAAW,GAAG,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC;QAGhD,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;QAE/C,MAAM,WAAW,GAAG,IAAA,cAAK,EAAC,KAAK,CAAC;aAC3B,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAA,yCAAsB,EAAC,IAAI,CAAC,CAAC;aAChD,OAAO,EAAE;aACT,IAAI,EAAE;aACN,KAAK,EAAE,CAAC;QAEb,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;IAClC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,gBAAgB;QACzB,MAAM,UAAU,GAAG,uCAAiB,CAAC,UAAU,EAAE,CAAC;QAClD,IAAI,UAAU,CAAC,cAAc,EAAE,OAAO,KAAK,IAAI,EAAC,CAAC;YAC7C,OAAO,MAAM,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC,gCAAc,CAAC,cAAc,EAAE,CAAC,CAAC;QACrF,CAAC;aAAI,CAAC;YACF,OAAO,KAAK,CAAC;QACjB,CAAC;IACL,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,MAAc;QAC7C,MAAM,cAAc,GAAG,MAAM,+CAAsB,CAAC,OAAO,CAAC;YACxD,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;YACjC,SAAS,EAAE,CAAC,OAAO,CAAC;SACvB,CAAC,CAAC;QAEH,OAAO,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,wCAAwC,CAAC,MAAc;QAChE,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;QAE9D,MAAM,KAAK,GAAmB,YAAY,IAAI,EAAE,CAAC;QACjD,MAAM,WAAW,GAAG,IAAA,cAAK,EAAC,KAAK,CAAC;aAC3B,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAA,yCAAsB,EAAC,IAAI,CAAC,CAAC;aAChD,OAAO,EAAE;aACT,IAAI,EAAE;aACN,KAAK,EAAE,CAAC;QAEb,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;IAElC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,MAAc;QAC3C,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;QAErE,OAAO,CAAC,mBAAmB,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IAClD,CAAC;CACJ;AAtED,gDAsEC"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { SessionStore } from '../interfaces/session-store.interface';
|
|
2
2
|
import { NestAuthSession } from '../entities/session.entity';
|
|
3
3
|
import { NestAuthUser } from '../../user/entities/user.entity';
|
|
4
|
+
import { NestAuthUserAccess } from '../../user/entities/user-access.entity';
|
|
5
|
+
import { NestAuthPlatformAccess } from '../../user/entities/platform-access.entity';
|
|
4
6
|
export declare const SESSION_STORE = "SESSION_STORE";
|
|
5
7
|
export declare const SESSION_REPOSITORY = "SESSION_REPOSITORY";
|
|
6
8
|
export declare class SessionManagerService {
|
|
@@ -18,12 +20,13 @@ export declare class SessionManagerService {
|
|
|
18
20
|
ipAddress?: string;
|
|
19
21
|
}): Promise<NestAuthSession>;
|
|
20
22
|
private shouldTouchSession;
|
|
23
|
+
private getTouchIntervalMs;
|
|
21
24
|
getSession(sessionId: string): Promise<NestAuthSession>;
|
|
22
25
|
getUserSessions(userId: string): Promise<NestAuthSession[]>;
|
|
23
26
|
getActiveSessions(userId: string): Promise<NestAuthSession[]>;
|
|
24
27
|
updateSession(sessionId: string, updates: Partial<NestAuthSession>): Promise<NestAuthSession>;
|
|
25
|
-
revokeSession(sessionId: string): Promise<void>;
|
|
26
|
-
deleteSession(sessionId: string): Promise<void>;
|
|
28
|
+
revokeSession(sessionId: string, reason?: 'logout' | 'expired' | 'admin' | 'security' | 'password_change'): Promise<void>;
|
|
29
|
+
deleteSession(sessionId: string, reason?: 'logout' | 'expired' | 'admin' | 'security' | 'password_change'): Promise<void>;
|
|
27
30
|
revokeAllUserSessions(userId: string): Promise<void>;
|
|
28
31
|
revokeOtherSessions(userId: string, currentSessionId: string): Promise<void>;
|
|
29
32
|
cleanupExpiredSessions(): Promise<number>;
|
|
@@ -34,9 +37,11 @@ export declare class SessionManagerService {
|
|
|
34
37
|
private enforceMaxSessions;
|
|
35
38
|
private calculateExpiration;
|
|
36
39
|
private isExpired;
|
|
37
|
-
createSessionFromUser(user: NestAuthUser, extraData?: {
|
|
40
|
+
createSessionFromUser(user: NestAuthUser, userAccess: NestAuthUserAccess, extraData?: {
|
|
38
41
|
isMfaVerified?: boolean;
|
|
39
42
|
tenantId?: string | null;
|
|
43
|
+
isPlatformAccess?: boolean;
|
|
44
|
+
platformAccess?: NestAuthPlatformAccess;
|
|
40
45
|
}): Promise<NestAuthSession>;
|
|
41
46
|
refreshSession(session: NestAuthSession): Promise<NestAuthSession>;
|
|
42
47
|
getCurrentSessions(userId: string): Promise<NestAuthSession[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-manager.service.d.ts","sourceRoot":"","sources":["../../../../src/lib/session/services/session-manager.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAK7D,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"session-manager.service.d.ts","sourceRoot":"","sources":["../../../../src/lib/session/services/session-manager.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,7 @@ const request_context_1 = require("../../request-context/request-context");
|
|
|
22
22
|
const uuid_1 = require("uuid");
|
|
23
23
|
const ms_1 = __importDefault(require("ms"));
|
|
24
24
|
const role_mapper_util_1 = require("../../role/utils/role-mapper.util");
|
|
25
|
+
const lodash_1 = require("lodash");
|
|
25
26
|
exports.SESSION_STORE = 'SESSION_STORE';
|
|
26
27
|
exports.SESSION_REPOSITORY = 'SESSION_REPOSITORY';
|
|
27
28
|
let SessionManagerService = class SessionManagerService {
|
|
@@ -62,16 +63,22 @@ let SessionManagerService = class SessionManagerService {
|
|
|
62
63
|
shouldTouchSession(session) {
|
|
63
64
|
const now = Date.now();
|
|
64
65
|
const lastActive = session.lastActive ? new Date(session.lastActive).getTime() : 0;
|
|
65
|
-
const
|
|
66
|
-
const touchedRecently = now - lastActive < 5 * 60 * 1000;
|
|
66
|
+
const touchedRecently = now - lastActive < this.getTouchIntervalMs();
|
|
67
67
|
return !touchedRecently;
|
|
68
68
|
}
|
|
69
|
+
getTouchIntervalMs() {
|
|
70
|
+
const raw = this.options.session?.touchInterval ?? '5m';
|
|
71
|
+
return typeof raw === 'string' ? (0, ms_1.default)(raw) : raw;
|
|
72
|
+
}
|
|
69
73
|
async getSession(sessionId) {
|
|
70
|
-
console.log('getSession called', sessionId);
|
|
71
74
|
const session = await this.store.findById(sessionId);
|
|
72
75
|
if (!session) {
|
|
73
76
|
throw new common_1.UnauthorizedException('Session not found');
|
|
74
77
|
}
|
|
78
|
+
if (this.isExpired(session)) {
|
|
79
|
+
await this.store.delete(sessionId);
|
|
80
|
+
throw new common_1.UnauthorizedException('Session expired');
|
|
81
|
+
}
|
|
75
82
|
if (this.slidingExpiration && this.shouldTouchSession(session)) {
|
|
76
83
|
const updatedSession = await this.touchSession(sessionId);
|
|
77
84
|
return updatedSession;
|
|
@@ -87,18 +94,18 @@ let SessionManagerService = class SessionManagerService {
|
|
|
87
94
|
async updateSession(sessionId, updates) {
|
|
88
95
|
return await this.store.update(sessionId, updates);
|
|
89
96
|
}
|
|
90
|
-
async revokeSession(sessionId) {
|
|
97
|
+
async revokeSession(sessionId, reason = 'admin') {
|
|
91
98
|
let session = null;
|
|
92
99
|
if (this.options.session?.onRevoked) {
|
|
93
100
|
session = await this.store.findById(sessionId);
|
|
94
101
|
}
|
|
95
102
|
await this.store.delete(sessionId);
|
|
96
103
|
if (this.options.session?.onRevoked && session) {
|
|
97
|
-
await this.options.session.onRevoked(session,
|
|
104
|
+
await this.options.session.onRevoked(session, reason);
|
|
98
105
|
}
|
|
99
106
|
}
|
|
100
|
-
async deleteSession(sessionId) {
|
|
101
|
-
await this.revokeSession(sessionId);
|
|
107
|
+
async deleteSession(sessionId, reason = 'admin') {
|
|
108
|
+
await this.revokeSession(sessionId, reason);
|
|
102
109
|
}
|
|
103
110
|
async revokeAllUserSessions(userId) {
|
|
104
111
|
await this.store.deleteByUserId(userId);
|
|
@@ -180,20 +187,32 @@ let SessionManagerService = class SessionManagerService {
|
|
|
180
187
|
return false;
|
|
181
188
|
return new Date() > new Date(session.expiresAt);
|
|
182
189
|
}
|
|
183
|
-
async createSessionFromUser(user, extraData = {}) {
|
|
190
|
+
async createSessionFromUser(user, userAccess, extraData = {}) {
|
|
184
191
|
const { deviceName, ipAddress, browser } = request_context_1.RequestContext.getDeviceInfo();
|
|
185
|
-
const { isMfaVerified = false, tenantId = null } = extraData;
|
|
192
|
+
const { isMfaVerified = false, tenantId = null, isPlatformAccess } = extraData;
|
|
186
193
|
if (!user) {
|
|
187
194
|
throw new common_1.UnauthorizedException('User not found');
|
|
188
195
|
}
|
|
189
|
-
|
|
190
|
-
|
|
196
|
+
let roles = [];
|
|
197
|
+
let permissions = [];
|
|
198
|
+
if (isPlatformAccess) {
|
|
199
|
+
roles = extraData?.platformAccess?.roles ?? [];
|
|
200
|
+
}
|
|
201
|
+
else {
|
|
202
|
+
roles = userAccess?.roles ?? [];
|
|
203
|
+
}
|
|
204
|
+
permissions = (0, lodash_1.chain)(roles)
|
|
205
|
+
.map((role) => (0, role_mapper_util_1.getRolePermissionNames)(role))
|
|
206
|
+
.flatten()
|
|
207
|
+
.uniq()
|
|
208
|
+
.value();
|
|
191
209
|
let sessionData = {
|
|
192
210
|
user,
|
|
193
211
|
isMfaVerified,
|
|
194
212
|
roles: roles.map((role) => (0, role_mapper_util_1.mapRoleToSessionSnapshot)(role)),
|
|
195
213
|
permissions,
|
|
196
214
|
tenantId,
|
|
215
|
+
isPlatformAccess: isPlatformAccess ?? false,
|
|
197
216
|
};
|
|
198
217
|
if (this.options.session?.customizeSessionData) {
|
|
199
218
|
sessionData = await this.options.session.customizeSessionData(sessionData, user);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-manager.service.js","sourceRoot":"","sources":["../../../../src/lib/session/services/session-manager.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,2CAA2E;AAK3E,iFAA4E;AAC5E,2EAAuE;AAEvE,+BAAoC;AACpC,4CAAoB;AACpB,
|
|
1
|
+
{"version":3,"file":"session-manager.service.js","sourceRoot":"","sources":["../../../../src/lib/session/services/session-manager.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.module.d.ts","sourceRoot":"","sources":["../../../src/lib/session/session.module.ts"],"names":[],"mappings":"AAmBA,
|
|
1
|
+
{"version":3,"file":"session.module.d.ts","sourceRoot":"","sources":["../../../src/lib/session/session.module.ts"],"names":[],"mappings":"AAmBA,qBAwDa,aAAa;IAKtB,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAsC/B,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAajC,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAYlC,OAAO,CAAC,MAAM,CAAC,wBAAwB;IAgBvC,OAAO,CAAC,MAAM,CAAC,uBAAuB;CAqBzC"}
|
|
@@ -118,8 +118,12 @@ exports.SessionModule = SessionModule = SessionModule_1 = __decorate([
|
|
|
118
118
|
database_session_store_1.DatabaseSessionStore,
|
|
119
119
|
{
|
|
120
120
|
provide: session_manager_service_1.SESSION_STORE,
|
|
121
|
-
useFactory: (databaseStore, memoryStore) => {
|
|
121
|
+
useFactory: async (databaseStore, memoryStore) => {
|
|
122
122
|
const config = auth_config_service_1.AuthConfigService.getOptions();
|
|
123
|
+
const customStore = config.session?.store;
|
|
124
|
+
if (customStore) {
|
|
125
|
+
return typeof customStore === 'function' ? await customStore() : customStore;
|
|
126
|
+
}
|
|
123
127
|
const storageType = SessionModule.resolveStorageType(config.session);
|
|
124
128
|
if (storageType === session_options_interface_1.SessionStorageType.REDIS) {
|
|
125
129
|
return SessionModule.createRedisStore(config.session);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.module.js","sourceRoot":"","sources":["../../../src/lib/session/session.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAoD;AACpD,6CAAgD;AAChD,8DAA4D;AAC5D,gFAA8G;AAC9G,0FAAqF;AACrF,wFAAmF;AACnF,4EAAuE;AACvE,sFAAsG;AACtG,qDAAiD;AACjD,4FAAuH;AACvH,8EAAyE;AACzE,4CAAoB;
|
|
1
|
+
{"version":3,"file":"session.module.js","sourceRoot":"","sources":["../../../src/lib/session/session.module.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"current-tenant.decorator.d.ts","sourceRoot":"","sources":["../../../../src/lib/tenant/decorators/current-tenant.decorator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"current-tenant.decorator.d.ts","sourceRoot":"","sources":["../../../../src/lib/tenant/decorators/current-tenant.decorator.ts"],"names":[],"mappings":"AA+BA,eAAO,MAAM,eAAe,mDAK3B,CAAC;AAOF,eAAO,MAAM,aAAa,mDAAkB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"current-tenant.decorator.js","sourceRoot":"","sources":["../../../../src/lib/tenant/decorators/current-tenant.decorator.ts"],"names":[],"mappings":";;;AAAA,2CAAwE;
|
|
1
|
+
{"version":3,"file":"current-tenant.decorator.js","sourceRoot":"","sources":["../../../../src/lib/tenant/decorators/current-tenant.decorator.ts"],"names":[],"mappings":";;;AAAA,2CAAwE;AA+B3D,QAAA,eAAe,GAAG,IAAA,6BAAoB,EAC/C,CAAC,KAAc,EAAE,GAAqB,EAAiB,EAAE;IACrD,MAAM,OAAO,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;IAChD,OAAO,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC;AACpC,CAAC,CACJ,CAAC;AAOW,QAAA,aAAa,GAAG,uBAAe,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tenant.entity.d.ts","sourceRoot":"","sources":["../../../../src/lib/tenant/entities/tenant.entity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"tenant.entity.d.ts","sourceRoot":"","sources":["../../../../src/lib/tenant/entities/tenant.entity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAE5E,qBACa,cAAc;IAEvB,EAAE,EAAE,MAAM,CAAC;IAGX,IAAI,EAAE,MAAM,CAAC;IAGb,IAAI,EAAE,MAAM,CAAC;IAGb,YAAY,EAAE,kBAAkB,EAAE,CAAC;IAGnC,WAAW,EAAE,MAAM,CAAC;IAGpB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAG9B,QAAQ,EAAE,OAAO,CAAC;IAGlB,SAAS,EAAE,IAAI,CAAC;IAGhB,SAAS,EAAE,IAAI,CAAC;CAEnB"}
|
|
@@ -11,7 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.NestAuthTenant = void 0;
|
|
13
13
|
const typeorm_1 = require("typeorm");
|
|
14
|
-
const user_access_entity_1 = require("
|
|
14
|
+
const user_access_entity_1 = require("../../user/entities/user-access.entity");
|
|
15
15
|
let NestAuthTenant = class NestAuthTenant {
|
|
16
16
|
id;
|
|
17
17
|
name;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tenant.entity.js","sourceRoot":"","sources":["../../../../src/lib/tenant/entities/tenant.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAgH;AAChH
|
|
1
|
+
{"version":3,"file":"tenant.entity.js","sourceRoot":"","sources":["../../../../src/lib/tenant/entities/tenant.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAgH;AAChH,+EAA4E;AAGrE,IAAM,cAAc,GAApB,MAAM,cAAc;IAEvB,EAAE,CAAS;IAGX,IAAI,CAAS;IAGb,IAAI,CAAS;IAGb,YAAY,CAAuB;IAGnC,WAAW,CAAS;IAGpB,QAAQ,CAAsB;IAG9B,QAAQ,CAAU;IAGlB,SAAS,CAAO;IAGhB,SAAS,CAAO;CAEnB,CAAA;AA5BY,wCAAc;AAEvB;IADC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;0CACpB;AAGX;IADC,IAAA,gBAAM,GAAE;;4CACI;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CAC5B;AAGb;IADC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,uCAAkB,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;;oDAC1B;AAGnC;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACP;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;gDACjC;AAG9B;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;gDACR;AAGlB;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;iDAAC;AAGhB;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;iDAAC;yBA1BP,cAAc;IAD1B,IAAA,gBAAM,EAAC,mBAAmB,CAAC;GACf,cAAc,CA4B1B"}
|
|
@@ -4,7 +4,7 @@ export * from './events/tenant-created.event';
|
|
|
4
4
|
export * from './events/tenant-deleted.event';
|
|
5
5
|
export * from './events/tenant-updated.event';
|
|
6
6
|
export * from './entities/tenant.entity';
|
|
7
|
-
export * from '
|
|
7
|
+
export * from '../user/entities/user-access.entity';
|
|
8
8
|
export { ITenantContextService } from './tenant-context/tenant-context.interface';
|
|
9
9
|
export { CurrentTenantId, CurrentTenant } from './decorators/current-tenant.decorator';
|
|
10
10
|
export { CurrentUserAccess, CurrentMembership } from './decorators/current-user-access.decorator';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/tenant/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,0BAA0B,CAAC;AACzC,cAAc
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/tenant/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,0BAA0B,CAAC;AACzC,cAAc,qCAAqC,CAAC;AAEpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,2CAA2C,CAAC;AAClF,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACvF,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAGlG,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC"}
|
package/dist/lib/tenant/index.js
CHANGED
|
@@ -21,7 +21,7 @@ __exportStar(require("./events/tenant-created.event"), exports);
|
|
|
21
21
|
__exportStar(require("./events/tenant-deleted.event"), exports);
|
|
22
22
|
__exportStar(require("./events/tenant-updated.event"), exports);
|
|
23
23
|
__exportStar(require("./entities/tenant.entity"), exports);
|
|
24
|
-
__exportStar(require("
|
|
24
|
+
__exportStar(require("../user/entities/user-access.entity"), exports);
|
|
25
25
|
var current_tenant_decorator_1 = require("./decorators/current-tenant.decorator");
|
|
26
26
|
Object.defineProperty(exports, "CurrentTenantId", { enumerable: true, get: function () { return current_tenant_decorator_1.CurrentTenantId; } });
|
|
27
27
|
Object.defineProperty(exports, "CurrentTenant", { enumerable: true, get: function () { return current_tenant_decorator_1.CurrentTenant; } });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/tenant/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,kDAAgC;AAChC,4DAA0C;AAC1C,gEAA8C;AAC9C,gEAA8C;AAC9C,gEAA8C;AAC9C,2DAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/tenant/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,kDAAgC;AAChC,4DAA0C;AAC1C,gEAA8C;AAC9C,gEAA8C;AAC9C,gEAA8C;AAC9C,2DAAyC;AACzC,sEAAoD;AAGpD,kFAAuF;AAA9E,2HAAA,eAAe,OAAA;AAAE,yHAAA,aAAa,OAAA;AACvC,4FAAkG;AAAzF,kIAAA,iBAAiB,OAAA;AAAE,kIAAA,iBAAiB,OAAA;AAG7C,gDAAyD;AAAhD,wGAAA,WAAW,OAAA;AAAE,mGAAA,MAAM,OAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ITenantContextService } from '../tenant-context.interface';
|
|
2
2
|
import { NestAuthTenant } from '../../entities/tenant.entity';
|
|
3
|
-
import { NestAuthUserAccess } from '
|
|
3
|
+
import { NestAuthUserAccess } from '../../../user/entities/user-access.entity';
|
|
4
4
|
import { TenantService } from '../../services/tenant.service';
|
|
5
5
|
export declare abstract class BaseTenantContextService implements ITenantContextService {
|
|
6
6
|
protected readonly tenantService: TenantService;
|