@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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.entity.d.ts","sourceRoot":"","sources":["../../../../src/lib/user/entities/user.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAOH,UAAU,
|
|
1
|
+
{"version":3,"file":"user.entity.d.ts","sourceRoot":"","sources":["../../../../src/lib/user/entities/user.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAOH,UAAU,EAOb,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE,qBACa,YAAa,SAAQ,UAAU;IAExC,EAAE,EAAE,MAAM,CAAC;IAIX,KAAK,EAAE,MAAM,CAAC;IAId,eAAe,EAAE,IAAI,CAAC;IAItB,KAAK,EAAE,MAAM,CAAC;IAId,eAAe,EAAE,IAAI,CAAC;IAGtB,YAAY,EAAE,MAAM,CAAC;IAGrB,UAAU,EAAE,OAAO,CAAC;IAGpB,QAAQ,EAAE,OAAO,CAAC;IAGlB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAG/B,YAAY,EAAE,OAAO,CAAC;IAGtB,eAAe,CAAC,EAAE,MAAM,CAAC;IAGzB,UAAU,EAAE,gBAAgB,EAAE,CAAC;IAG/B,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAGhC,QAAQ,EAAE,eAAe,EAAE,CAAC;IAG5B,IAAI,EAAE,WAAW,EAAE,CAAC;IAGpB,YAAY,EAAE,kBAAkB,EAAE,CAAC;IAGnC,cAAc,EAAE,sBAAsB,CAAC;IAGvC,SAAS,EAAE,IAAI,CAAC;IAGhB,SAAS,EAAE,IAAI,CAAC;IAIhB,kBAAkB;IAMZ,aAAa,CAAC,QAAQ,GAAE,MAAa,EAAE,iBAAiB,GAAE,OAAe;IAezE,iBAAiB,CAAC,iBAAiB,GAAE,OAAe;IAepD,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAiBzD,sBAAsB,CACxB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAChC,OAAO,CAAC,gBAAgB,CAAC;IAwBtB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB5C,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB/D,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAwBpD,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAqBrD"}
|
|
@@ -11,19 +11,16 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.NestAuthUser = void 0;
|
|
13
13
|
const typeorm_1 = require("typeorm");
|
|
14
|
-
const typeorm_2 = require("typeorm");
|
|
15
14
|
const argon2_1 = require("@node-rs/argon2");
|
|
16
15
|
const auth_config_service_1 = require("../../core/services/auth-config.service");
|
|
17
16
|
const identity_entity_1 = require("./identity.entity");
|
|
18
17
|
const session_entity_1 = require("../../session/entities/session.entity");
|
|
19
|
-
const lodash_1 = require("lodash");
|
|
20
18
|
const otp_entity_1 = require("../../auth/entities/otp.entity");
|
|
21
19
|
const mfa_secret_entity_1 = require("../../auth/entities/mfa-secret.entity");
|
|
22
|
-
const
|
|
23
|
-
const user_access_entity_1 = require("../../tenant/entities/user-access.entity");
|
|
20
|
+
const user_access_entity_1 = require("./user-access.entity");
|
|
24
21
|
const auth_constants_1 = require("../../auth.constants");
|
|
25
22
|
const utils_1 = require("../../utils");
|
|
26
|
-
const
|
|
23
|
+
const platform_access_entity_1 = require("./platform-access.entity");
|
|
27
24
|
let NestAuthUser = class NestAuthUser extends typeorm_1.BaseEntity {
|
|
28
25
|
id;
|
|
29
26
|
email;
|
|
@@ -40,8 +37,8 @@ let NestAuthUser = class NestAuthUser extends typeorm_1.BaseEntity {
|
|
|
40
37
|
mfaSecrets;
|
|
41
38
|
sessions;
|
|
42
39
|
otps;
|
|
43
|
-
roles;
|
|
44
40
|
userAccesses;
|
|
41
|
+
platformAccess;
|
|
45
42
|
createdAt;
|
|
46
43
|
updatedAt;
|
|
47
44
|
updateTenantFields() {
|
|
@@ -49,44 +46,33 @@ let NestAuthUser = class NestAuthUser extends typeorm_1.BaseEntity {
|
|
|
49
46
|
this.email = this.email.toLowerCase().trim();
|
|
50
47
|
}
|
|
51
48
|
}
|
|
52
|
-
async
|
|
53
|
-
const
|
|
54
|
-
|
|
55
|
-
.map((role) => (0, role_mapper_util_1.getRolePermissionNames)(role))
|
|
56
|
-
.flatten()
|
|
57
|
-
.uniq()
|
|
58
|
-
.value();
|
|
59
|
-
}
|
|
60
|
-
async getRoles(tenantId) {
|
|
61
|
-
const access = await user_access_entity_1.NestAuthUserAccess.findOne({
|
|
62
|
-
where: { userId: this.id, tenantId: tenantId || (0, typeorm_1.IsNull)() },
|
|
63
|
-
relations: ['roles', 'roles.rolePermissions', 'roles.rolePermissions.permission'],
|
|
49
|
+
async getUserAccess(tenantId = null, createIfNotExists = false) {
|
|
50
|
+
const existingUserAccess = await user_access_entity_1.NestAuthUserAccess.findOne({
|
|
51
|
+
where: { userId: this.id, tenantId: tenantId ? (0, typeorm_1.Equal)(tenantId) : (0, typeorm_1.IsNull)() }
|
|
64
52
|
});
|
|
65
|
-
if (
|
|
66
|
-
return
|
|
53
|
+
if (existingUserAccess) {
|
|
54
|
+
return existingUserAccess;
|
|
67
55
|
}
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
? await role_entity_1.NestAuthRole.find({ where: { id: (0, typeorm_2.In)(ids) } })
|
|
75
|
-
: [];
|
|
76
|
-
await access.save();
|
|
56
|
+
if (createIfNotExists) {
|
|
57
|
+
const userAccess = user_access_entity_1.NestAuthUserAccess.create({ userId: this.id, tenantId });
|
|
58
|
+
await userAccess.save();
|
|
59
|
+
return userAccess;
|
|
60
|
+
}
|
|
61
|
+
return null;
|
|
77
62
|
}
|
|
78
|
-
async
|
|
79
|
-
|
|
80
|
-
where: { userId: this.id
|
|
81
|
-
relations: ['roles'],
|
|
63
|
+
async getPlatformAccess(createIfNotExists = false) {
|
|
64
|
+
const existingPlatformAccess = await platform_access_entity_1.NestAuthPlatformAccess.findOne({
|
|
65
|
+
where: { userId: this.id }
|
|
82
66
|
});
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
access = user_access_entity_1.NestAuthUserAccess.create({ userId: this.id, tenantId });
|
|
86
|
-
await access.save();
|
|
87
|
-
access.roles = [];
|
|
67
|
+
if (existingPlatformAccess) {
|
|
68
|
+
return existingPlatformAccess;
|
|
88
69
|
}
|
|
89
|
-
|
|
70
|
+
if (createIfNotExists) {
|
|
71
|
+
const platformAccess = platform_access_entity_1.NestAuthPlatformAccess.create({ userId: this.id });
|
|
72
|
+
await platformAccess.save();
|
|
73
|
+
return platformAccess;
|
|
74
|
+
}
|
|
75
|
+
return null;
|
|
90
76
|
}
|
|
91
77
|
async findOrCreateIdentity(provider, providerId) {
|
|
92
78
|
const existingIdentity = await identity_entity_1.NestAuthIdentity.findOne({
|
|
@@ -160,7 +146,12 @@ let NestAuthUser = class NestAuthUser extends typeorm_1.BaseEntity {
|
|
|
160
146
|
if (!this.passwordHash)
|
|
161
147
|
return false;
|
|
162
148
|
const options = auth_config_service_1.AuthConfigService.getOptions();
|
|
163
|
-
|
|
149
|
+
const hasCustomHash = !!options.password?.hash;
|
|
150
|
+
const hasCustomVerify = !!options.password?.verify;
|
|
151
|
+
if (hasCustomHash !== hasCustomVerify) {
|
|
152
|
+
throw new Error('password.hash and password.verify must be provided together');
|
|
153
|
+
}
|
|
154
|
+
if (hasCustomVerify) {
|
|
164
155
|
return await options.password.verify(password, this.passwordHash);
|
|
165
156
|
}
|
|
166
157
|
try {
|
|
@@ -172,11 +163,20 @@ let NestAuthUser = class NestAuthUser extends typeorm_1.BaseEntity {
|
|
|
172
163
|
}
|
|
173
164
|
async setPassword(password) {
|
|
174
165
|
const options = auth_config_service_1.AuthConfigService.getOptions();
|
|
166
|
+
const hasCustomHash = !!options.password?.hash;
|
|
167
|
+
const hasCustomVerify = !!options.password?.verify;
|
|
168
|
+
if (hasCustomHash !== hasCustomVerify) {
|
|
169
|
+
throw new Error('password.hash and password.verify must be provided together');
|
|
170
|
+
}
|
|
171
|
+
if (hasCustomHash) {
|
|
172
|
+
this.passwordHash = await options.password.hash(password);
|
|
173
|
+
return;
|
|
174
|
+
}
|
|
175
175
|
this.passwordHash = await (0, argon2_1.hash)(password, {
|
|
176
176
|
algorithm: 2,
|
|
177
|
-
memoryCost: 65536,
|
|
178
|
-
timeCost: 3,
|
|
179
|
-
parallelism: 4
|
|
177
|
+
memoryCost: options.password?.argon2?.memoryCost ?? 65536,
|
|
178
|
+
timeCost: options.password?.argon2?.timeCost ?? 3,
|
|
179
|
+
parallelism: options.password?.argon2?.parallelism ?? 4,
|
|
180
180
|
});
|
|
181
181
|
}
|
|
182
182
|
};
|
|
@@ -245,14 +245,14 @@ __decorate([
|
|
|
245
245
|
(0, typeorm_1.OneToMany)(() => otp_entity_1.NestAuthOTP, otp => otp.user),
|
|
246
246
|
__metadata("design:type", Array)
|
|
247
247
|
], NestAuthUser.prototype, "otps", void 0);
|
|
248
|
-
__decorate([
|
|
249
|
-
(0, typeorm_1.ManyToMany)(() => role_entity_1.NestAuthRole, role => role.users, { onDelete: 'CASCADE' }),
|
|
250
|
-
__metadata("design:type", Array)
|
|
251
|
-
], NestAuthUser.prototype, "roles", void 0);
|
|
252
248
|
__decorate([
|
|
253
249
|
(0, typeorm_1.OneToMany)(() => user_access_entity_1.NestAuthUserAccess, access => access.user),
|
|
254
250
|
__metadata("design:type", Array)
|
|
255
251
|
], NestAuthUser.prototype, "userAccesses", void 0);
|
|
252
|
+
__decorate([
|
|
253
|
+
(0, typeorm_1.OneToOne)(() => platform_access_entity_1.NestAuthPlatformAccess, access => access.user),
|
|
254
|
+
__metadata("design:type", platform_access_entity_1.NestAuthPlatformAccess)
|
|
255
|
+
], NestAuthUser.prototype, "platformAccess", void 0);
|
|
256
256
|
__decorate([
|
|
257
257
|
(0, typeorm_1.CreateDateColumn)(),
|
|
258
258
|
__metadata("design:type", Date)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.entity.js","sourceRoot":"","sources":["../../../../src/lib/user/entities/user.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"user.entity.js","sourceRoot":"","sources":["../../../../src/lib/user/entities/user.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access-key.service.d.ts","sourceRoot":"","sources":["../../../../src/lib/user/services/access-key.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAItD,qBACa,gBAAgB;IAGrB,OAAO,CAAC,mBAAmB;IAG3B,OAAO,CAAC,cAAc;IAEtB,OAAO,CAAC,YAAY;gBALZ,mBAAmB,EAAE,UAAU,CAAC,iBAAiB,CAAC,EAGlD,cAAc,EAAE,UAAU,CAAC,YAAY,CAAC,EAExC,YAAY,EAAE,aAAa;IAGvC,OAAO,CAAC,eAAe;IAMjB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAgCzE,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"access-key.service.d.ts","sourceRoot":"","sources":["../../../../src/lib/user/services/access-key.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAItD,qBACa,gBAAgB;IAGrB,OAAO,CAAC,mBAAmB;IAG3B,OAAO,CAAC,cAAc;IAEtB,OAAO,CAAC,YAAY;gBALZ,mBAAmB,EAAE,UAAU,CAAC,iBAAiB,CAAC,EAGlD,cAAc,EAAE,UAAU,CAAC,YAAY,CAAC,EAExC,YAAY,EAAE,aAAa;IAGvC,OAAO,CAAC,eAAe;IAMjB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAgCzE,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAoC3D,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK1E,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAO/D,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAkBlE,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMzD,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAMlF,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAc1D"}
|
|
@@ -62,9 +62,10 @@ let AccessKeyService = class AccessKeyService {
|
|
|
62
62
|
where: { publicKey },
|
|
63
63
|
relations: [
|
|
64
64
|
'user',
|
|
65
|
-
'user.
|
|
66
|
-
'user.roles
|
|
67
|
-
'user.roles.rolePermissions
|
|
65
|
+
'user.userAccesses',
|
|
66
|
+
'user.userAccesses.roles',
|
|
67
|
+
'user.userAccesses.roles.rolePermissions',
|
|
68
|
+
'user.userAccesses.roles.rolePermissions.permission',
|
|
68
69
|
],
|
|
69
70
|
});
|
|
70
71
|
if (!accessKey) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access-key.service.js","sourceRoot":"","sources":["../../../../src/lib/user/services/access-key.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoF;AACpF,6CAAmD;AACnD,qCAAqC;AACrC,qEAAkE;AAClE,yDAAuD;AACvD,yDAAsD;AACtD,mCAAiD;AACjD,yDAAsD;AAG/C,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAGb;IAGA;IAEA;IAPZ,YAEY,mBAAkD,EAGlD,cAAwC,EAExC,YAA2B;QAL3B,wBAAmB,GAAnB,mBAAmB,CAA+B;QAGlD,mBAAc,GAAd,cAAc,CAA0B;QAExC,iBAAY,GAAZ,YAAY,CAAe;IACnC,CAAC;IAEG,eAAe;QACnB,MAAM,UAAU,GAAG,IAAA,oBAAW,EAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACnD,MAAM,SAAS,GAAG,IAAA,mBAAU,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACxE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,MAAc,EAAE,IAAY;QAC9C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QAC1E,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,MAAM,IAAI,0BAAiB,CAAC;gBACxB,OAAO,EAAE,gBAAgB,MAAM,YAAY;gBAC3C,IAAI,EAAE,gBAAgB;aACzB,CAAC,CAAC;QACP,CAAC;QAED,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAEzD,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC;YAC9C,IAAI;YACJ,SAAS;YACT,UAAU;YACV,MAAM;SACT,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAGhE,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAC7B,+BAAc,CAAC,kBAAkB,EACjC;YACI,SAAS,EAAE,QAAQ;YACnB,MAAM;SACT,CACJ,CAAC;QAEF,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,SAAiB;QAChC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC;YACrD,KAAK,EAAE,EAAE,SAAS,EAAE;YACpB,SAAS,EAAE;gBACP,MAAM;gBACN,
|
|
1
|
+
{"version":3,"file":"access-key.service.js","sourceRoot":"","sources":["../../../../src/lib/user/services/access-key.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { EventEmitter2 } from '@nestjs/event-emitter';
|
|
|
4
4
|
import { TenantService } from '../../tenant';
|
|
5
5
|
import { DebugLoggerService } from '../../core/services/debug-logger.service';
|
|
6
6
|
import { AuthConfigService } from '../../core/services/auth-config.service';
|
|
7
|
-
import { NestAuthUserAccess } from '
|
|
7
|
+
import { NestAuthUserAccess } from '../entities/user-access.entity';
|
|
8
8
|
import { NestAuthTenant } from '../../tenant/entities/tenant.entity';
|
|
9
9
|
export declare class UserService {
|
|
10
10
|
private readonly userRepository;
|
|
@@ -19,7 +19,6 @@ export declare class UserService {
|
|
|
19
19
|
getUserByEmail(email: string, tenantId?: string, options?: FindOneOptions<NestAuthUser>): Promise<NestAuthUser>;
|
|
20
20
|
getUserByPhone(phone: string, tenantId?: string, options?: FindOneOptions<NestAuthUser>): Promise<NestAuthUser>;
|
|
21
21
|
getUsers(options?: FindManyOptions<NestAuthUser>): Promise<NestAuthUser[]>;
|
|
22
|
-
getUsersByTenant(tenantId: string, options?: FindManyOptions<NestAuthUser>): Promise<NestAuthUser[]>;
|
|
23
22
|
updateUser(id: string, data: Partial<NestAuthUser>): Promise<NestAuthUser>;
|
|
24
23
|
ensureUserAccess(userId: string, tenantId: string): Promise<NestAuthUserAccess>;
|
|
25
24
|
isUserInTenant(userId: string, tenantId: string): Promise<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.d.ts","sourceRoot":"","sources":["../../../../src/lib/user/services/user.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"user.service.d.ts","sourceRoot":"","sources":["../../../../src/lib/user/services/user.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ const user_created_event_1 = require("../events/user-created.event");
|
|
|
25
25
|
const tenant_1 = require("../../tenant");
|
|
26
26
|
const debug_logger_service_1 = require("../../core/services/debug-logger.service");
|
|
27
27
|
const auth_config_service_1 = require("../../core/services/auth-config.service");
|
|
28
|
-
const user_access_entity_1 = require("
|
|
28
|
+
const user_access_entity_1 = require("../entities/user-access.entity");
|
|
29
29
|
const role_entity_1 = require("../../role/entities/role.entity");
|
|
30
30
|
const nest_auth_contracts_1 = require("@ackplus/nest-auth-contracts");
|
|
31
31
|
const utils_1 = require("../../utils");
|
|
@@ -45,19 +45,14 @@ let UserService = class UserService {
|
|
|
45
45
|
this.debugLogger = debugLogger;
|
|
46
46
|
}
|
|
47
47
|
async createUser(data, tenantId, context) {
|
|
48
|
-
this.debugLogger.logFunctionEntry('createUser', 'UserService', { email: data.email, phone: data.phone, hasPassword: !!data.password });
|
|
49
48
|
const config = this.authConfigService.getConfig();
|
|
50
49
|
try {
|
|
51
50
|
const email = (0, utils_1.normalizedEmail)(data.email);
|
|
52
51
|
const phone = (0, utils_1.normalizedPhone)(data.phone);
|
|
53
|
-
|
|
54
|
-
if (config.tenant?.enabled && config.tenant?.mode === nest_auth_contracts_1.TenantModeEnum.ISOLATED) {
|
|
55
|
-
await this.tenantService.resolveTenantId(tenantId);
|
|
56
|
-
}
|
|
52
|
+
await this.tenantService.resolveTenantId(tenantId);
|
|
57
53
|
if (email) {
|
|
58
54
|
const existingUser = await this.getUserByEmail(email, tenantId);
|
|
59
55
|
if (existingUser) {
|
|
60
|
-
this.debugLogger.warn('User with email already exists', 'UserService', { email, tenantId });
|
|
61
56
|
throw new common_1.ConflictException({
|
|
62
57
|
message: 'User with this email already exists',
|
|
63
58
|
code: 'USER_ALREADY_EXISTS'
|
|
@@ -67,7 +62,6 @@ let UserService = class UserService {
|
|
|
67
62
|
if (phone) {
|
|
68
63
|
const existingUser = await this.getUserByPhone(phone, tenantId);
|
|
69
64
|
if (existingUser) {
|
|
70
|
-
this.debugLogger.warn('User with phone already exists', 'UserService', { phone, tenantId });
|
|
71
65
|
throw new common_1.ConflictException({
|
|
72
66
|
message: 'User with this phone number already exists',
|
|
73
67
|
code: 'USER_ALREADY_EXISTS'
|
|
@@ -78,7 +72,6 @@ let UserService = class UserService {
|
|
|
78
72
|
this.debugLogger.debug('Applying user.beforeCreate hook', 'UserService');
|
|
79
73
|
data = await config.user.beforeCreate?.(data, context) ?? data;
|
|
80
74
|
}
|
|
81
|
-
this.debugLogger.debug('Creating new user entity', 'UserService');
|
|
82
75
|
const user = this.userRepository.create({
|
|
83
76
|
...data,
|
|
84
77
|
...(email != null && { email: email }),
|
|
@@ -88,9 +81,7 @@ let UserService = class UserService {
|
|
|
88
81
|
await user.setPassword(data.password);
|
|
89
82
|
}
|
|
90
83
|
await this.userRepository.save(user);
|
|
91
|
-
|
|
92
|
-
await this.ensureUserAccess(user.id, tenantId);
|
|
93
|
-
}
|
|
84
|
+
await this.ensureUserAccess(user.id, tenantId);
|
|
94
85
|
this.debugLogger.info('User created successfully', 'UserService', { userId: user.id });
|
|
95
86
|
if (email && config.emailAuth?.enabled !== false) {
|
|
96
87
|
await user.findOrCreateIdentity(auth_constants_1.EMAIL_AUTH_PROVIDER, email);
|
|
@@ -98,14 +89,12 @@ let UserService = class UserService {
|
|
|
98
89
|
if (phone && config.phoneAuth?.enabled === true) {
|
|
99
90
|
await user.findOrCreateIdentity(auth_constants_1.PHONE_AUTH_PROVIDER, phone);
|
|
100
91
|
}
|
|
101
|
-
this.debugLogger.debug('Emitting user created event', 'UserService', { userId: user.id });
|
|
102
92
|
await this.eventEmitter.emitAsync(auth_constants_1.NestAuthEvents.USER_CREATED, new user_created_event_1.UserCreatedEvent({
|
|
103
93
|
user,
|
|
104
94
|
input: context,
|
|
105
95
|
tenantId: tenantId
|
|
106
96
|
}));
|
|
107
97
|
if (config.user?.afterCreate) {
|
|
108
|
-
this.debugLogger.debug('Applying user.afterCreate hook', 'UserService', { userId: user.id });
|
|
109
98
|
await config.user.afterCreate?.(user, context);
|
|
110
99
|
}
|
|
111
100
|
this.debugLogger.logFunctionExit('createUser', 'UserService', { userId: user.id });
|
|
@@ -117,9 +106,7 @@ let UserService = class UserService {
|
|
|
117
106
|
}
|
|
118
107
|
}
|
|
119
108
|
async getUserById(id, options) {
|
|
120
|
-
this.debugLogger.debug('Getting user by ID', 'UserService', { userId: id });
|
|
121
109
|
if (!id) {
|
|
122
|
-
this.debugLogger.warn('No user ID provided', 'UserService');
|
|
123
110
|
return null;
|
|
124
111
|
}
|
|
125
112
|
const user = await this.userRepository.findOne({
|
|
@@ -130,7 +117,6 @@ let UserService = class UserService {
|
|
|
130
117
|
this.debugLogger.warn('User not found', 'UserService', { userId: id });
|
|
131
118
|
return null;
|
|
132
119
|
}
|
|
133
|
-
this.debugLogger.debug('User found', 'UserService', { userId: user.id });
|
|
134
120
|
return user;
|
|
135
121
|
}
|
|
136
122
|
async getUserByEmail(email, tenantId, options) {
|
|
@@ -140,20 +126,15 @@ let UserService = class UserService {
|
|
|
140
126
|
this.debugLogger.warn('No email provided for user lookup', 'UserService');
|
|
141
127
|
return null;
|
|
142
128
|
}
|
|
129
|
+
const tenantRequired = await this.tenantService.checkRequiredTenant(tenantId);
|
|
143
130
|
const user = await this.userRepository.findOne({
|
|
144
131
|
...(options ? options : {}),
|
|
145
132
|
relations: ['userAccesses', ...(Array.isArray(options?.relations) ? options.relations : [])],
|
|
146
133
|
where: {
|
|
147
134
|
email: emailNorm,
|
|
148
|
-
...(
|
|
135
|
+
...(tenantRequired ? { userAccesses: { tenantId: tenantId } } : {}),
|
|
149
136
|
},
|
|
150
137
|
});
|
|
151
|
-
if (user) {
|
|
152
|
-
this.debugLogger.debug('User found by email', 'UserService', { userId: user.id });
|
|
153
|
-
}
|
|
154
|
-
else {
|
|
155
|
-
this.debugLogger.debug('No user found with email', 'UserService');
|
|
156
|
-
}
|
|
157
138
|
return user;
|
|
158
139
|
}
|
|
159
140
|
async getUserByPhone(phone, tenantId, options) {
|
|
@@ -163,44 +144,25 @@ let UserService = class UserService {
|
|
|
163
144
|
this.debugLogger.warn('No phone provided for user lookup', 'UserService');
|
|
164
145
|
return null;
|
|
165
146
|
}
|
|
147
|
+
const tenantRequired = await this.tenantService.checkRequiredTenant(tenantId);
|
|
166
148
|
const user = await this.userRepository.findOne({
|
|
167
149
|
...(options ? options : {}),
|
|
168
150
|
relations: ['userAccesses', ...(Array.isArray(options?.relations) ? options.relations : [])],
|
|
169
151
|
where: {
|
|
170
152
|
phone: phoneNorm,
|
|
171
|
-
...(
|
|
153
|
+
...(tenantRequired ? { userAccesses: { tenantId: tenantId } } : {}),
|
|
172
154
|
},
|
|
173
155
|
});
|
|
174
|
-
if (user) {
|
|
175
|
-
this.debugLogger.debug('User found by phone', 'UserService', { userId: user.id });
|
|
176
|
-
}
|
|
177
|
-
else {
|
|
178
|
-
this.debugLogger.debug('No user found with phone', 'UserService');
|
|
179
|
-
}
|
|
180
156
|
return user;
|
|
181
157
|
}
|
|
182
158
|
async getUsers(options) {
|
|
183
159
|
return this.userRepository.find(options);
|
|
184
160
|
}
|
|
185
|
-
async getUsersByTenant(tenantId, options) {
|
|
186
|
-
const relations = Array.isArray(options?.relations)
|
|
187
|
-
? Array.from(new Set([...(options?.relations || []), 'userAccesses']))
|
|
188
|
-
: options?.relations;
|
|
189
|
-
return this.userRepository.find({
|
|
190
|
-
...(options ? options : {}),
|
|
191
|
-
relations,
|
|
192
|
-
where: {
|
|
193
|
-
...(options?.where ? options.where : {}),
|
|
194
|
-
userAccesses: { tenantId: tenantId },
|
|
195
|
-
},
|
|
196
|
-
});
|
|
197
|
-
}
|
|
198
161
|
async updateUser(id, data) {
|
|
199
162
|
this.debugLogger.logFunctionEntry('updateUser', 'UserService', { userId: id, fields: Object.keys(data) });
|
|
200
163
|
try {
|
|
201
164
|
const user = await this.getUserById(id);
|
|
202
165
|
if (!user) {
|
|
203
|
-
this.debugLogger.error('User not found for update', 'UserService', { userId: id });
|
|
204
166
|
throw new common_1.NotFoundException({
|
|
205
167
|
message: `User with ID ${id} not found`,
|
|
206
168
|
code: 'USER_NOT_FOUND'
|
|
@@ -208,7 +170,6 @@ let UserService = class UserService {
|
|
|
208
170
|
}
|
|
209
171
|
if (data.email || data.phone) {
|
|
210
172
|
const config = this.authConfigService.getConfig();
|
|
211
|
-
this.debugLogger.debug('Checking for conflicts during user update', 'UserService', { userId: id, email: !!data.email, phone: !!data.phone });
|
|
212
173
|
const userWithMemberships = await this.getUserById(id, {
|
|
213
174
|
relations: ['userAccesses'],
|
|
214
175
|
});
|
|
@@ -236,17 +197,15 @@ let UserService = class UserService {
|
|
|
236
197
|
}
|
|
237
198
|
}
|
|
238
199
|
if (existingUser) {
|
|
239
|
-
this.debugLogger.warn('Conflict detected during user update', 'UserService', { userId: id, conflictingUserId: existingUser.id });
|
|
240
200
|
throw new common_1.ConflictException({
|
|
241
201
|
message: `User with ${data.email ? `email ${data.email}` : ''}${data.email && data.phone ? ' or ' : ''}${data.phone ? `phone ${data.phone}` : ''} already exists.`,
|
|
242
|
-
code:
|
|
202
|
+
code: auth_constants_1.ERROR_CODES.USER_ALREADY_EXISTS,
|
|
243
203
|
});
|
|
244
204
|
}
|
|
245
205
|
}
|
|
246
206
|
this.debugLogger.debug('Updating user data', 'UserService', { userId: id, fields: Object.keys(data) });
|
|
247
207
|
Object.assign(user, data);
|
|
248
208
|
const updatedUser = await this.userRepository.save(user);
|
|
249
|
-
this.debugLogger.info('User updated successfully', 'UserService', { userId: updatedUser.id });
|
|
250
209
|
const updateConfig = this.authConfigService.getConfig();
|
|
251
210
|
if (data.email && updateConfig.emailAuth?.enabled !== false) {
|
|
252
211
|
this.debugLogger.debug('Updating email identity', 'UserService', { userId: id });
|
|
@@ -265,24 +224,26 @@ let UserService = class UserService {
|
|
|
265
224
|
return updatedUser;
|
|
266
225
|
}
|
|
267
226
|
catch (error) {
|
|
268
|
-
this.debugLogger.logError(error, 'updateUser', { userId: id, fields: Object.keys(data) });
|
|
269
227
|
throw error;
|
|
270
228
|
}
|
|
271
229
|
}
|
|
272
230
|
async ensureUserAccess(userId, tenantId) {
|
|
273
|
-
if (!userId
|
|
274
|
-
|
|
275
|
-
|
|
231
|
+
if (!userId) {
|
|
232
|
+
throw new common_1.BadRequestException({
|
|
233
|
+
message: 'User ID is required',
|
|
234
|
+
code: 'USER_ID_REQUIRED'
|
|
235
|
+
});
|
|
276
236
|
}
|
|
237
|
+
const tenantRequired = await this.tenantService.checkRequiredTenant(tenantId);
|
|
277
238
|
const existing = await this.userAccessRepository.findOne({
|
|
278
|
-
where: { userId, tenantId }
|
|
239
|
+
where: { userId, ...(tenantRequired ? { tenantId: tenantId } : {}) }
|
|
279
240
|
});
|
|
280
241
|
if (existing) {
|
|
281
242
|
return existing;
|
|
282
243
|
}
|
|
283
244
|
const access = this.userAccessRepository.create({
|
|
284
245
|
userId,
|
|
285
|
-
tenantId,
|
|
246
|
+
...tenantId ? { tenantId } : {},
|
|
286
247
|
});
|
|
287
248
|
return await this.userAccessRepository.save(access);
|
|
288
249
|
}
|
|
@@ -301,7 +262,7 @@ let UserService = class UserService {
|
|
|
301
262
|
}
|
|
302
263
|
async setUserAccessRoles(userId, tenantId, roleIds) {
|
|
303
264
|
let access = await this.userAccessRepository.findOne({
|
|
304
|
-
where: { userId, tenantId: tenantId },
|
|
265
|
+
where: { userId, tenantId: tenantId || (0, typeorm_2.IsNull)() },
|
|
305
266
|
relations: ['roles'],
|
|
306
267
|
});
|
|
307
268
|
if (!access) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../../src/lib/user/services/user.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../../src/lib/user/services/user.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAuG;AACvG,6CAAmD;AACnD,qCAAuF;AACvF,yDAAuD;AACvD,yDAAsD;AACtD,yDAA6G;AAC7G,qEAAgE;AAChE,qEAAgE;AAChE,qEAAgE;AAChE,yCAA6C;AAC7C,mFAA8E;AAC9E,iFAA4E;AAC5E,uEAAoE;AAEpE,iEAA+D;AAC/D,sEAA8D;AAC9D,uCAA+D;AAGxD,IAAM,WAAW,GAAjB,MAAM,WAAW;IAGC;IAEA;IACA;IACA;IACA;IACA;IARrB,YAEqB,cAAwC,EAExC,oBAAoD,EACpD,aAA4B,EAC5B,YAA2B,EAC3B,iBAAoC,EACpC,WAA+B;QAN/B,mBAAc,GAAd,cAAc,CAA0B;QAExC,yBAAoB,GAApB,oBAAoB,CAAgC;QACpD,kBAAa,GAAb,aAAa,CAAe;QAC5B,iBAAY,GAAZ,YAAY,CAAe;QAC3B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,gBAAW,GAAX,WAAW,CAAoB;IAChD,CAAC;IAEL,KAAK,CAAC,UAAU,CAAC,IAA2B,EAAE,QAAiB,EAAE,OAAa;QAC1E,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,CAAC;QAElD,IAAI,CAAC;YACD,MAAM,KAAK,GAAG,IAAA,uBAAe,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC1C,MAAM,KAAK,GAAG,IAAA,uBAAe,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAE1C,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;YAGnD,IAAI,KAAK,EAAE,CAAC;gBACR,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;gBAChE,IAAI,YAAY,EAAE,CAAC;oBACf,MAAM,IAAI,0BAAiB,CAAC;wBACxB,OAAO,EAAE,qCAAqC;wBAC9C,IAAI,EAAE,qBAAqB;qBAC9B,CAAC,CAAC;gBACP,CAAC;YACL,CAAC;YAED,IAAI,KAAK,EAAE,CAAC;gBACR,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;gBAChE,IAAI,YAAY,EAAE,CAAC;oBACf,MAAM,IAAI,0BAAiB,CAAC;wBACxB,OAAO,EAAE,4CAA4C;wBACrD,IAAI,EAAE,qBAAqB;qBAC9B,CAAC,CAAC;gBACP,CAAC;YACL,CAAC;YAGD,IAAI,MAAM,CAAC,IAAI,EAAE,YAAY,EAAE,CAAC;gBAC5B,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,iCAAiC,EAAE,aAAa,CAAC,CAAC;gBACzE,IAAI,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC;YACnE,CAAC;YAED,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;gBACpC,GAAG,IAAI;gBACP,GAAG,CAAC,KAAK,IAAI,IAAI,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;gBACtC,GAAG,CAAC,KAAK,IAAI,IAAI,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;aACzC,CAAC,CAAC;YAGH,IAAK,IAAY,CAAC,QAAQ,EAAE,CAAC;gBACzB,MAAM,IAAI,CAAC,WAAW,CAAE,IAAY,CAAC,QAAQ,CAAC,CAAC;YACnD,CAAC;YAED,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAErC,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;YAE/C,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,2BAA2B,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;YAGvF,IAAI,KAAK,IAAI,MAAM,CAAC,SAAS,EAAE,OAAO,KAAK,KAAK,EAAE,CAAC;gBAC/C,MAAM,IAAI,CAAC,oBAAoB,CAAC,oCAAmB,EAAE,KAAK,CAAC,CAAC;YAChE,CAAC;YAED,IAAI,KAAK,IAAI,MAAM,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,EAAE,CAAC;gBAC9C,MAAM,IAAI,CAAC,oBAAoB,CAAC,oCAAmB,EAAE,KAAK,CAAC,CAAC;YAChE,CAAC;YAGD,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAC7B,+BAAc,CAAC,YAAY,EAC3B,IAAI,qCAAgB,CAAC;gBACjB,IAAI;gBACJ,KAAK,EAAE,OAAO;gBACd,QAAQ,EAAE,QAAQ;aACrB,CAAC,CACL,CAAC;YAGF,IAAI,MAAM,CAAC,IAAI,EAAE,WAAW,EAAE,CAAC;gBAC3B,MAAM,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACnD,CAAC;YAED,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,YAAY,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;YACnF,OAAO,IAAI,CAAC;QAEhB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;YACzF,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,EAAU,EAAE,OAAsC;QAChE,IAAI,CAAC,EAAE,EAAE,CAAC;YACN,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;YAC3C,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3B,KAAK,EAAE,EAAE,EAAE,EAAE;SAChB,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,gBAAgB,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;YACvE,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,KAAa,EAAE,QAAiB,EAAE,OAAsC;QACzF,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,uBAAuB,EAAE,aAAa,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;QAE7F,MAAM,SAAS,GAAG,IAAA,uBAAe,EAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,mCAAmC,EAAE,aAAa,CAAC,CAAC;YAC1E,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAE9E,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;YAC3C,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3B,SAAS,EAAE,CAAC,cAAc,EAAE,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC5F,KAAK,EAAE;gBACH,KAAK,EAAE,SAAS;gBAChB,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACtE;SACJ,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,KAAa,EAAE,QAAiB,EAAE,OAAsC;QACzF,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,uBAAuB,EAAE,aAAa,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;QAE7F,MAAM,SAAS,GAAG,IAAA,uBAAe,EAAC,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,mCAAmC,EAAE,aAAa,CAAC,CAAC;YAC1E,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAE9E,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;YAC3C,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3B,SAAS,EAAE,CAAC,cAAc,EAAE,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC5F,KAAK,EAAE;gBACH,KAAK,EAAE,SAAS;gBAChB,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACtE;SACJ,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAuC;QAClD,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAU,EAAE,IAA2B;QACpD,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,YAAY,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE1G,IAAI,CAAC;YACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YAExC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACR,MAAM,IAAI,0BAAiB,CAAC;oBACxB,OAAO,EAAE,gBAAgB,EAAE,YAAY;oBACvC,IAAI,EAAE,gBAAgB;iBACzB,CAAC,CAAC;YACP,CAAC;YAGD,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,CAAC;gBAElD,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE;oBACnD,SAAS,EAAE,CAAC,cAAc,CAAC;iBAC9B,CAAC,CAAC;gBAEH,IAAI,QAAQ,GAAG,IAAI,CAAC;gBACpB,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,KAAK,oCAAc,CAAC,QAAQ,EAAE,CAAC;oBAClD,QAAQ,GAAG,mBAAmB,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC;gBAChE,CAAC;gBAED,IAAI,YAAY,GAAwB,IAAI,CAAC;gBAE7C,MAAM,KAAK,GAAG,IAAA,uBAAe,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC1C,MAAM,KAAK,GAAG,IAAA,uBAAe,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC1C,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI;oBAAE,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;gBAC3C,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI;oBAAE,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;gBAE3C,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;oBAChB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBACnF,IAAI,WAAW,IAAI,WAAW,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;wBACvC,YAAY,GAAG,WAAW,CAAC;oBAC/B,CAAC;gBACL,CAAC;gBAED,IAAI,CAAC,YAAY,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;oBACjC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBACnF,IAAI,WAAW,IAAI,WAAW,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;wBACvC,YAAY,GAAG,WAAW,CAAC;oBAC/B,CAAC;gBACL,CAAC;gBAED,IAAI,YAAY,EAAE,CAAC;oBACf,MAAM,IAAI,0BAAiB,CAAC;wBACxB,OAAO,EAAE,aAAa,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,kBAAkB;wBAClK,IAAI,EAAE,4BAAW,CAAC,mBAAmB;qBACxC,CAAC,CAAC;gBACP,CAAC;YACL,CAAC;YAGD,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,oBAAoB,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACvG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAC1B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEzD,MAAM,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,CAAC;YACxD,IAAI,IAAI,CAAC,KAAK,IAAI,YAAY,CAAC,SAAS,EAAE,OAAO,KAAK,KAAK,EAAE,CAAC;gBAC1D,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,yBAAyB,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;gBACjF,MAAM,IAAI,CAAC,sBAAsB,CAAC,oCAAmB,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;YACvF,CAAC;YAED,IAAI,IAAI,CAAC,KAAK,IAAI,YAAY,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,EAAE,CAAC;gBACzD,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,yBAAyB,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;gBACjF,MAAM,IAAI,CAAC,sBAAsB,CAAC,oCAAmB,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;YACvF,CAAC;YAGD,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,6BAA6B,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC;YACjG,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAC7B,+BAAc,CAAC,YAAY,EAC3B,IAAI,qCAAgB,CAAC;gBACjB,IAAI,EAAE,WAAW;gBACjB,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;aACnC,CAAC,CACL,CAAC;YAEF,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,YAAY,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC;YAC1F,OAAO,WAAW,CAAC;QAEvB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,MAAc,EACd,QAAgB;QAEhB,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,4BAAmB,CAAC;gBAC1B,OAAO,EAAE,qBAAqB;gBAC9B,IAAI,EAAE,kBAAkB;aAC3B,CAAC,CAAC;QACP,CAAC;QAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAE9E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC;YACrD,KAAK,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE;SACvE,CAAC,CAAC;QAEH,IAAI,QAAQ,EAAE,CAAC;YACX,OAAO,QAAQ,CAAC;QACpB,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC;YAC5C,MAAM;YACN,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE;SAClC,CAAC,CAAC;QACH,OAAO,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,MAAc,EAAE,QAAgB;QACjD,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;YACvB,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,GAAG,CAAC;aAC3D,SAAS,CAAC,gBAAgB,EAAE,GAAG,EAAE,wBAAwB,EAAE;YACxD,QAAQ;SACX,CAAC;aACD,KAAK,CAAC,gBAAgB,EAAE,EAAE,MAAM,EAAE,CAAC;aACnC,MAAM,CAAC,MAAM,CAAC;aACd,SAAS,EAAE,CAAC;QACjB,OAAO,CAAC,CAAC,MAAM,CAAC;IACpB,CAAC;IAKD,KAAK,CAAC,kBAAkB,CACpB,MAAc,EACd,QAAgB,EAChB,OAAiB;QAEjB,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC;YACjD,KAAK,EAAE,EAAE,MAAM,EAAG,QAAQ,EAAE,QAAQ,IAAI,IAAA,gBAAM,GAAE,EAAE;YAClD,SAAS,EAAE,CAAC,OAAO,CAAC;SACvB,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC3D,CAAC;QACD,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;YACnB,MAAM,CAAC,KAAK,GAAG,EAAE,CAAC;QACtB,CAAC;aAAM,CAAC;YACJ,MAAM,YAAY,GAAG,MAAM,0BAAY,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,IAAA,YAAE,EAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;YAC7E,MAAM,CAAC,KAAK,GAAG,YAAY,CAAC;QAChC,CAAC;QACD,OAAO,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,MAAc;QAC/B,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,OAAO,EAAE,CAAC;QACd,CAAC;QACD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC;YACpD,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;YACjC,SAAS,EAAE,CAAC,QAAQ,CAAC;SACxB,CAAC,CAAC;QACH,OAAO,UAAU;aACZ,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;aAClB,MAAM,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC;IAKD,KAAK,CAAC,gBAAgB,CAAC,MAAc,EAAE,QAAgB;QACnD,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;YACvB,OAAO;QACX,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC;YACnD,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;SAC9B,CAAC,CAAC;QACH,IAAI,MAAM,EAAE,CAAC;YACT,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC/C,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,qBAAqB,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QACvF,CAAC;IACL,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAU;QACvB,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,YAAY,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;QAE/E,IAAI,CAAC;YACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YAExC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACR,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,6BAA6B,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;gBACrF,MAAM,IAAI,0BAAiB,CAAC;oBACxB,OAAO,EAAE,gBAAgB,EAAE,YAAY;oBACvC,IAAI,EAAE,gBAAgB;iBACzB,CAAC,CAAC;YACP,CAAC;YAGD,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,6BAA6B,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;YACrF,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAC7B,+BAAc,CAAC,YAAY,EAC3B,IAAI,qCAAgB,CAAC;gBACjB,IAAI;aACP,CAAC,CACL,CAAC;YAEF,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,6BAA6B,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;YACrF,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACvC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,2BAA2B,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;YAElF,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,YAAY,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;QAElF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;YAC/D,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAU,EAAE,gBAA6C;QACtE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAExC,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,MAAM,IAAI,0BAAiB,CAAC;gBACxB,OAAO,EAAE,gBAAgB,EAAE,YAAY;gBACvC,IAAI,EAAE,gBAAgB;aACzB,CAAC,CAAC;QACP,CAAC;QAED,IAAI,gBAAgB,KAAK,OAAO,EAAE,CAAC;YAC/B,IAAI,CAAC,eAAe,GAAG,IAAI,IAAI,EAAE,CAAC;QACtC,CAAC;aAAM,IAAI,gBAAgB,KAAK,OAAO,EAAE,CAAC;YACtC,IAAI,CAAC,eAAe,GAAG,IAAI,IAAI,EAAE,CAAC;QACtC,CAAC;QAED,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QAEvB,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,EAAU,EAAE,gBAA6C;QACxE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAExC,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,MAAM,IAAI,0BAAiB,CAAC;gBACxB,OAAO,EAAE,gBAAgB,EAAE,YAAY;gBACvC,IAAI,EAAE,gBAAgB;aACzB,CAAC,CAAC;QACP,CAAC;QAED,IAAI,gBAAgB,KAAK,OAAO,EAAE,CAAC;YAC/B,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAChC,CAAC;aAAM,IAAI,gBAAgB,KAAK,OAAO,EAAE,CAAC;YACtC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAChC,CAAC;QAED,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QAGxB,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,eAAe,CAAC,CAAC;QAExE,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,EAAU,EAAE,QAAiB;QAChD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAExC,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,MAAM,IAAI,0BAAiB,CAAC;gBACxB,OAAO,EAAE,gBAAgB,EAAE,YAAY;gBACvC,IAAI,EAAE,gBAAgB;aACzB,CAAC,CAAC;QACP,CAAC;QAED,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAGzD,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,6CAA6C,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC/G,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAC7B,+BAAc,CAAC,YAAY,EAC3B,IAAI,qCAAgB,CAAC;YACjB,IAAI,EAAE,WAAW;YACjB,aAAa,EAAE,CAAC,UAAU,CAAC;SAC9B,CAAC,CACL,CAAC;QAEF,OAAO,WAAW,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,EAAU,EAAE,QAA6B;QAC9D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAExC,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,MAAM,IAAI,0BAAiB,CAAC;gBACxB,OAAO,EAAE,gBAAgB,EAAE,YAAY;gBACvC,IAAI,EAAE,gBAAgB;aACzB,CAAC,CAAC;QACP,CAAC;QAED,IAAI,CAAC,QAAQ,GAAG;YACZ,GAAG,IAAI,CAAC,QAAQ;YAChB,GAAG,QAAQ;SACd,CAAC;QAEF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAGzD,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,wCAAwC,EAAE,aAAa,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;QAChG,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAC7B,+BAAc,CAAC,YAAY,EAC3B,IAAI,qCAAgB,CAAC;YACjB,IAAI,EAAE,WAAW;YACjB,aAAa,EAAE,CAAC,UAAU,CAAC;SAC9B,CAAC,CACL,CAAC;QAEF,OAAO,WAAW,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,OAAuC;QACpD,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,OAAuC;QAC1D,OAAO,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,QAAgB,EAAE,KAAa,EAAE,QAAiB;QACnE,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,uBAAuB,EAAE,aAAa,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;QAEpF,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc;aACjC,kBAAkB,CAAC,MAAM,CAAC;aAC1B,SAAS,CAAC,mBAAmB,EAAE,GAAG,CAAC;aACnC,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,+CAA+C,EAAE;YAC3E,QAAQ;YACR,KAAK;SACR,CAAC,CAAA;QAEN,IAAI,QAAQ,EAAE,CAAC;YACX,UAAU,CAAC,QAAQ,CAAC,wBAAwB,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QAChE,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,OAAO,EAAE,CAAC;QAEzC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,uBAAuB,EAAE,aAAa,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QAClG,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ,CAAA;AA/fY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;IAGJ,WAAA,IAAA,0BAAgB,EAAC,0BAAY,CAAC,CAAA;IAE9B,WAAA,IAAA,0BAAgB,EAAC,uCAAkB,CAAC,CAAA;qCADJ,oBAAU;QAEJ,oBAAU;QACjB,sBAAa;QACd,6BAAa;QACR,uCAAiB;QACvB,yCAAkB;GAT3C,WAAW,CA+fvB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.module.d.ts","sourceRoot":"","sources":["../../../src/lib/user/user.module.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"user.module.d.ts","sourceRoot":"","sources":["../../../src/lib/user/user.module.ts"],"names":[],"mappings":"AAYA,qBAea,UAAU;CAAI"}
|
|
@@ -16,14 +16,15 @@ const auth_module_1 = require("../auth/auth.module");
|
|
|
16
16
|
const access_key_entity_1 = require("./entities/access-key.entity");
|
|
17
17
|
const identity_entity_1 = require("./entities/identity.entity");
|
|
18
18
|
const tenant_module_1 = require("../tenant/tenant.module");
|
|
19
|
-
const user_access_entity_1 = require("
|
|
19
|
+
const user_access_entity_1 = require("./entities/user-access.entity");
|
|
20
|
+
const platform_access_entity_1 = require("./entities/platform-access.entity");
|
|
20
21
|
let UserModule = class UserModule {
|
|
21
22
|
};
|
|
22
23
|
exports.UserModule = UserModule;
|
|
23
24
|
exports.UserModule = UserModule = __decorate([
|
|
24
25
|
(0, common_1.Module)({
|
|
25
26
|
imports: [
|
|
26
|
-
typeorm_1.TypeOrmModule.forFeature([user_entity_1.NestAuthUser, access_key_entity_1.NestAuthAccessKey, identity_entity_1.NestAuthIdentity, user_access_entity_1.NestAuthUserAccess]),
|
|
27
|
+
typeorm_1.TypeOrmModule.forFeature([user_entity_1.NestAuthUser, access_key_entity_1.NestAuthAccessKey, identity_entity_1.NestAuthIdentity, user_access_entity_1.NestAuthUserAccess, platform_access_entity_1.NestAuthPlatformAccess]),
|
|
27
28
|
(0, common_1.forwardRef)(() => auth_module_1.AuthModule),
|
|
28
29
|
(0, common_1.forwardRef)(() => tenant_module_1.TenantModule),
|
|
29
30
|
],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.module.js","sourceRoot":"","sources":["../../../src/lib/user/user.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,6CAAgD;AAChD,wDAAsD;AACtD,0DAAsD;AACtD,sEAAiE;AACjE,qDAAiD;AACjD,oEAAiE;AACjE,gEAA8D;AAC9D,2DAAuD;AACvD,8EAA2E;AAiBpE,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAI,CAAA;AAAd,gCAAU;qBAAV,UAAU;IAftB,IAAA,eAAM,EAAC;QACJ,OAAO,EAAE;YACL,uBAAa,CAAC,UAAU,CAAC,CAAC,0BAAY,EAAE,qCAAiB,EAAE,kCAAgB,EAAE,uCAAkB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"user.module.js","sourceRoot":"","sources":["../../../src/lib/user/user.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,6CAAgD;AAChD,wDAAsD;AACtD,0DAAsD;AACtD,sEAAiE;AACjE,qDAAiD;AACjD,oEAAiE;AACjE,gEAA8D;AAC9D,2DAAuD;AACvD,sEAAmE;AACnE,8EAA2E;AAiBpE,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAI,CAAA;AAAd,gCAAU;qBAAV,UAAU;IAftB,IAAA,eAAM,EAAC;QACJ,OAAO,EAAE;YACL,uBAAa,CAAC,UAAU,CAAC,CAAC,0BAAY,EAAE,qCAAiB,EAAE,kCAAgB,EAAE,uCAAkB,EAAE,+CAAsB,CAAC,CAAC;YACzH,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,wBAAU,CAAC;YAC5B,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,4BAAY,CAAC;SACjC;QACD,SAAS,EAAE;YACP,0BAAW;YACX,qCAAgB;SACnB;QACD,OAAO,EAAE;YACL,0BAAW;YACX,qCAAgB;SACnB;KACJ,CAAC;GACW,UAAU,CAAI"}
|