@nest-boot/auth 8.0.3-beta.0 → 8.0.3-beta.1
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/adapters/mikro-orm/create-custom-adapter.js +13 -22
- package/dist/adapters/mikro-orm/create-custom-adapter.js.map +1 -1
- package/dist/adapters/mikro-orm-adapter.js +3 -2
- package/dist/adapters/mikro-orm-adapter.js.map +1 -1
- package/dist/api-key.service.d.ts +1 -1
- package/dist/api-key.service.js +19 -23
- package/dist/api-key.service.js.map +1 -1
- package/dist/auth.middleware.d.ts +1 -0
- package/dist/auth.middleware.js +19 -2
- package/dist/auth.middleware.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/interfaces/scope-policy-options.interface.d.ts +8 -0
- package/dist/interfaces/scope-policy-options.interface.js +2 -0
- package/dist/interfaces/scope-policy-options.interface.js.map +1 -0
- package/dist/policies/create-scope-policy.d.ts +3 -0
- package/dist/policies/create-scope-policy.js +37 -0
- package/dist/policies/create-scope-policy.js.map +1 -0
- package/dist/policies/index.d.ts +2 -0
- package/dist/policies/index.js +3 -0
- package/dist/policies/index.js.map +1 -0
- package/dist/policies/user-scope.policy.d.ts +3 -0
- package/dist/policies/user-scope.policy.js +5 -0
- package/dist/policies/user-scope.policy.js.map +1 -0
- package/dist/policies/workspace-scope.policy.d.ts +3 -0
- package/dist/policies/workspace-scope.policy.js +5 -0
- package/dist/policies/workspace-scope.policy.js.map +1 -0
- package/dist/session.service.js +7 -13
- package/dist/session.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/user-deletion.service.js +3 -10
- package/dist/user-deletion.service.js.map +1 -1
- package/dist/user.service.js +40 -42
- package/dist/user.service.js.map +1 -1
- package/dist/utils/run-auth-query.d.ts +2 -0
- package/dist/utils/run-auth-query.js +21 -0
- package/dist/utils/run-auth-query.js.map +1 -0
- package/dist/workspace.service.d.ts +1 -1
- package/dist/workspace.service.js +60 -53
- package/dist/workspace.service.js.map +1 -1
- package/package.json +11 -12
|
@@ -11,10 +11,9 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
11
11
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
12
12
|
};
|
|
13
13
|
import { EntityManager, LockMode, Reference, } from "@mikro-orm/core";
|
|
14
|
-
import { RequestContext } from "@nest-boot/request-context";
|
|
15
|
-
import { RowLevelSecurity, RowLevelSecurityMode, } from "@nest-boot/row-level-security";
|
|
16
14
|
import { Inject, Injectable } from "@nestjs/common";
|
|
17
15
|
import { MODULE_OPTIONS_TOKEN } from "./auth.module-definition.js";
|
|
16
|
+
import { runAuthQuery } from "./utils/run-auth-query.js";
|
|
18
17
|
import { DEFAULT_WORKSPACE_CREATOR_ROLE } from "./workspace.constants.js";
|
|
19
18
|
export class WorkspaceOwnershipConflictError extends Error {
|
|
20
19
|
constructor() {
|
|
@@ -30,7 +29,7 @@ let UserDeletionService = class UserDeletionService {
|
|
|
30
29
|
this.options = options;
|
|
31
30
|
}
|
|
32
31
|
async deleteUser(userId, beforeDelete) {
|
|
33
|
-
return await this.runUnrestricted(async () => await
|
|
32
|
+
return await this.runUnrestricted(async (em) => await em.transactional(async (em) => {
|
|
34
33
|
const user = await em.findOne(this.options.entities.user, { id: userId }, { filters: false, lockMode: LockMode.PESSIMISTIC_WRITE });
|
|
35
34
|
if (!user)
|
|
36
35
|
return null;
|
|
@@ -70,13 +69,7 @@ let UserDeletionService = class UserDeletionService {
|
|
|
70
69
|
});
|
|
71
70
|
}
|
|
72
71
|
async runUnrestricted(callback) {
|
|
73
|
-
|
|
74
|
-
RowLevelSecurity.setMode(RowLevelSecurityMode.DISABLED);
|
|
75
|
-
return callback();
|
|
76
|
-
};
|
|
77
|
-
if (RequestContext.isActive())
|
|
78
|
-
return await RequestContext.child(run);
|
|
79
|
-
return await RequestContext.run(new RequestContext({ type: "auth-user-deletion" }), run);
|
|
72
|
+
return await runAuthQuery(this.em, callback);
|
|
80
73
|
}
|
|
81
74
|
get accountEntity() {
|
|
82
75
|
return this.options.entities.account;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-deletion.service.js","sourceRoot":"","sources":["../src/user-deletion.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAEL,aAAa,EAEb,QAAQ,EACR,SAAS,GACV,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"user-deletion.service.js","sourceRoot":"","sources":["../src/user-deletion.service.ts"],"names":[],"mappings":"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"}
|
package/dist/user.service.js
CHANGED
|
@@ -13,14 +13,13 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
13
13
|
import { randomBytes } from "node:crypto";
|
|
14
14
|
import { EntityManager, Reference, } from "@mikro-orm/core";
|
|
15
15
|
import { HashService } from "@nest-boot/hash";
|
|
16
|
-
import { RequestContext } from "@nest-boot/request-context";
|
|
17
|
-
import { RowLevelSecurity, RowLevelSecurityMode, } from "@nest-boot/row-level-security";
|
|
18
16
|
import { BadRequestException, ConflictException, ForbiddenException, Inject, Injectable, } from "@nestjs/common";
|
|
19
17
|
import { AccessControlService } from "./access-control.service.js";
|
|
20
18
|
import { MODULE_OPTIONS_TOKEN } from "./auth.module-definition.js";
|
|
21
19
|
import { DEFAULT_USER_ADMIN_ROLES, DEFAULT_USER_PERMISSIONS, DEFAULT_USER_ROLE, DEFAULT_USER_ROLES, } from "./user.constants.js";
|
|
22
20
|
import { UserDeletionService, WorkspaceOwnershipConflictError, } from "./user-deletion.service.js";
|
|
23
21
|
import { listAuthPermissions, listAuthRoles, normalizeAuthPermissions, normalizeAuthRoles, resolveAuthPermissions, } from "./utils/auth-role.util.js";
|
|
22
|
+
import { runAuthQuery } from "./utils/run-auth-query.js";
|
|
24
23
|
const CREDENTIAL_ISSUER = "local:credential";
|
|
25
24
|
const CREDENTIAL_PROVIDER_ID = "credential";
|
|
26
25
|
const MUTABLE_USER_FIELDS = new Set([
|
|
@@ -53,7 +52,7 @@ let UserService = class UserService {
|
|
|
53
52
|
this.accessControlService.assertCanGrantUserPermissions(resolveAuthPermissions(roles, permissions, this.roles));
|
|
54
53
|
const email = input.email.trim().toLowerCase();
|
|
55
54
|
const password = await this.hashPassword(input.password);
|
|
56
|
-
return await this.runUnrestricted(async () => await
|
|
55
|
+
return await this.runUnrestricted(async (em) => await em.transactional(async (em) => {
|
|
57
56
|
const user = em.create(this.userEntity, {
|
|
58
57
|
...(input.data ?? {}),
|
|
59
58
|
email,
|
|
@@ -79,11 +78,13 @@ let UserService = class UserService {
|
|
|
79
78
|
}
|
|
80
79
|
async getUser(userId) {
|
|
81
80
|
this.accessControlService.assertUserCan("get", this.userEntity);
|
|
82
|
-
return await this.runUnrestricted(async () => await
|
|
81
|
+
return await this.runUnrestricted(async (em) => await em.findOne(this.userEntity, { id: userId }, {
|
|
82
|
+
filters: false,
|
|
83
|
+
}));
|
|
83
84
|
}
|
|
84
85
|
async getUserByEmail(email) {
|
|
85
86
|
this.accessControlService.assertUserCan("get", this.userEntity);
|
|
86
|
-
return await this.runUnrestricted(async () => await
|
|
87
|
+
return await this.runUnrestricted(async (em) => await em.findOne(this.userEntity, { email: email.trim().toLowerCase() }, { filters: false }));
|
|
87
88
|
}
|
|
88
89
|
async updateUser(user, input) {
|
|
89
90
|
this.accessControlService.assertUserCan("update", user);
|
|
@@ -92,7 +93,7 @@ let UserService = class UserService {
|
|
|
92
93
|
this.accessControlService.assertUserCan("set-email", user);
|
|
93
94
|
}
|
|
94
95
|
this.em.assign(user, data);
|
|
95
|
-
await this.runUnrestricted(() =>
|
|
96
|
+
await this.runUnrestricted((em) => em.persist(user).flush());
|
|
96
97
|
return user;
|
|
97
98
|
}
|
|
98
99
|
async setUserPermissions(user, permissions) {
|
|
@@ -100,7 +101,7 @@ let UserService = class UserService {
|
|
|
100
101
|
const normalized = this.normalizePermissions(permissions);
|
|
101
102
|
this.accessControlService.assertCanGrantUserPermissions(normalized);
|
|
102
103
|
user.permissions = normalized;
|
|
103
|
-
await this.runUnrestricted(() =>
|
|
104
|
+
await this.runUnrestricted((em) => em.persist(user).flush());
|
|
104
105
|
return user;
|
|
105
106
|
}
|
|
106
107
|
async setRole(user, role) {
|
|
@@ -108,7 +109,7 @@ let UserService = class UserService {
|
|
|
108
109
|
const roles = this.normalizeRoles(role);
|
|
109
110
|
this.accessControlService.assertCanGrantUserPermissions(resolveAuthPermissions(roles, [], this.roles));
|
|
110
111
|
user.roles = roles;
|
|
111
|
-
await this.runUnrestricted(() =>
|
|
112
|
+
await this.runUnrestricted((em) => em.persist(user).flush());
|
|
112
113
|
return user;
|
|
113
114
|
}
|
|
114
115
|
listRoles() {
|
|
@@ -124,9 +125,9 @@ let UserService = class UserService {
|
|
|
124
125
|
}
|
|
125
126
|
async listUsers(input = {}) {
|
|
126
127
|
this.accessControlService.assertUserCan("list", this.userEntity);
|
|
127
|
-
return await this.runUnrestricted(async () => {
|
|
128
|
+
return await this.runUnrestricted(async (em) => {
|
|
128
129
|
const where = this.createUserFilter(input);
|
|
129
|
-
const [users, total] = await
|
|
130
|
+
const [users, total] = await em.findAndCount(this.userEntity, where, {
|
|
130
131
|
filters: false,
|
|
131
132
|
limit: input.limit,
|
|
132
133
|
offset: input.offset,
|
|
@@ -144,7 +145,7 @@ let UserService = class UserService {
|
|
|
144
145
|
}
|
|
145
146
|
async listUserSessions(user) {
|
|
146
147
|
this.accessControlService.assertUserCan("list", this.sessionEntity);
|
|
147
|
-
return await this.runUnrestricted(async () => await
|
|
148
|
+
return await this.runUnrestricted(async (em) => await em.find(this.sessionEntity, {
|
|
148
149
|
expiresAt: { $gt: new Date() },
|
|
149
150
|
userId: String(user.id),
|
|
150
151
|
}, { filters: false, orderBy: { createdAt: "desc" } }));
|
|
@@ -163,11 +164,11 @@ let UserService = class UserService {
|
|
|
163
164
|
user.banned = true;
|
|
164
165
|
user.banReason = input.banReason ?? null;
|
|
165
166
|
user.banExpiresAt = banExpiresAt;
|
|
166
|
-
await this.runUnrestricted(async () => {
|
|
167
|
-
await
|
|
167
|
+
await this.runUnrestricted(async (em) => {
|
|
168
|
+
await em.nativeDelete(this.sessionEntity, {
|
|
168
169
|
$or: [{ userId: String(user.id) }, { impersonatedBy: user }],
|
|
169
170
|
});
|
|
170
|
-
await
|
|
171
|
+
await em.persist(user).flush();
|
|
171
172
|
});
|
|
172
173
|
return user;
|
|
173
174
|
}
|
|
@@ -176,7 +177,7 @@ let UserService = class UserService {
|
|
|
176
177
|
user.banned = false;
|
|
177
178
|
user.banReason = null;
|
|
178
179
|
user.banExpiresAt = null;
|
|
179
|
-
await this.runUnrestricted(() =>
|
|
180
|
+
await this.runUnrestricted((em) => em.persist(user).flush());
|
|
180
181
|
return user;
|
|
181
182
|
}
|
|
182
183
|
async impersonateUser(administrator, user, input = {}) {
|
|
@@ -188,11 +189,14 @@ let UserService = class UserService {
|
|
|
188
189
|
if (this.isActivelyBanned(user)) {
|
|
189
190
|
throw new ForbiddenException("Banned users cannot be impersonated");
|
|
190
191
|
}
|
|
191
|
-
const session = this.
|
|
192
|
-
|
|
193
|
-
|
|
192
|
+
const session = await this.runUnrestricted(async (em) => {
|
|
193
|
+
const session = this.createSession(em, user, {
|
|
194
|
+
...input,
|
|
195
|
+
impersonatedBy: administrator,
|
|
196
|
+
});
|
|
197
|
+
await em.persist(session).flush();
|
|
198
|
+
return session;
|
|
194
199
|
});
|
|
195
|
-
await this.runUnrestricted(() => this.em.persist(session).flush());
|
|
196
200
|
return { session, user };
|
|
197
201
|
}
|
|
198
202
|
async stopImpersonating(currentSession, input = {}) {
|
|
@@ -200,34 +204,34 @@ let UserService = class UserService {
|
|
|
200
204
|
const impersonatedByReference = currentSession.impersonatedBy;
|
|
201
205
|
if (!impersonatedByReference)
|
|
202
206
|
return null;
|
|
203
|
-
return await this.runUnrestricted(async () => {
|
|
207
|
+
return await this.runUnrestricted(async (em) => {
|
|
204
208
|
const impersonatedBy = Reference.unwrapReference(impersonatedByReference);
|
|
205
|
-
const administrator = await
|
|
209
|
+
const administrator = await em.findOne(this.userEntity, { id: String(impersonatedBy.id) }, { filters: false });
|
|
206
210
|
if (!administrator)
|
|
207
211
|
return null;
|
|
208
212
|
if (this.isActivelyBanned(administrator)) {
|
|
209
|
-
await
|
|
213
|
+
await em.remove(currentSession).flush();
|
|
210
214
|
throw new ForbiddenException("Banned administrators cannot restore their session");
|
|
211
215
|
}
|
|
212
|
-
const session = this.createSession(administrator, input);
|
|
213
|
-
|
|
214
|
-
await
|
|
216
|
+
const session = this.createSession(em, administrator, input);
|
|
217
|
+
em.remove(currentSession).persist(session);
|
|
218
|
+
await em.flush();
|
|
215
219
|
return { session, user: administrator };
|
|
216
220
|
});
|
|
217
221
|
}
|
|
218
222
|
async revokeUserSession(user, sessionId) {
|
|
219
223
|
this.accessControlService.assertUserCan("revoke", this.sessionEntity);
|
|
220
|
-
return await this.runUnrestricted(async () => {
|
|
221
|
-
const session = await
|
|
224
|
+
return await this.runUnrestricted(async (em) => {
|
|
225
|
+
const session = await em.findOne(this.sessionEntity, { id: sessionId, userId: String(user.id) }, { filters: false });
|
|
222
226
|
if (!session)
|
|
223
227
|
return false;
|
|
224
|
-
await
|
|
228
|
+
await em.remove(session).flush();
|
|
225
229
|
return true;
|
|
226
230
|
});
|
|
227
231
|
}
|
|
228
232
|
async revokeUserSessions(user) {
|
|
229
233
|
this.accessControlService.assertUserCan("revoke", this.sessionEntity);
|
|
230
|
-
return await this.runUnrestricted(async () => await
|
|
234
|
+
return await this.runUnrestricted(async (em) => await em.nativeDelete(this.sessionEntity, {
|
|
231
235
|
$or: [{ userId: String(user.id) }, { impersonatedBy: user }],
|
|
232
236
|
}));
|
|
233
237
|
}
|
|
@@ -247,9 +251,9 @@ let UserService = class UserService {
|
|
|
247
251
|
async setUserPassword(user, newPassword) {
|
|
248
252
|
this.accessControlService.assertUserCan("set-password", user);
|
|
249
253
|
this.assertPasswordLength(newPassword);
|
|
250
|
-
await this.runUnrestricted(async () => {
|
|
254
|
+
await this.runUnrestricted(async (em) => {
|
|
251
255
|
const password = await this.hashPassword(newPassword);
|
|
252
|
-
const account = await
|
|
256
|
+
const account = await em.findOne(this.accountEntity, {
|
|
253
257
|
issuer: CREDENTIAL_ISSUER,
|
|
254
258
|
accountId: String(user.id),
|
|
255
259
|
providerId: CREDENTIAL_PROVIDER_ID,
|
|
@@ -259,7 +263,7 @@ let UserService = class UserService {
|
|
|
259
263
|
account.password = password;
|
|
260
264
|
}
|
|
261
265
|
else {
|
|
262
|
-
|
|
266
|
+
em.persist(em.create(this.accountEntity, {
|
|
263
267
|
accountId: String(user.id),
|
|
264
268
|
issuer: CREDENTIAL_ISSUER,
|
|
265
269
|
password,
|
|
@@ -267,7 +271,7 @@ let UserService = class UserService {
|
|
|
267
271
|
userId: String(user.id),
|
|
268
272
|
}));
|
|
269
273
|
}
|
|
270
|
-
await
|
|
274
|
+
await em.flush();
|
|
271
275
|
});
|
|
272
276
|
}
|
|
273
277
|
hasPermission(user, input) {
|
|
@@ -305,9 +309,9 @@ let UserService = class UserService {
|
|
|
305
309
|
get permissions() {
|
|
306
310
|
return this.options.user?.permissions ?? DEFAULT_USER_PERMISSIONS;
|
|
307
311
|
}
|
|
308
|
-
createSession(user, input) {
|
|
312
|
+
createSession(em, user, input) {
|
|
309
313
|
const expiresIn = this.options.session?.expiresIn ?? 60 * 60 * 24 * 7;
|
|
310
|
-
return
|
|
314
|
+
return em.create(this.sessionEntity, {
|
|
311
315
|
expiresAt: new Date(Date.now() + expiresIn * 1000),
|
|
312
316
|
impersonatedBy: input.impersonatedBy ?? null,
|
|
313
317
|
ipAddress: input.ipAddress ?? null,
|
|
@@ -357,13 +361,7 @@ let UserService = class UserService {
|
|
|
357
361
|
(!user.banExpiresAt || user.banExpiresAt.getTime() > Date.now()));
|
|
358
362
|
}
|
|
359
363
|
async runUnrestricted(callback) {
|
|
360
|
-
|
|
361
|
-
RowLevelSecurity.setMode(RowLevelSecurityMode.DISABLED);
|
|
362
|
-
return callback();
|
|
363
|
-
};
|
|
364
|
-
if (RequestContext.isActive())
|
|
365
|
-
return await RequestContext.child(run);
|
|
366
|
-
return await RequestContext.run(new RequestContext({ type: "auth-user" }), run);
|
|
364
|
+
return await runAuthQuery(this.em, callback);
|
|
367
365
|
}
|
|
368
366
|
get accountEntity() {
|
|
369
367
|
return this.options.entities.account;
|
package/dist/user.service.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../src/user.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../src/user.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { EntityManager } from "@mikro-orm/core";
|
|
2
|
+
import { RequestContext } from "@nest-boot/request-context";
|
|
3
|
+
export async function runAuthQuery(em, callback) {
|
|
4
|
+
const current = em.getContext(false);
|
|
5
|
+
if (!current.getSessionContext() && !current.global) {
|
|
6
|
+
return await callback(current);
|
|
7
|
+
}
|
|
8
|
+
if (current.isInTransaction()) {
|
|
9
|
+
throw new Error("Auth persistence cannot bypass an active RLS transaction. Call Auth services before starting the scoped transaction.");
|
|
10
|
+
}
|
|
11
|
+
const fork = current.fork();
|
|
12
|
+
fork.clearSessionContext();
|
|
13
|
+
const run = () => {
|
|
14
|
+
RequestContext.set(EntityManager, fork);
|
|
15
|
+
return callback(fork);
|
|
16
|
+
};
|
|
17
|
+
if (RequestContext.isActive())
|
|
18
|
+
return await RequestContext.child(run);
|
|
19
|
+
return await RequestContext.run(new RequestContext({ type: "auth-persistence" }), run);
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=run-auth-query.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-auth-query.js","sourceRoot":"","sources":["../../src/utils/run-auth-query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAM5D,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,EAAiB,EACjB,QAA2C;IAE3C,MAAM,OAAO,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IACrC,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;QACpD,OAAO,MAAM,QAAQ,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IACD,IAAI,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CACb,sHAAsH,CACvH,CAAC;IACJ,CAAC;IAID,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAC5B,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC3B,MAAM,GAAG,GAAG,GAAG,EAAE;QACf,cAAc,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QACxC,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC,CAAC;IAEF,IAAI,cAAc,CAAC,QAAQ,EAAE;QAAE,OAAO,MAAM,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACtE,OAAO,MAAM,cAAc,CAAC,GAAG,CAC7B,IAAI,cAAc,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC,EAChD,GAAG,CACJ,CAAC;AACJ,CAAC"}
|
|
@@ -51,7 +51,7 @@ export declare class WorkspaceService<Workspace extends BaseWorkspace = BaseWork
|
|
|
51
51
|
private get permissions();
|
|
52
52
|
private unwrapWorkspace;
|
|
53
53
|
private unwrapInvitationWorkspace;
|
|
54
|
-
private
|
|
54
|
+
private runUnrestricted;
|
|
55
55
|
private get workspaceEntity();
|
|
56
56
|
private get userEntity();
|
|
57
57
|
private get workspaceMemberEntity();
|