@nest-boot/auth 8.0.7-beta.1 → 8.0.7-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +21 -2
- package/dist/{abilities/auth.ability.d.ts → auth.ability.d.ts} +3 -1
- package/dist/auth.ability.js +23 -0
- package/dist/auth.ability.js.map +1 -0
- package/dist/auth.guard.js +3 -3
- package/dist/auth.guard.js.map +1 -1
- package/dist/features/invitations/invitation.service.js +13 -13
- package/dist/features/invitations/invitation.service.js.map +1 -1
- package/dist/index.d.ts +4 -4
- package/dist/index.js +4 -4
- package/dist/index.js.map +1 -1
- package/dist/infrastructure/auth-ability.factory.d.ts +1 -1
- package/dist/infrastructure/auth-ability.factory.js +9 -1
- package/dist/infrastructure/auth-ability.factory.js.map +1 -1
- package/dist/infrastructure/request-identity.js +1 -1
- package/dist/infrastructure/request-identity.js.map +1 -1
- package/dist/resolvers/auth.resolver.js +2 -2
- package/dist/resolvers/auth.resolver.js.map +1 -1
- package/dist/services/member.service.js +37 -29
- package/dist/services/member.service.js.map +1 -1
- package/dist/services/session.service.js +9 -9
- package/dist/services/session.service.js.map +1 -1
- package/dist/services/user-api-key.service.js +11 -11
- package/dist/services/user-api-key.service.js.map +1 -1
- package/dist/services/user.service.js +26 -26
- package/dist/services/user.service.js.map +1 -1
- package/dist/services/workspace-api-key.service.js +11 -11
- package/dist/services/workspace-api-key.service.js.map +1 -1
- package/dist/services/workspace.service.js +10 -10
- package/dist/services/workspace.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/utils/authorize.util.d.ts +3 -0
- package/dist/utils/authorize.util.js +6 -0
- package/dist/utils/authorize.util.js.map +1 -0
- package/dist/utils/build-request-ability.util.d.ts +1 -1
- package/dist/utils/can.util.d.ts +1 -1
- package/dist/utils/can.util.js +3 -5
- package/dist/utils/can.util.js.map +1 -1
- package/dist/utils/get-auth-ability.util.d.ts +6 -0
- package/dist/utils/get-auth-ability.util.js +19 -0
- package/dist/utils/get-auth-ability.util.js.map +1 -0
- package/package.json +10 -10
- package/dist/abilities/auth.ability.js +0 -13
- package/dist/abilities/auth.ability.js.map +0 -1
- package/dist/abilities/index.d.ts +0 -1
- package/dist/abilities/index.js +0 -2
- package/dist/abilities/index.js.map +0 -1
- package/dist/utils/assert-can.util.d.ts +0 -3
- package/dist/utils/assert-can.util.js +0 -8
- package/dist/utils/assert-can.util.js.map +0 -1
- package/dist/utils/get-ability.util.d.ts +0 -5
- package/dist/utils/get-ability.util.js +0 -20
- package/dist/utils/get-ability.util.js.map +0 -1
|
@@ -25,8 +25,8 @@ import { UserApiKey } from "../entities/user-api-key.entity.js";
|
|
|
25
25
|
import { RequestIdentity } from "../infrastructure/request-identity.js";
|
|
26
26
|
import { RevokedAuthenticationException } from "../infrastructure/revoked-authentication.exception.js";
|
|
27
27
|
import { DEFAULT_USER_ADMIN_ROLES, DEFAULT_USER_ROLE, } from "../user.constants.js";
|
|
28
|
-
import { assertCan } from "../utils/assert-can.util.js";
|
|
29
28
|
import { listAuthPermissions, normalizeAuthPermissions, normalizeAuthRoles, resolveAuthPermissions, } from "../utils/auth-role.util.js";
|
|
29
|
+
import { authorize } from "../utils/authorize.util.js";
|
|
30
30
|
import { getCurrentApiKey } from "../utils/get-current-api-key.util.js";
|
|
31
31
|
import { assertCanGrantPermissions, canGrantPermissions, } from "../utils/permission-grants.util.js";
|
|
32
32
|
import { resolveAuthCatalog } from "../utils/resolve-auth-catalog.util.js";
|
|
@@ -57,12 +57,12 @@ let UserService = class UserService {
|
|
|
57
57
|
}
|
|
58
58
|
/** Creates a user and its credential account atomically. */
|
|
59
59
|
async createUser(input) {
|
|
60
|
-
|
|
60
|
+
authorize("create", User);
|
|
61
61
|
if (input.roles !== undefined) {
|
|
62
|
-
|
|
62
|
+
authorize("set-roles", User);
|
|
63
63
|
}
|
|
64
64
|
if (input.permissions !== undefined) {
|
|
65
|
-
|
|
65
|
+
authorize("set-permissions", User);
|
|
66
66
|
}
|
|
67
67
|
this.assertPasswordLength(input.password);
|
|
68
68
|
const permissions = this.normalizePermissions(input.permissions ?? []);
|
|
@@ -78,12 +78,12 @@ let UserService = class UserService {
|
|
|
78
78
|
permissions,
|
|
79
79
|
roles,
|
|
80
80
|
});
|
|
81
|
-
|
|
81
|
+
authorize("create", user);
|
|
82
82
|
if (input.roles !== undefined) {
|
|
83
|
-
|
|
83
|
+
authorize("set-roles", user);
|
|
84
84
|
}
|
|
85
85
|
if (input.permissions !== undefined) {
|
|
86
|
-
|
|
86
|
+
authorize("set-permissions", user);
|
|
87
87
|
}
|
|
88
88
|
em.persist(user);
|
|
89
89
|
await em.flush();
|
|
@@ -102,31 +102,31 @@ let UserService = class UserService {
|
|
|
102
102
|
}
|
|
103
103
|
/** Gets a user by identifier within the request's RLS scope. */
|
|
104
104
|
async getUser(userId) {
|
|
105
|
-
|
|
105
|
+
authorize("read", User);
|
|
106
106
|
const user = await this.em.findOne(User, {
|
|
107
107
|
id: userId,
|
|
108
108
|
});
|
|
109
109
|
if (user)
|
|
110
|
-
|
|
110
|
+
authorize("read", user);
|
|
111
111
|
return user;
|
|
112
112
|
}
|
|
113
113
|
/** Gets a user by normalized email within the request's RLS scope. */
|
|
114
114
|
async getUserByEmail(email) {
|
|
115
|
-
|
|
115
|
+
authorize("read", User);
|
|
116
116
|
const user = await this.em.findOne(User, {
|
|
117
117
|
email: email.trim().toLowerCase(),
|
|
118
118
|
});
|
|
119
119
|
if (user)
|
|
120
|
-
|
|
120
|
+
authorize("read", user);
|
|
121
121
|
return user;
|
|
122
122
|
}
|
|
123
123
|
/** Updates mutable user fields. */
|
|
124
124
|
async updateUser(user, input) {
|
|
125
125
|
user = await this.resolveUserForAction(user, "update");
|
|
126
|
-
|
|
126
|
+
authorize("update", user);
|
|
127
127
|
const data = this.createUserUpdateData(input);
|
|
128
128
|
if (input.email !== undefined || input.emailVerified !== undefined) {
|
|
129
|
-
|
|
129
|
+
authorize("set-email", user);
|
|
130
130
|
}
|
|
131
131
|
this.assertAuthorizationCanCommit(user);
|
|
132
132
|
const previous = {
|
|
@@ -149,7 +149,7 @@ let UserService = class UserService {
|
|
|
149
149
|
/** Replaces a user's application permissions. */
|
|
150
150
|
async setUserPermissions(user, permissions) {
|
|
151
151
|
user = await this.resolveUserForAction(user, "set-permissions");
|
|
152
|
-
|
|
152
|
+
authorize("set-permissions", user);
|
|
153
153
|
const normalized = this.normalizePermissions(permissions);
|
|
154
154
|
assertCanGrantPermissions(this.options, "user", normalized);
|
|
155
155
|
this.assertAuthorizationCanCommit(user);
|
|
@@ -168,7 +168,7 @@ let UserService = class UserService {
|
|
|
168
168
|
/** Replaces the roles assigned to a user. */
|
|
169
169
|
async setUserRoles(user, roleNames) {
|
|
170
170
|
user = await this.resolveUserForAction(user, "set-roles");
|
|
171
|
-
|
|
171
|
+
authorize("set-roles", user);
|
|
172
172
|
const roles = this.normalizeRoles(roleNames);
|
|
173
173
|
assertCanGrantPermissions(this.options, "user", resolveAuthPermissions(roles, [], this.roles));
|
|
174
174
|
this.assertAuthorizationCanCommit(user);
|
|
@@ -207,7 +207,7 @@ let UserService = class UserService {
|
|
|
207
207
|
async resolveUserForAction(user, action) {
|
|
208
208
|
if (typeof user !== "string")
|
|
209
209
|
return user;
|
|
210
|
-
|
|
210
|
+
authorize(action, User);
|
|
211
211
|
const entity = await this.em.findOne(User, { id: user }, { refresh: true });
|
|
212
212
|
if (!entity)
|
|
213
213
|
throw new NotFoundException("User not found");
|
|
@@ -215,7 +215,7 @@ let UserService = class UserService {
|
|
|
215
215
|
}
|
|
216
216
|
/** Lists all configured roles with the current principal's grant availability. */
|
|
217
217
|
listRoles() {
|
|
218
|
-
|
|
218
|
+
authorize("set-roles", User);
|
|
219
219
|
return Object.entries(this.roles).map(([role, permissions]) => ({
|
|
220
220
|
role,
|
|
221
221
|
grantable: canGrantPermissions(this.options, "user", permissions),
|
|
@@ -223,7 +223,7 @@ let UserService = class UserService {
|
|
|
223
223
|
}
|
|
224
224
|
/** Lists all configured permissions with the current principal's grant availability. */
|
|
225
225
|
listPermissions() {
|
|
226
|
-
|
|
226
|
+
authorize("set-permissions", User);
|
|
227
227
|
return listAuthPermissions(this.permissions).map((permission) => ({
|
|
228
228
|
permission,
|
|
229
229
|
grantable: canGrantPermissions(this.options, "user", [permission]),
|
|
@@ -235,17 +235,17 @@ let UserService = class UserService {
|
|
|
235
235
|
}
|
|
236
236
|
/** Paginates users without bypassing application RLS. */
|
|
237
237
|
async getUserConnection(args) {
|
|
238
|
-
|
|
238
|
+
authorize("read", User);
|
|
239
239
|
const connection = await new ConnectionManager(this.em).find(UserConnection, args);
|
|
240
240
|
for (const { node } of connection.edges) {
|
|
241
|
-
|
|
241
|
+
authorize("read", node);
|
|
242
242
|
}
|
|
243
243
|
return connection;
|
|
244
244
|
}
|
|
245
245
|
/** Bans a user and immediately revokes all of their sessions. */
|
|
246
246
|
async banUser(user, input = {}) {
|
|
247
247
|
user = await this.resolveUserForAction(user, "ban");
|
|
248
|
-
|
|
248
|
+
authorize("ban", user);
|
|
249
249
|
this.assertIdentityRevocationCanCommit(user);
|
|
250
250
|
const banExpiresAt = input.banExpiresIn === undefined
|
|
251
251
|
? null
|
|
@@ -292,7 +292,7 @@ let UserService = class UserService {
|
|
|
292
292
|
/** Removes a user's ban. */
|
|
293
293
|
async unbanUser(user) {
|
|
294
294
|
user = await this.resolveUserForAction(user, "ban");
|
|
295
|
-
|
|
295
|
+
authorize("ban", user);
|
|
296
296
|
this.assertAuthorizationCanCommit(user);
|
|
297
297
|
const previous = {
|
|
298
298
|
banned: user.banned,
|
|
@@ -316,9 +316,9 @@ let UserService = class UserService {
|
|
|
316
316
|
async impersonateUser(administrator, user, input = {}) {
|
|
317
317
|
RequestIdentity.assertCurrentUser(administrator);
|
|
318
318
|
user = await this.resolveUserForAction(user, "impersonate");
|
|
319
|
-
|
|
319
|
+
authorize("impersonate", user);
|
|
320
320
|
if (this.isAdmin(user)) {
|
|
321
|
-
|
|
321
|
+
authorize("impersonate-admin", user);
|
|
322
322
|
}
|
|
323
323
|
if (this.isActivelyBanned(user)) {
|
|
324
324
|
throw new ForbiddenException("Banned users cannot be impersonated");
|
|
@@ -367,7 +367,7 @@ let UserService = class UserService {
|
|
|
367
367
|
/** Permanently deletes a user and all dependent authentication records. */
|
|
368
368
|
async deleteUser(user) {
|
|
369
369
|
user = await this.resolveUserForAction(user, "delete");
|
|
370
|
-
|
|
370
|
+
authorize("delete", user);
|
|
371
371
|
this.assertIdentityRevocationCanCommit(user);
|
|
372
372
|
const deleted = await this.userDeletionService.deleteUser(String(user.id));
|
|
373
373
|
if (deleted === null)
|
|
@@ -379,7 +379,7 @@ let UserService = class UserService {
|
|
|
379
379
|
/** Sets or replaces a user's credential password. */
|
|
380
380
|
async setUserPassword(user, newPassword) {
|
|
381
381
|
user = await this.resolveUserForAction(user, "set-password");
|
|
382
|
-
|
|
382
|
+
authorize("set-password", user);
|
|
383
383
|
this.assertPasswordLength(newPassword);
|
|
384
384
|
const password = await this.hashPassword(newPassword);
|
|
385
385
|
await this.em.transactional(async (em) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../src/services/user.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE3D,OAAO,EAGL,iBAAiB,GAClB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,MAAM,EACN,UAAU,EACV,iBAAiB,GAClB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE,OAAO,EAAE,cAAc,EAAE,MAAM,8CAA8C,CAAC;AAC9E,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,8BAA8B,EAAE,MAAM,uDAAuD,CAAC;AAUvG,OAAO,EACL,wBAAwB,EACxB,iBAAiB,GAClB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EACL,mBAAmB,EACnB,wBAAwB,EACxB,kBAAkB,EAClB,sBAAsB,GACvB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EACL,yBAAyB,EACzB,mBAAmB,GACpB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,gDAAgD,CAAC;AACxF,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,MAAM,iBAAiB,GAAG,kBAAkB,CAAC;AAC7C,MAAM,sBAAsB,GAAG,YAAY,CAAC;AAC5C,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAC;IAClC,OAAO;IACP,eAAe;IACf,OAAO;IACP,MAAM;CACP,CAAC,CAAC;AAEH,uEAAuE;AAEhE,IAAM,WAAW,GAAjB,MAAM,WAAW;IAIH;IAEA;IACA;IAEA;IARnB,0CAA0C;IAC1C;IACE,mEAAmE;IAClD,EAAiB,EAEjB,OAA0B,EAC1B,WAAwB,EAExB,mBAKhB;QAVgB,OAAE,GAAF,EAAE,CAAe;QAEjB,YAAO,GAAP,OAAO,CAAmB;QAC1B,gBAAW,GAAX,WAAW,CAAa;QAExB,wBAAmB,GAAnB,mBAAmB,CAKnC;IACA,CAAC;IAEJ,4DAA4D;IAC5D,KAAK,CAAC,UAAU,CAAC,KAAwB;QACvC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC1B,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YAC9B,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAC/B,CAAC;QACD,IAAI,KAAK,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;YACpC,SAAS,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;QACrC,CAAC;QACD,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC1C,MAAM,WAAW,GAAG,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;QACvE,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;QACrE,yBAAyB,CACvB,IAAI,CAAC,OAAO,EACZ,MAAM,EACN,sBAAsB,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,CACvD,CAAC;QACF,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAE/C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAEzD,OAAO,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa,CAChC,KAAK,EAAE,EAAE,EAAE,EAAE;YACX,MAAM,IAAI,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE;gBAC3B,KAAK;gBACL,aAAa,EAAE,KAAK;gBACpB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,WAAW;gBACX,KAAK;aACN,CAAC,CAAC;YACH,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YAC1B,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;gBAC9B,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;YAC/B,CAAC;YACD,IAAI,KAAK,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;gBACpC,SAAS,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;YACrC,CAAC;YACD,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACjB,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC;YAEjB,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC/B,MAAM,OAAO,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE;gBACjC,SAAS,EAAE,MAAM;gBACjB,MAAM,EAAE,iBAAiB;gBACzB,QAAQ;gBACR,UAAU,EAAE,sBAAsB;gBAClC,IAAI;aACL,CAAC,CAAC;YACH,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YACpB,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC;QACd,CAAC,EACD,EAAE,KAAK,EAAE,IAAI,EAAE,CAChB,CAAC;IACJ,CAAC;IAED,gEAAgE;IAChE,KAAK,CAAC,OAAO,CAAC,MAAc;QAC1B,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACxB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE;YACvC,EAAE,EAAE,MAAM;SACX,CAAC,CAAC;QACH,IAAI,IAAI;YAAE,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,sEAAsE;IACtE,KAAK,CAAC,cAAc,CAAC,KAAa;QAChC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACxB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE;YACvC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE;SAClC,CAAC,CAAC;QACH,IAAI,IAAI;YAAE,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,mCAAmC;IACnC,KAAK,CAAC,UAAU,CACd,IAAmB,EACnB,KAAwB;QAExB,IAAI,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACvD,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC1B,MAAM,IAAI,GAAG,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QAC9C,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;YACnE,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAC/B,CAAC;QACD,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,QAAQ,GAAG;YACf,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC;QACF,IAAI,CAAC;YACH,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAC3B,MAAM,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;QACtC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC9B,MAAM,KAAK,CAAC;QACd,CAAC;QACD,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,iDAAiD;IACjD,KAAK,CAAC,kBAAkB,CACtB,IAAmB,EACnB,WAAqB;QAErB,IAAI,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAChE,SAAS,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;QACnC,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;QAC1D,yBAAyB,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;QAC5D,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC;QAClC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;QACtC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC;YAC5B,MAAM,KAAK,CAAC;QACd,CAAC;QACD,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,6CAA6C;IAC7C,KAAK,CAAC,YAAY,CAChB,IAAmB,EACnB,SAAqC;QAErC,IAAI,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAC1D,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAC7B,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAC7C,yBAAyB,CACvB,IAAI,CAAC,OAAO,EACZ,MAAM,EACN,sBAAsB,CAAC,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAC9C,CAAC;QACF,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC;QAC5B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;QACtC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC;YACtB,MAAM,KAAK,CAAC;QACd,CAAC;QACD,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,aAAa,CAAC,IAAU;QAC9B,MAAM,OAAO,GAAG,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC5E,OAAO,CAAC,CAAC,OAAO,IAAI,OAAO,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;IAC7C,CAAC;IAEO,4BAA4B,CAAC,IAAU;QAC7C,MAAM,OAAO,GAAG,cAAc,CAAC,QAAQ,EAAE;YACvC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC;YAC7B,CAAC,CAAC,IAAI,CAAC;QACT,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,OAAO,EAAE,cAAc,EAAE,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;IAC7E,CAAC;IAEO,iCAAiC,CAAC,IAAU;QAClD,IAAI,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,eAAe,EAAE,EAAE,CAAC;YACzE,MAAM,IAAI,mBAAmB,CAC3B,wDAAwD,CACzD,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,4BAA4B,CAAC,IAAU;QAC7C,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,eAAe,EAAE,EAAE,CAAC;YAC1D,MAAM,IAAI,mBAAmB,CAC3B,6DAA6D,CAC9D,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAChC,IAAmB,EACnB,MAAc;QAEd,IAAI,OAAO,IAAI,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC;QAC1C,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACxB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5E,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;QAC3D,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,kFAAkF;IAClF,SAAS;QACP,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAC7B,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC;YAC9D,IAAI;YACJ,SAAS,EAAE,mBAAmB,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC;SAClE,CAAC,CAAC,CAAC;IACN,CAAC;IAED,wFAAwF;IACxF,eAAe;QACb,SAAS,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;QACnC,OAAO,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YAChE,UAAU;YACV,SAAS,EAAE,mBAAmB,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,UAAU,CAAC,CAAC;SACnE,CAAC,CAAC,CAAC;IACN,CAAC;IAED,8EAA8E;IAC9E,2BAA2B,CAAC,IAAU;QACpC,OAAO,sBAAsB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACpD,CAAC;IAED,yDAAyD;IACzD,KAAK,CAAC,iBAAiB,CACrB,IAAmC;QAEnC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACxB,MAAM,UAAU,GAAG,MAAM,IAAI,iBAAiB,CAC5C,IAAI,CAAC,EAAsB,CAC5B,CAAC,IAAI,CAAO,cAAc,EAAE,IAAI,CAAC,CAAC;QACnC,KAAK,MAAM,EAAE,IAAI,EAAE,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;YACxC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC1B,CAAC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,iEAAiE;IACjE,KAAK,CAAC,OAAO,CACX,IAAmB,EACnB,QAAwB,EAAE;QAE1B,IAAI,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACpD,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACvB,IAAI,CAAC,iCAAiC,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,YAAY,GAChB,KAAK,CAAC,YAAY,KAAK,SAAS;YAC9B,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC;QACvD,IACE,KAAK,CAAC,YAAY,KAAK,SAAS;YAChC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,YAAY,CAAC;gBACxC,KAAK,CAAC,YAAY,IAAI,CAAC;gBACvB,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE,OAAO,EAAE,CAAC,CAAC,EACxC,CAAC;YACD,MAAM,IAAI,mBAAmB,CAC3B,2DAA2D,CAC5D,CAAC;QACJ,CAAC;QACD,MAAM,QAAQ,GAAG;YACf,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC;QACzC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;QAElC,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa,CACzB,KAAK,EAAE,EAAE,EAAE,EAAE;gBACX,0EAA0E;gBAC1E,IAAI,MAAM,YAAY,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,EAAE,CAAC;oBAC/D,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;oBACvB,MAAM,EAAE,CAAC,YAAY,CACnB,UAAU,EACV,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EACjB;wBACE,UAAU,EAAE,GAAG;wBACf,SAAS,EAAE,GAAG;qBACf,CACF,CAAC;gBACJ,CAAC;gBACD,MAAM,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE;oBAC7B,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;iBAC3D,CAAC,CAAC;gBACH,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;YACjC,CAAC,EACD,EAAE,KAAK,EAAE,IAAI,EAAE,CAChB,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC9B,MAAM,KAAK,CAAC;QACd,CAAC;QACD,IAAI,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC;YAAE,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC5E,OAAO,IAAI,CAAC;IACd,CAAC;IAED,4BAA4B;IAC5B,KAAK,CAAC,SAAS,CAAC,IAAmB;QACjC,IAAI,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACpD,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACvB,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,QAAQ,GAAG;YACf,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;QACtC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC9B,MAAM,KAAK,CAAC;QACd,CAAC;QACD,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,wDAAwD;IACxD,KAAK,CAAC,eAAe,CACnB,aAAmB,EACnB,IAAmB,EACnB,QAA8B,EAAE;QAEhC,eAAe,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;QACjD,IAAI,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QAC5D,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QAC/B,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACvB,SAAS,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;QACvC,CAAC;QACD,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,kBAAkB,CAAC,qCAAqC,CAAC,CAAC;QACtE,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa,CACzC,KAAK,EAAE,EAAE,EAAE,EAAE;YACX,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,IAAI,EAAE;gBAC3C,GAAG,KAAK;gBACR,cAAc,EAAE,aAAa;aAC9B,CAAC,CAAC;YACH,MAAM,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC;YAClC,OAAO,OAAO,CAAC;QACjB,CAAC,EACD,EAAE,KAAK,EAAE,IAAI,EAAE,CAChB,CAAC;QACF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAED,0EAA0E;IAC1E,KAAK,CAAC,iBAAiB,CACrB,cAAuB,EACvB,QAA8B,EAAE;QAEhC,eAAe,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;QACrD,MAAM,uBAAuB,GAAG,cAAc,CAAC,cAAc,CAAC;QAC9D,IAAI,CAAC,uBAAuB;YAAE,OAAO,IAAI,CAAC;QAC1C,IAAI,CAAC,iCAAiC,CACpC,SAAS,CAAC,eAAe,CAAC,uBAAuB,CAAC,CACnD,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa,CACxC,KAAK,EAAE,EAAE,EAAE,EAAE;YACX,MAAM,cAAc,GAAG,SAAS,CAAC,eAAe,CAC9C,uBAAuB,CAChB,CAAC;YACV,MAAM,aAAa,GAAG,MAAM,EAAE,CAAC,OAAO,CACpC,IAAI,EACJ,EAAE,EAAE,EAAE,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE,EACjC,EAAE,OAAO,EAAE,KAAK,EAAE,CACnB,CAAC;YACF,IAAI,CAAC,aAAa;gBAAE,OAAO,IAAI,CAAC;YAChC,IAAI,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,EAAE,CAAC;gBACzC,MAAM,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,KAAK,EAAE,CAAC;gBACxC,OAAO,sBAA+B,CAAC;YACzC,CAAC;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;YAC7D,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC3C,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC;YACjB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;QAC1C,CAAC,EACD,EAAE,KAAK,EAAE,IAAI,EAAE,CAChB,CAAC;QACF,yEAAyE;QACzE,IAAI,MAAM,KAAK,IAAI;YAAE,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpD,2EAA2E;QAC3E,IAAI,MAAM,KAAK,sBAAsB,EAAE,CAAC;YACtC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC/B,MAAM,IAAI,8BAA8B,CACtC,oDAAoD,CACrD,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,2EAA2E;IAC3E,KAAK,CAAC,UAAU,CAAC,IAAmB;QAClC,IAAI,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACvD,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC1B,IAAI,CAAC,iCAAiC,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3E,IAAI,OAAO,KAAK,IAAI;YAAE,MAAM,IAAI,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;QACpE,IAAI,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC;YAAE,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC5E,OAAO,IAAI,CAAC;IACd,CAAC;IAED,qDAAqD;IACrD,KAAK,CAAC,eAAe,CACnB,IAAmB,EACnB,WAAmB;QAEnB,IAAI,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAC7D,SAAS,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;QAChC,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;QACvC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QACtD,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa,CACzB,KAAK,EAAE,EAAE,EAAE,EAAE;YACX,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,OAAO,CAC9B,OAAO,EACP;gBACE,MAAM,EAAE,iBAAiB;gBACzB,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC1B,UAAU,EAAE,sBAAsB;gBAClC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;aACtB,EACD,EAAE,OAAO,EAAE,KAAK,EAAE,CACnB,CAAC;YAEF,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;YAC9B,CAAC;iBAAM,CAAC;gBACN,EAAE,CAAC,OAAO,CACR,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE;oBACjB,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC1B,MAAM,EAAE,iBAAiB;oBACzB,QAAQ;oBACR,UAAU,EAAE,sBAAsB;oBAClC,IAAI;iBACL,CAAC,CACH,CAAC;YACJ,CAAC;YACD,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC;QACnB,CAAC,EACD,EAAE,KAAK,EAAE,IAAI,EAAE,CAChB,CAAC;IACJ,CAAC;IAED,6EAA6E;IAC7E,cAAc,CAAC,IAAU,EAAE,KAAgC;QACzD,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,CAAC,CAAC;QACpE,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,CACpE,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,OAAO,IAAI,MAAM,EAAE,CAAC,CAAC,CACnE,CAAC;IACJ,CAAC;IAED,yEAAyE;IACzE,OAAO,CAAC,IAAU;QAChB,MAAM,UAAU,GAAG,IAAI,GAAG,CACxB,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,IAAI,wBAAwB,CAC1D,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CACtD,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CACrB,CAAC;IACJ,CAAC;IAEO,cAAc,CAAC,IAAgC;QACrD,OAAO,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9C,CAAC;IAEO,oBAAoB,CAAC,WAA8B;QACzD,OAAO,wBAAwB,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACzE,CAAC;IAEO,oBAAoB,CAC1B,KAAwB;QAExB,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CACjD,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,CAC3C,CAAC;QACF,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,mBAAmB,CAC3B,4CAA4C,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC3E,CAAC;QACJ,CAAC;QAED,OAAO;YACL,GAAG,MAAM,CAAC,WAAW,CACnB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CACjE;YACD,GAAG,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS;gBAC3B,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC;SACjD,CAAC;IACJ,CAAC;IAED,IAAY,KAAK;QACf,OAAO,kBAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC;IACxD,CAAC;IAED,IAAY,WAAW;QACrB,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,IAAI,iBAAiB,CAAC;IAC7D,CAAC;IAED,IAAY,WAAW;QACrB,OAAO,kBAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,WAAW,CAAC;IAC9D,CAAC;IAEO,aAAa,CACnB,EAAiB,EACjB,IAAU,EACV,KAAuD;QAEvD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QACtE,OAAO,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE;YACxB,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,GAAG,IAAI,CAAC;YAClD,cAAc,EAAE,KAAK,CAAC,cAAc,IAAI,IAAI;YAC5C,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,IAAI;YAClC,KAAK,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC;YAC5C,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,IAAI;YAClC,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,QAAgB;QACzC,OAAO,MAAM,CACX,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,QAAQ,EAAE,IAAI;YAC7C,CAAC,CAAC,KAAa,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAClD,CAAC,QAAQ,CAAC,CAAC;IACd,CAAC;IAEO,oBAAoB,CAAC,QAAgB;QAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,iBAAiB,IAAI,CAAC,CAAC;QACtE,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,iBAAiB,IAAI,GAAG,CAAC;QAExE,IAAI,QAAQ,CAAC,MAAM,GAAG,OAAO,EAAE,CAAC;YAC9B,MAAM,IAAI,mBAAmB,CAC3B,kCAAkC,MAAM,CAAC,OAAO,CAAC,aAAa,CAC/D,CAAC;QACJ,CAAC;QACD,IAAI,QAAQ,CAAC,MAAM,GAAG,OAAO,EAAE,CAAC;YAC9B,MAAM,IAAI,mBAAmB,CAC3B,iCAAiC,MAAM,CAAC,OAAO,CAAC,aAAa,CAC9D,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,gBAAgB,CAAC,IAAU;QACjC,OAAO,CACL,IAAI,CAAC,MAAM;YACX,CAAC,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CACjE,CAAC;IACJ,CAAC;CACF,CAAA;AApjBY,WAAW;IADvB,UAAU,EAAE;IAMR,WAAA,MAAM,CAAC,oBAAoB,CAAC,CAAA;IAG5B,WAAA,MAAM,CAAC,mBAAmB,CAAC,CAAA;qCAJP,aAAa,UAGJ,WAAW;GAPhC,WAAW,CAojBvB"}
|
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../src/services/user.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ import { WorkspaceApiKey } from "../entities/workspace-api-key.entity.js";
|
|
|
22
22
|
import { ApiKeyLifecycle } from "../infrastructure/api-key-lifecycle.js";
|
|
23
23
|
import { RequestIdentity } from "../infrastructure/request-identity.js";
|
|
24
24
|
import { normalizeApiKeyPermissions, resolveApiKeyPermissionCatalog, } from "../utils/api-key-permissions.util.js";
|
|
25
|
-
import {
|
|
25
|
+
import { authorize } from "../utils/authorize.util.js";
|
|
26
26
|
import { getCurrentApiKey } from "../utils/get-current-api-key.util.js";
|
|
27
27
|
import { assertApiKeyPermissionCeiling, assertCanGrantPermissions, canGrantPermissions, } from "../utils/permission-grants.util.js";
|
|
28
28
|
import { resolveRequestPermissions } from "../utils/resolve-request-permissions.util.js";
|
|
@@ -53,17 +53,17 @@ let WorkspaceApiKeyService = WorkspaceApiKeyService_1 = class WorkspaceApiKeySer
|
|
|
53
53
|
/** Returns a key owned by the authenticated workspace and within the caller's scope. */
|
|
54
54
|
async getWorkspaceApiKey(id, workspace) {
|
|
55
55
|
this.assertWorkspacePrincipal(workspace);
|
|
56
|
-
|
|
56
|
+
authorize("read", WorkspaceApiKey);
|
|
57
57
|
const apiKey = await this.getVisibleApiKey(id, workspace);
|
|
58
58
|
if (apiKey) {
|
|
59
|
-
|
|
59
|
+
authorize("read", apiKey);
|
|
60
60
|
}
|
|
61
61
|
return apiKey;
|
|
62
62
|
}
|
|
63
63
|
/** Paginates selected-workspace keys after applying ownership and permission ceilings. */
|
|
64
64
|
async getWorkspaceApiKeyConnection(workspace, args) {
|
|
65
65
|
this.assertWorkspacePrincipal(workspace);
|
|
66
|
-
|
|
66
|
+
authorize("read", WorkspaceApiKey);
|
|
67
67
|
const where = this.getOwnedListFilter(workspace);
|
|
68
68
|
const connection = await new ConnectionManager(this.em).find(WorkspaceApiKeyConnection, args, {
|
|
69
69
|
where,
|
|
@@ -71,23 +71,23 @@ let WorkspaceApiKeyService = WorkspaceApiKeyService_1 = class WorkspaceApiKeySer
|
|
|
71
71
|
});
|
|
72
72
|
// Reject the whole page rather than silently changing cursor pagination.
|
|
73
73
|
for (const { node } of connection.edges) {
|
|
74
|
-
|
|
74
|
+
authorize("read", node);
|
|
75
75
|
}
|
|
76
76
|
return connection;
|
|
77
77
|
}
|
|
78
78
|
/** Creates an API key owned by a workspace. */
|
|
79
79
|
async createWorkspaceApiKey(workspace, options) {
|
|
80
80
|
this.assertWorkspacePrincipal(workspace);
|
|
81
|
-
|
|
81
|
+
authorize("write", WorkspaceApiKey);
|
|
82
82
|
const permissions = normalizeApiKeyPermissions(this.authOptions, "workspace", options.permissions);
|
|
83
83
|
assertCanGrantPermissions(this.authOptions, "workspace", permissions);
|
|
84
84
|
return await this.createKey(workspace, options, permissions);
|
|
85
85
|
}
|
|
86
86
|
/** Updates a key owned by the authenticated workspace. */
|
|
87
87
|
async updateWorkspaceApiKey(id, input) {
|
|
88
|
-
|
|
88
|
+
authorize("write", WorkspaceApiKey);
|
|
89
89
|
const apiKey = await this.findWritableApiKey(id);
|
|
90
|
-
|
|
90
|
+
authorize("write", apiKey);
|
|
91
91
|
const permissions = input.permissions === undefined
|
|
92
92
|
? undefined
|
|
93
93
|
: normalizeApiKeyPermissions(this.authOptions, "workspace", input.permissions ?? []);
|
|
@@ -101,9 +101,9 @@ let WorkspaceApiKeyService = WorkspaceApiKeyService_1 = class WorkspaceApiKeySer
|
|
|
101
101
|
}
|
|
102
102
|
/** Deletes a key owned by the authenticated workspace. */
|
|
103
103
|
async deleteWorkspaceApiKey(id) {
|
|
104
|
-
|
|
104
|
+
authorize("write", WorkspaceApiKey);
|
|
105
105
|
const apiKey = await this.findWritableApiKey(id);
|
|
106
|
-
|
|
106
|
+
authorize("write", apiKey);
|
|
107
107
|
return await ApiKeyLifecycle.delete(this.em, this.authOptions, apiKey);
|
|
108
108
|
}
|
|
109
109
|
async createKey(workspace, options, permissions) {
|
|
@@ -115,7 +115,7 @@ let WorkspaceApiKeyService = WorkspaceApiKeyService_1 = class WorkspaceApiKeySer
|
|
|
115
115
|
...data,
|
|
116
116
|
workspace,
|
|
117
117
|
});
|
|
118
|
-
|
|
118
|
+
authorize("write", entity);
|
|
119
119
|
await em.persist(entity).flush();
|
|
120
120
|
return entity;
|
|
121
121
|
}, { clear: true });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-api-key.service.js","sourceRoot":"","sources":["../../src/services/workspace-api-key.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,OAAO,EAAE,aAAa,EAAoB,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE7E,OAAO,EAGL,iBAAiB,GAClB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EACL,kBAAkB,EAClB,MAAM,EACN,UAAU,EACV,MAAM,EACN,iBAAiB,GAClB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,2DAA2D,CAAC;AACtG,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAKxE,OAAO,EACL,0BAA0B,EAC1B,8BAA8B,GAC/B,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"workspace-api-key.service.js","sourceRoot":"","sources":["../../src/services/workspace-api-key.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ import { Member } from "../entities/member.entity.js";
|
|
|
20
20
|
import { User } from "../entities/user.entity.js";
|
|
21
21
|
import { Workspace } from "../entities/workspace.entity.js";
|
|
22
22
|
import { RequestIdentity } from "../infrastructure/request-identity.js";
|
|
23
|
-
import {
|
|
23
|
+
import { authorize } from "../utils/authorize.util.js";
|
|
24
24
|
import { getCurrentApiKey } from "../utils/get-current-api-key.util.js";
|
|
25
25
|
import { DEFAULT_WORKSPACE_CREATOR_ROLE } from "../workspace.constants.js";
|
|
26
26
|
/** Workspace queries and lifecycle operations. */
|
|
@@ -45,7 +45,7 @@ let WorkspaceService = class WorkspaceService {
|
|
|
45
45
|
throw new ForbiddenException("The authenticated user is not a member of this workspace");
|
|
46
46
|
}
|
|
47
47
|
if (workspace)
|
|
48
|
-
|
|
48
|
+
authorize("read", workspace);
|
|
49
49
|
return workspace ?? null;
|
|
50
50
|
}
|
|
51
51
|
/** Returns the current member, rejecting user API keys outside their membership. */
|
|
@@ -95,25 +95,25 @@ let WorkspaceService = class WorkspaceService {
|
|
|
95
95
|
if (!current)
|
|
96
96
|
throw new ForbiddenException("A workspace must be selected");
|
|
97
97
|
RequestIdentity.assertCurrentWorkspace(current);
|
|
98
|
-
|
|
98
|
+
authorize("read", current);
|
|
99
99
|
const workspace = await this.em.findOne(Workspace, {
|
|
100
100
|
$and: [where, { id: current.id }],
|
|
101
101
|
});
|
|
102
102
|
if (workspace)
|
|
103
|
-
|
|
103
|
+
authorize("read", workspace);
|
|
104
104
|
return workspace;
|
|
105
105
|
}
|
|
106
106
|
/** Creates a workspace and its owner membership atomically. */
|
|
107
107
|
async createWorkspace(user, input) {
|
|
108
108
|
RequestIdentity.assertCurrentUser(user);
|
|
109
|
-
|
|
109
|
+
authorize("create", Workspace);
|
|
110
110
|
// The new workspace has no request session yet. Only this authorized
|
|
111
111
|
// operation may bootstrap its owner outside the application's RLS scope.
|
|
112
112
|
return await this.em.transactional(async (em) => {
|
|
113
113
|
const workspace = em.create(Workspace, {
|
|
114
114
|
name: input.name,
|
|
115
115
|
});
|
|
116
|
-
|
|
116
|
+
authorize("create", workspace);
|
|
117
117
|
const member = em.create(Member, {
|
|
118
118
|
name: user.name,
|
|
119
119
|
email: user.email.trim().toLowerCase(),
|
|
@@ -130,7 +130,7 @@ let WorkspaceService = class WorkspaceService {
|
|
|
130
130
|
async resolveWorkspaceForAction(workspace, action) {
|
|
131
131
|
if (typeof workspace !== "string")
|
|
132
132
|
return workspace;
|
|
133
|
-
|
|
133
|
+
authorize(action, Workspace);
|
|
134
134
|
const entity = await this.em.findOne(Workspace, { id: workspace }, { refresh: true });
|
|
135
135
|
if (!entity)
|
|
136
136
|
throw new NotFoundException("Workspace not found");
|
|
@@ -140,7 +140,7 @@ let WorkspaceService = class WorkspaceService {
|
|
|
140
140
|
async updateWorkspace(workspace, input) {
|
|
141
141
|
workspace = await this.resolveWorkspaceForAction(workspace, "update");
|
|
142
142
|
RequestIdentity.assertCurrentWorkspace(workspace);
|
|
143
|
-
|
|
143
|
+
authorize("update", workspace);
|
|
144
144
|
if (this.em.isInTransaction()) {
|
|
145
145
|
throw new BadRequestException("Change the current workspace outside an active transaction");
|
|
146
146
|
}
|
|
@@ -162,13 +162,13 @@ let WorkspaceService = class WorkspaceService {
|
|
|
162
162
|
async deleteWorkspace(workspace) {
|
|
163
163
|
workspace = await this.resolveWorkspaceForAction(workspace, "delete");
|
|
164
164
|
RequestIdentity.assertCurrentWorkspace(workspace);
|
|
165
|
-
|
|
165
|
+
authorize("delete", workspace);
|
|
166
166
|
if (this.em.isInTransaction()) {
|
|
167
167
|
throw new BadRequestException("Delete the workspace outside an active transaction");
|
|
168
168
|
}
|
|
169
169
|
await this.em.transactional(async (em) => {
|
|
170
170
|
await this.lockWorkspace(em, workspace);
|
|
171
|
-
|
|
171
|
+
authorize("delete", workspace);
|
|
172
172
|
const count = await em.nativeDelete(Workspace, {
|
|
173
173
|
id: workspace.id,
|
|
174
174
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.service.js","sourceRoot":"","sources":["../../src/services/workspace.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,aAAa,EAAoB,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE5E,OAAO,EAGL,iBAAiB,GAClB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,MAAM,EACN,UAAU,EACV,iBAAiB,GAClB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mDAAmD,CAAC;AACxF,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAGxE,OAAO,EAAE,SAAS,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"workspace.service.js","sourceRoot":"","sources":["../../src/services/workspace.service.ts"],"names":[],"mappings":"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"}
|