@ackplus/nest-auth 2.0.0-beta.1 → 2.0.0-beta.12
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/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-users.controller.d.ts +5 -5
- package/dist/lib/admin-console/controllers/admin-users.controller.d.ts.map +1 -1
- package/dist/lib/admin-console/controllers/admin-users.controller.js +4 -6
- package/dist/lib/admin-console/controllers/admin-users.controller.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 +1 -1
- package/dist/lib/admin-console/static/nest-auth.json +1 -1
- package/dist/lib/auth/entities/otp.entity.d.ts +1 -0
- package/dist/lib/auth/entities/otp.entity.d.ts.map +1 -1
- package/dist/lib/auth/entities/otp.entity.js +13 -9
- package/dist/lib/auth/entities/otp.entity.js.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/services/auth.service.d.ts +3 -2
- package/dist/lib/auth/services/auth.service.d.ts.map +1 -1
- package/dist/lib/auth/services/auth.service.js +138 -31
- package/dist/lib/auth/services/auth.service.js.map +1 -1
- 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/interfaces/auth-module-options.interface.d.ts +12 -0
- package/dist/lib/core/interfaces/auth-module-options.interface.d.ts.map +1 -1
- package/dist/lib/core/interfaces/token-payload.interface.d.ts +1 -0
- package/dist/lib/core/interfaces/token-payload.interface.d.ts.map +1 -1
- package/dist/lib/core/providers/passwordless-auth.provider.d.ts +2 -1
- package/dist/lib/core/providers/passwordless-auth.provider.d.ts.map +1 -1
- package/dist/lib/core/providers/passwordless-auth.provider.js +1 -0
- package/dist/lib/core/providers/passwordless-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/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 +1 -1
- package/dist/lib/request-context/request-context.js.map +1 -1
- package/dist/lib/role/entities/role.entity.d.ts +3 -3
- package/dist/lib/role/entities/role.entity.d.ts.map +1 -1
- package/dist/lib/role/entities/role.entity.js +7 -18
- package/dist/lib/role/entities/role.entity.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 +1 -0
- package/dist/lib/session/services/session-manager.service.d.ts.map +1 -1
- package/dist/lib/session/services/session-manager.service.js +18 -3
- package/dist/lib/session/services/session-manager.service.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/services/tenant.service.d.ts +1 -0
- package/dist/lib/tenant/services/tenant.service.d.ts.map +1 -1
- package/dist/lib/tenant/services/tenant.service.js +5 -0
- package/dist/lib/tenant/services/tenant.service.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 +89 -0
- package/dist/lib/user/entities/platform-access.entity.js.map +1 -0
- package/dist/lib/{tenant → user}/entities/user-access.entity.d.ts +5 -2
- package/dist/lib/user/entities/user-access.entity.d.ts.map +1 -0
- package/dist/lib/{tenant → user}/entities/user-access.entity.js +29 -4
- package/dist/lib/user/entities/user-access.entity.js.map +1 -0
- package/dist/lib/user/entities/user.entity.d.ts +5 -7
- package/dist/lib/user/entities/user.entity.d.ts.map +1 -1
- package/dist/lib/user/entities/user.entity.js +47 -47
- package/dist/lib/user/entities/user.entity.js.map +1 -1
- package/dist/lib/user/services/access-key.service.d.ts.map +1 -1
- package/dist/lib/user/services/access-key.service.js +4 -3
- package/dist/lib/user/services/access-key.service.js.map +1 -1
- package/dist/lib/user/services/user.service.d.ts +1 -2
- package/dist/lib/user/services/user.service.d.ts.map +1 -1
- package/dist/lib/user/services/user.service.js +17 -56
- 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/dist/lib/utils/has-token.d.ts +0 -1
- package/dist/lib/utils/has-token.d.ts.map +1 -1
- package/dist/lib/utils/has-token.js +1 -2
- package/dist/lib/utils/has-token.js.map +1 -1
- package/dist/lib/utils/index.d.ts +1 -0
- package/dist/lib/utils/index.d.ts.map +1 -1
- package/dist/lib/utils/index.js +1 -0
- package/dist/lib/utils/index.js.map +1 -1
- package/dist/lib/utils/tenant.d.ts +3 -0
- package/dist/lib/utils/tenant.d.ts.map +1 -0
- package/dist/lib/utils/tenant.js +21 -0
- package/dist/lib/utils/tenant.js.map +1 -0
- package/package.json +2 -2
- 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
|
@@ -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"}
|
|
@@ -37,6 +37,7 @@ export declare class SessionManagerService {
|
|
|
37
37
|
createSessionFromUser(user: NestAuthUser, extraData?: {
|
|
38
38
|
isMfaVerified?: boolean;
|
|
39
39
|
tenantId?: string | null;
|
|
40
|
+
isPlatformAccess?: boolean;
|
|
40
41
|
}): Promise<NestAuthSession>;
|
|
41
42
|
refreshSession(session: NestAuthSession): Promise<NestAuthSession>;
|
|
42
43
|
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":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAK7D,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAO/D,eAAO,MAAM,aAAa,kBAAkB,CAAC;AAC7C,eAAO,MAAM,kBAAkB,uBAAuB,CAAC;AAMvD,qBACa,qBAAqB;IAG1B,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,YAAY;IAGxC,OAAO,KAAK,OAAO,GAElB;IAED,OAAO,KAAK,kBAAkB,GAE7B;IAED,OAAO,KAAK,iBAAiB,GAE5B;IAKK,aAAa,CAAC,OAAO,EAAE;QACzB,MAAM,EAAE,MAAM,CAAC;QACf,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,IAAI,CAAC,EAAE,GAAG,CAAC;QACX,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,SAAS,CAAC,EAAE,MAAM,CAAC;KACtB,GAAG,OAAO,CAAC,eAAe,CAAC;IA+B5B,OAAO,CAAC,kBAAkB;IAapB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAyBvD,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAO3D,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAO7D,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC;IAO7F,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB/C,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO/C,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOpD,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAa5E,sBAAsB,IAAI,OAAO,CAAC,MAAM,CAAC;IAQzC,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAWzD,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IA+B1D,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;IAWnE,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;YAQ/C,kBAAkB;IAsBhC,OAAO,CAAC,mBAAmB;IAW3B,OAAO,CAAC,SAAS;IASX,qBAAqB,CACvB,IAAI,EAAE,YAAY,EAClB,SAAS,GAAE;QAAE,aAAa,CAAC,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,gBAAgB,CAAC,EAAE,OAAO,CAAA;KAAO,GAClG,OAAO,CAAC,eAAe,CAAC;IAqDrB,cAAc,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;IAqBlE,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;CAGvE"}
|
|
@@ -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 access_role_resolver_util_1 = require("../../role/utils/access-role-resolver.util");
|
|
25
26
|
exports.SESSION_STORE = 'SESSION_STORE';
|
|
26
27
|
exports.SESSION_REPOSITORY = 'SESSION_REPOSITORY';
|
|
27
28
|
let SessionManagerService = class SessionManagerService {
|
|
@@ -182,18 +183,32 @@ let SessionManagerService = class SessionManagerService {
|
|
|
182
183
|
}
|
|
183
184
|
async createSessionFromUser(user, extraData = {}) {
|
|
184
185
|
const { deviceName, ipAddress, browser } = request_context_1.RequestContext.getDeviceInfo();
|
|
185
|
-
const { isMfaVerified = false, tenantId = null } = extraData;
|
|
186
|
+
const { isMfaVerified = false, tenantId = null, isPlatformAccess } = extraData;
|
|
186
187
|
if (!user) {
|
|
187
188
|
throw new common_1.UnauthorizedException('User not found');
|
|
188
189
|
}
|
|
189
|
-
|
|
190
|
-
|
|
190
|
+
let roles = [];
|
|
191
|
+
let permissions = [];
|
|
192
|
+
if (isPlatformAccess) {
|
|
193
|
+
const { roles: resolvedRoles, permissions: resolvedPermissions } = await access_role_resolver_util_1.AccessRoleResolver.resolvePlatformAccessRolesAndPermissions(user.id);
|
|
194
|
+
roles = resolvedRoles;
|
|
195
|
+
permissions = resolvedPermissions;
|
|
196
|
+
}
|
|
197
|
+
else {
|
|
198
|
+
const { roles: resolvedRoles, permissions: resolvedPermissions } = await access_role_resolver_util_1.AccessRoleResolver.resolveRolesAndPermissionsForTenantContext({
|
|
199
|
+
userId: user.id,
|
|
200
|
+
tenantId: tenantId ?? null,
|
|
201
|
+
});
|
|
202
|
+
roles = resolvedRoles;
|
|
203
|
+
permissions = resolvedPermissions;
|
|
204
|
+
}
|
|
191
205
|
let sessionData = {
|
|
192
206
|
user,
|
|
193
207
|
isMfaVerified,
|
|
194
208
|
roles: roles.map((role) => (0, role_mapper_util_1.mapRoleToSessionSnapshot)(role)),
|
|
195
209
|
permissions,
|
|
196
210
|
tenantId,
|
|
211
|
+
isPlatformAccess: isPlatformAccess ?? false,
|
|
197
212
|
};
|
|
198
213
|
if (this.options.session?.customizeSessionData) {
|
|
199
214
|
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,wEAA6E;
|
|
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":"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"}
|
|
@@ -17,6 +17,7 @@ export declare class TenantService {
|
|
|
17
17
|
deleteTenant(id: string): Promise<void>;
|
|
18
18
|
updateTenantStatus(id: string, isActive: boolean): Promise<NestAuthTenant>;
|
|
19
19
|
updateTenantMetadata(id: string, metadata: Record<string, any>): Promise<NestAuthTenant>;
|
|
20
|
+
checkRequiredTenant(inputTenantId: string | null, throwError?: boolean): Promise<boolean>;
|
|
20
21
|
resolveTenantId(inputTenantId?: string | null): Promise<string | null>;
|
|
21
22
|
}
|
|
22
23
|
//# sourceMappingURL=tenant.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tenant.service.d.ts","sourceRoot":"","sources":["../../../../src/lib/tenant/services/tenant.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAKtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAE9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"tenant.service.d.ts","sourceRoot":"","sources":["../../../../src/lib/tenant/services/tenant.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAKtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAE9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAI5E,qBACa,aAAa;IAIlB,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBAH1B,gBAAgB,EAAE,UAAU,CAAC,cAAc,CAAC,EAC5C,YAAY,EAAE,aAAa,EAC3B,WAAW,EAAE,kBAAkB,EACtB,iBAAiB,EAAE,iBAAiB;IAGnD,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;IAwCpE,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;IAmB5F,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;IAahG,UAAU,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAIhF,YAAY,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;IA6ChF,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBvC,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC;IAe1E,oBAAoB,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;IAmBxF,mBAAmB,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,GAAE,OAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAM/F,eAAe,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;CA6B/E"}
|
|
@@ -26,6 +26,7 @@ const debug_logger_service_1 = require("../../core/services/debug-logger.service
|
|
|
26
26
|
const slug_util_1 = require("../../utils/slug.util");
|
|
27
27
|
const auth_config_service_1 = require("../../core/services/auth-config.service");
|
|
28
28
|
const nest_auth_contracts_1 = require("@ackplus/nest-auth-contracts");
|
|
29
|
+
const utils_1 = require("../../utils");
|
|
29
30
|
let TenantService = class TenantService {
|
|
30
31
|
tenantRepository;
|
|
31
32
|
eventEmitter;
|
|
@@ -159,6 +160,10 @@ let TenantService = class TenantService {
|
|
|
159
160
|
const updatedTenant = await this.tenantRepository.save(tenant);
|
|
160
161
|
return updatedTenant;
|
|
161
162
|
}
|
|
163
|
+
async checkRequiredTenant(inputTenantId, throwError = true) {
|
|
164
|
+
const config = this.authConfigService.getConfig();
|
|
165
|
+
return (0, utils_1.requiredTenant)(config?.tenant ?? {}, inputTenantId, throwError);
|
|
166
|
+
}
|
|
162
167
|
async resolveTenantId(inputTenantId) {
|
|
163
168
|
const config = this.authConfigService.getConfig();
|
|
164
169
|
if (config.tenant?.enabled) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tenant.service.js","sourceRoot":"","sources":["../../../../src/lib/tenant/services/tenant.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAuG;AACvG,6CAAmD;AACnD,qCAAsE;AACtE,6DAA2D;AAC3D,yDAAsD;AACtD,yEAAoE;AACpE,yEAAoE;AACpE,yEAAoE;AACpE,yDAAmE;AACnE,mFAA8E;AAC9E,qDAAoD;AACpD,iFAA4E;AAC5E,sEAA8D;
|
|
1
|
+
{"version":3,"file":"tenant.service.js","sourceRoot":"","sources":["../../../../src/lib/tenant/services/tenant.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-tenant-context.service.d.ts","sourceRoot":"","sources":["../../../../../src/lib/tenant/tenant-context/services/base-tenant-context.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"base-tenant-context.service.d.ts","sourceRoot":"","sources":["../../../../../src/lib/tenant/tenant-context/services/base-tenant-context.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAS9D,8BAAsB,wBAAyB,YAAW,qBAAqB;IAC/D,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa;gBAA5B,aAAa,EAAE,aAAa;IAE3D,SAAS,IAAI,OAAO;IAId,kBAAkB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAK5C,gBAAgB,IAAI,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;IAKlD,gBAAgB,IAAI,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;CAG/D"}
|
|
@@ -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
|
export declare class DisabledTenantContextService implements ITenantContextService {
|
|
5
5
|
isEnabled(): boolean;
|
|
6
6
|
getCurrentTenantId(): Promise<string | null>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"disabled-tenant-context.service.d.ts","sourceRoot":"","sources":["../../../../../src/lib/tenant/tenant-context/services/disabled-tenant-context.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"disabled-tenant-context.service.d.ts","sourceRoot":"","sources":["../../../../../src/lib/tenant/tenant-context/services/disabled-tenant-context.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAM/E,qBACa,4BAA6B,YAAW,qBAAqB;IACtE,SAAS,IAAI,OAAO;IAId,kBAAkB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAI5C,gBAAgB,IAAI,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;IAIlD,gBAAgB,IAAI,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;CAI/D"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { NestAuthTenant } from '../entities/tenant.entity';
|
|
2
|
-
import { NestAuthUserAccess } from '
|
|
2
|
+
import { NestAuthUserAccess } from '../../user/entities/user-access.entity';
|
|
3
3
|
export interface ITenantContextService {
|
|
4
4
|
isEnabled(): boolean;
|
|
5
5
|
getCurrentTenantId(): Promise<string | null>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tenant-context.interface.d.ts","sourceRoot":"","sources":["../../../../src/lib/tenant/tenant-context/tenant-context.interface.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"tenant-context.interface.d.ts","sourceRoot":"","sources":["../../../../src/lib/tenant/tenant-context/tenant-context.interface.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAE5E,MAAM,WAAW,qBAAqB;IAClC,SAAS,IAAI,OAAO,CAAC;IACrB,kBAAkB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC7C,gBAAgB,IAAI,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;IAEnD,gBAAgB,IAAI,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAAC;CAC1D"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { BaseEntity } from 'typeorm';
|
|
2
|
+
import { NestAuthUser } from './user.entity';
|
|
3
|
+
import { NestAuthRole } from '../../role/entities/role.entity';
|
|
4
|
+
export declare class NestAuthPlatformAccess extends BaseEntity {
|
|
5
|
+
id: string;
|
|
6
|
+
userId: string;
|
|
7
|
+
user: NestAuthUser;
|
|
8
|
+
roles: NestAuthRole[];
|
|
9
|
+
isActive: boolean;
|
|
10
|
+
createdAt: Date;
|
|
11
|
+
updatedAt: Date;
|
|
12
|
+
getPermissions(): Promise<string[]>;
|
|
13
|
+
getRoles(withPermissions?: boolean): Promise<NestAuthRole[]>;
|
|
14
|
+
assignRoles(roleIds: string | string[]): Promise<void>;
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=platform-access.entity.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"platform-access.entity.d.ts","sourceRoot":"","sources":["../../../../src/lib/user/entities/platform-access.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAUH,UAAU,EAGb,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAI/D,qBACa,sBAAuB,SAAQ,UAAU;IAElD,EAAE,EAAE,MAAM,CAAC;IAKX,MAAM,EAAE,MAAM,CAAC;IAGf,IAAI,EAAE,YAAY,CAAC;IASnB,KAAK,EAAE,YAAY,EAAE,CAAC;IAGtB,QAAQ,EAAE,OAAO,CAAC;IAGlB,SAAS,EAAE,IAAI,CAAC;IAGhB,SAAS,EAAE,IAAI,CAAC;IAGV,cAAc,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IASnC,QAAQ,CAAC,eAAe,UAAQ,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAU1D,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAO/D"}
|
|
@@ -0,0 +1,89 @@
|
|
|
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 NestAuthPlatformAccess_1;
|
|
12
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
|
+
exports.NestAuthPlatformAccess = void 0;
|
|
14
|
+
const typeorm_1 = require("typeorm");
|
|
15
|
+
const user_entity_1 = require("./user.entity");
|
|
16
|
+
const role_entity_1 = require("../../role/entities/role.entity");
|
|
17
|
+
const lodash_1 = require("lodash");
|
|
18
|
+
const role_mapper_util_1 = require("../../role/utils/role-mapper.util");
|
|
19
|
+
let NestAuthPlatformAccess = NestAuthPlatformAccess_1 = class NestAuthPlatformAccess extends typeorm_1.BaseEntity {
|
|
20
|
+
id;
|
|
21
|
+
userId;
|
|
22
|
+
user;
|
|
23
|
+
roles;
|
|
24
|
+
isActive;
|
|
25
|
+
createdAt;
|
|
26
|
+
updatedAt;
|
|
27
|
+
async getPermissions() {
|
|
28
|
+
const roles = await this.getRoles(true);
|
|
29
|
+
return (0, lodash_1.chain)(roles)
|
|
30
|
+
.map((role) => (0, role_mapper_util_1.getRolePermissionNames)(role))
|
|
31
|
+
.flatten()
|
|
32
|
+
.uniq()
|
|
33
|
+
.value();
|
|
34
|
+
}
|
|
35
|
+
async getRoles(withPermissions = false) {
|
|
36
|
+
const access = await NestAuthPlatformAccess_1.findOne({
|
|
37
|
+
where: { userId: this.userId, isActive: true },
|
|
38
|
+
relations: ['roles', ...(withPermissions ? ['roles.rolePermissions', 'roles.rolePermissions.permission'] : [])],
|
|
39
|
+
});
|
|
40
|
+
return access?.roles?.length ? access.roles : [];
|
|
41
|
+
}
|
|
42
|
+
async assignRoles(roleIds) {
|
|
43
|
+
const ids = Array.isArray(roleIds) ? roleIds : [roleIds];
|
|
44
|
+
this.roles = ids.length
|
|
45
|
+
? await role_entity_1.NestAuthRole.find({ where: { id: (0, typeorm_1.In)(ids) } })
|
|
46
|
+
: [];
|
|
47
|
+
await this.save();
|
|
48
|
+
}
|
|
49
|
+
};
|
|
50
|
+
exports.NestAuthPlatformAccess = NestAuthPlatformAccess;
|
|
51
|
+
__decorate([
|
|
52
|
+
(0, typeorm_1.PrimaryGeneratedColumn)('uuid'),
|
|
53
|
+
__metadata("design:type", String)
|
|
54
|
+
], NestAuthPlatformAccess.prototype, "id", void 0);
|
|
55
|
+
__decorate([
|
|
56
|
+
(0, typeorm_1.Column)({ nullable: false }),
|
|
57
|
+
(0, typeorm_1.Index)(),
|
|
58
|
+
(0, typeorm_1.RelationId)((access) => access.user),
|
|
59
|
+
__metadata("design:type", String)
|
|
60
|
+
], NestAuthPlatformAccess.prototype, "userId", void 0);
|
|
61
|
+
__decorate([
|
|
62
|
+
(0, typeorm_1.OneToOne)(() => user_entity_1.NestAuthUser, { onDelete: 'CASCADE' }),
|
|
63
|
+
__metadata("design:type", user_entity_1.NestAuthUser)
|
|
64
|
+
], NestAuthPlatformAccess.prototype, "user", void 0);
|
|
65
|
+
__decorate([
|
|
66
|
+
(0, typeorm_1.ManyToMany)(() => role_entity_1.NestAuthRole, role => role.platformAccesses, { onDelete: 'CASCADE' }),
|
|
67
|
+
(0, typeorm_1.JoinTable)({
|
|
68
|
+
name: 'nest_auth_platform_access_roles',
|
|
69
|
+
joinColumn: { name: 'nestAuthPlatformAccessId', referencedColumnName: 'id' },
|
|
70
|
+
inverseJoinColumn: { name: 'nestAuthRolesId', referencedColumnName: 'id' },
|
|
71
|
+
}),
|
|
72
|
+
__metadata("design:type", Array)
|
|
73
|
+
], NestAuthPlatformAccess.prototype, "roles", void 0);
|
|
74
|
+
__decorate([
|
|
75
|
+
(0, typeorm_1.Column)({ default: true }),
|
|
76
|
+
__metadata("design:type", Boolean)
|
|
77
|
+
], NestAuthPlatformAccess.prototype, "isActive", void 0);
|
|
78
|
+
__decorate([
|
|
79
|
+
(0, typeorm_1.CreateDateColumn)(),
|
|
80
|
+
__metadata("design:type", Date)
|
|
81
|
+
], NestAuthPlatformAccess.prototype, "createdAt", void 0);
|
|
82
|
+
__decorate([
|
|
83
|
+
(0, typeorm_1.UpdateDateColumn)(),
|
|
84
|
+
__metadata("design:type", Date)
|
|
85
|
+
], NestAuthPlatformAccess.prototype, "updatedAt", void 0);
|
|
86
|
+
exports.NestAuthPlatformAccess = NestAuthPlatformAccess = NestAuthPlatformAccess_1 = __decorate([
|
|
87
|
+
(0, typeorm_1.Entity)('nest_auth_platform_accesses')
|
|
88
|
+
], NestAuthPlatformAccess);
|
|
89
|
+
//# sourceMappingURL=platform-access.entity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"platform-access.entity.js","sourceRoot":"","sources":["../../../../src/lib/user/entities/platform-access.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { BaseEntity } from 'typeorm';
|
|
2
|
-
import { NestAuthTenant } from '
|
|
3
|
-
import { NestAuthUser } from '
|
|
2
|
+
import { NestAuthTenant } from '../../tenant/entities/tenant.entity';
|
|
3
|
+
import { NestAuthUser } from './user.entity';
|
|
4
4
|
import { NestAuthRole } from '../../role/entities/role.entity';
|
|
5
5
|
export declare class NestAuthUserAccess extends BaseEntity {
|
|
6
6
|
id: string;
|
|
@@ -15,5 +15,8 @@ export declare class NestAuthUserAccess extends BaseEntity {
|
|
|
15
15
|
metadata?: Record<string, any>;
|
|
16
16
|
createdAt: Date;
|
|
17
17
|
updatedAt: Date;
|
|
18
|
+
getPermissions(tenantId: string | null): Promise<string[]>;
|
|
19
|
+
getRoles(tenantId?: string | null, withPermissions?: boolean): Promise<NestAuthRole[]>;
|
|
20
|
+
assignRoles(roleIds: string | string[]): Promise<void>;
|
|
18
21
|
}
|
|
19
22
|
//# sourceMappingURL=user-access.entity.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"user-access.entity.d.ts","sourceRoot":"","sources":["../../../../src/lib/user/entities/user-access.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAWH,UAAU,EAIb,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAI/D,qBASa,kBAAmB,SAAQ,UAAU;IAE9C,EAAE,EAAE,MAAM,CAAC;IAKX,MAAM,EAAE,MAAM,CAAC;IAKf,QAAQ,EAAE,MAAM,CAAC;IAGjB,IAAI,EAAE,YAAY,CAAC;IAGnB,MAAM,EAAE,cAAc,CAAC;IASvB,KAAK,EAAE,YAAY,EAAE,CAAC;IAGtB,QAAQ,EAAE,OAAO,CAAC;IAGlB,SAAS,EAAE,OAAO,CAAC;IAGnB,MAAM,EAAE,MAAM,CAAC;IAGf,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAG/B,SAAS,EAAE,IAAI,CAAC;IAGhB,SAAS,EAAE,IAAI,CAAC;IAEV,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAS1D,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,eAAe,UAAQ,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAUpF,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAQ/D"}
|
|
@@ -8,13 +8,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
+
var NestAuthUserAccess_1;
|
|
11
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
13
|
exports.NestAuthUserAccess = void 0;
|
|
13
14
|
const typeorm_1 = require("typeorm");
|
|
14
|
-
const tenant_entity_1 = require("
|
|
15
|
-
const user_entity_1 = require("
|
|
15
|
+
const tenant_entity_1 = require("../../tenant/entities/tenant.entity");
|
|
16
|
+
const user_entity_1 = require("./user.entity");
|
|
16
17
|
const role_entity_1 = require("../../role/entities/role.entity");
|
|
17
|
-
|
|
18
|
+
const lodash_1 = require("lodash");
|
|
19
|
+
const role_mapper_util_1 = require("../../role/utils/role-mapper.util");
|
|
20
|
+
let NestAuthUserAccess = NestAuthUserAccess_1 = class NestAuthUserAccess extends typeorm_1.BaseEntity {
|
|
18
21
|
id;
|
|
19
22
|
userId;
|
|
20
23
|
tenantId;
|
|
@@ -27,6 +30,28 @@ let NestAuthUserAccess = class NestAuthUserAccess extends typeorm_1.BaseEntity {
|
|
|
27
30
|
metadata;
|
|
28
31
|
createdAt;
|
|
29
32
|
updatedAt;
|
|
33
|
+
async getPermissions(tenantId) {
|
|
34
|
+
const roles = await this.getRoles(tenantId, true);
|
|
35
|
+
return (0, lodash_1.chain)(roles)
|
|
36
|
+
.map((role) => (0, role_mapper_util_1.getRolePermissionNames)(role))
|
|
37
|
+
.flatten()
|
|
38
|
+
.uniq()
|
|
39
|
+
.value();
|
|
40
|
+
}
|
|
41
|
+
async getRoles(tenantId, withPermissions = false) {
|
|
42
|
+
const access = await NestAuthUserAccess_1.findOne({
|
|
43
|
+
where: { userId: this.userId, tenantId: tenantId ? (0, typeorm_1.Equal)(tenantId) : (0, typeorm_1.IsNull)() },
|
|
44
|
+
relations: ['roles', ...(withPermissions ? ['roles.rolePermissions', 'roles.rolePermissions.permission'] : [])],
|
|
45
|
+
});
|
|
46
|
+
return access?.roles?.length ? access.roles : [];
|
|
47
|
+
}
|
|
48
|
+
async assignRoles(roleIds) {
|
|
49
|
+
const ids = Array.isArray(roleIds) ? roleIds : [roleIds];
|
|
50
|
+
this.roles = ids.length
|
|
51
|
+
? await role_entity_1.NestAuthRole.find({ where: { id: (0, typeorm_1.In)(ids) } })
|
|
52
|
+
: [];
|
|
53
|
+
await this.save();
|
|
54
|
+
}
|
|
30
55
|
};
|
|
31
56
|
exports.NestAuthUserAccess = NestAuthUserAccess;
|
|
32
57
|
__decorate([
|
|
@@ -86,7 +111,7 @@ __decorate([
|
|
|
86
111
|
(0, typeorm_1.UpdateDateColumn)(),
|
|
87
112
|
__metadata("design:type", Date)
|
|
88
113
|
], NestAuthUserAccess.prototype, "updatedAt", void 0);
|
|
89
|
-
exports.NestAuthUserAccess = NestAuthUserAccess = __decorate([
|
|
114
|
+
exports.NestAuthUserAccess = NestAuthUserAccess = NestAuthUserAccess_1 = __decorate([
|
|
90
115
|
(0, typeorm_1.Entity)('nest_auth_user_accesses'),
|
|
91
116
|
(0, typeorm_1.Index)('UQ_user_tenant_not_null', ['userId', 'tenantId'], {
|
|
92
117
|
unique: true,
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"user-access.entity.js","sourceRoot":"","sources":["../../../../src/lib/user/entities/user-access.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,8 @@ import { NestAuthIdentity } from "./identity.entity";
|
|
|
3
3
|
import { NestAuthSession } from "../../session/entities/session.entity";
|
|
4
4
|
import { NestAuthOTP } from "../../auth/entities/otp.entity";
|
|
5
5
|
import { NestAuthMFASecret } from "../../auth/entities/mfa-secret.entity";
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
6
|
+
import { NestAuthUserAccess } from "./user-access.entity";
|
|
7
|
+
import { NestAuthPlatformAccess } from "./platform-access.entity";
|
|
8
8
|
export declare class NestAuthUser extends BaseEntity {
|
|
9
9
|
id: string;
|
|
10
10
|
email: string;
|
|
@@ -21,15 +21,13 @@ export declare class NestAuthUser extends BaseEntity {
|
|
|
21
21
|
mfaSecrets: NestAuthMFASecret[];
|
|
22
22
|
sessions: NestAuthSession[];
|
|
23
23
|
otps: NestAuthOTP[];
|
|
24
|
-
roles: NestAuthRole[];
|
|
25
24
|
userAccesses: NestAuthUserAccess[];
|
|
25
|
+
platformAccess: NestAuthPlatformAccess;
|
|
26
26
|
createdAt: Date;
|
|
27
27
|
updatedAt: Date;
|
|
28
28
|
updateTenantFields(): void;
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
assignRoles(roleIds: string | string[], tenantId?: string | null): Promise<void>;
|
|
32
|
-
private getOrCreateUserAccess;
|
|
29
|
+
getUserAccess(tenantId?: string, createIfNotExists?: boolean): Promise<NestAuthUserAccess>;
|
|
30
|
+
getPlatformAccess(createIfNotExists?: boolean): Promise<NestAuthPlatformAccess>;
|
|
33
31
|
findOrCreateIdentity(provider: string, providerId: string): Promise<NestAuthIdentity>;
|
|
34
32
|
updateOrCreateIdentity(provider: string, data: Partial<NestAuthIdentity>): Promise<NestAuthIdentity>;
|
|
35
33
|
updateEmail(newEmail: string): Promise<void>;
|