@nest-boot/auth 8.0.5-beta.2 → 8.0.5-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 +20 -15
- package/dist/auth.module.js +0 -3
- package/dist/auth.module.js.map +1 -1
- package/dist/infrastructure/auth-ability.factory.js +13 -12
- package/dist/infrastructure/auth-ability.factory.js.map +1 -1
- package/dist/interfaces/auth-module-api-key-options.interface.d.ts +1 -1
- package/dist/services/access-control.service.d.ts +2 -0
- package/dist/services/access-control.service.js +7 -0
- package/dist/services/access-control.service.js.map +1 -1
- package/dist/services/invitation.service.js +16 -23
- package/dist/services/invitation.service.js.map +1 -1
- package/dist/services/member.service.d.ts +1 -1
- package/dist/services/member.service.js +30 -26
- package/dist/services/member.service.js.map +1 -1
- package/dist/services/session.service.js +2 -2
- package/dist/services/session.service.js.map +1 -1
- package/dist/services/user-api-key.service.js +6 -6
- package/dist/services/user-api-key.service.js.map +1 -1
- package/dist/services/user.service.js +23 -17
- package/dist/services/user.service.js.map +1 -1
- package/dist/services/workspace-api-key.service.js +7 -11
- package/dist/services/workspace-api-key.service.js.map +1 -1
- package/dist/services/workspace.service.d.ts +1 -1
- package/dist/services/workspace.service.js +20 -12
- package/dist/services/workspace.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/user.constants.d.ts +5 -5
- package/dist/user.constants.js +11 -13
- package/dist/user.constants.js.map +1 -1
- package/dist/utils/api-key-permissions.util.js +1 -2
- package/dist/utils/api-key-permissions.util.js.map +1 -1
- package/dist/workspace.constants.d.ts +7 -7
- package/dist/workspace.constants.js +18 -18
- package/dist/workspace.constants.js.map +1 -1
- package/package.json +7 -7
|
@@ -14,7 +14,7 @@ var WorkspaceApiKeyService_1;
|
|
|
14
14
|
import { EntityManager, Reference, } from "@mikro-orm/core";
|
|
15
15
|
import { ConnectionManager, } from "@nest-boot/graphql-connection";
|
|
16
16
|
import { RequestContext } from "@nest-boot/request-context";
|
|
17
|
-
import {
|
|
17
|
+
import { ForbiddenException, Inject, Injectable, Logger, NotFoundException, } from "@nestjs/common";
|
|
18
18
|
import { MODULE_OPTIONS_TOKEN } from "../auth.module-definition.js";
|
|
19
19
|
import { WorkspaceApiKeyConnection } from "../connections/workspace-api-key.connection-definition.js";
|
|
20
20
|
import { Member } from "../entities/member.entity.js";
|
|
@@ -79,7 +79,7 @@ let WorkspaceApiKeyService = WorkspaceApiKeyService_1 = class WorkspaceApiKeySer
|
|
|
79
79
|
/** Creates an API key owned by a workspace. */
|
|
80
80
|
async createWorkspaceApiKey(workspace, options) {
|
|
81
81
|
this.assertWorkspacePrincipal(workspace);
|
|
82
|
-
this.accessControlService.assertWorkspaceCan("
|
|
82
|
+
this.accessControlService.assertWorkspaceCan("write", WorkspaceApiKey);
|
|
83
83
|
const permissions = this.normalizePermissions(options.permissions === undefined
|
|
84
84
|
? resolveApiKeyPermissionCatalog(this.authOptions, "workspace").defaults
|
|
85
85
|
: (options.permissions ?? []));
|
|
@@ -88,9 +88,9 @@ let WorkspaceApiKeyService = WorkspaceApiKeyService_1 = class WorkspaceApiKeySer
|
|
|
88
88
|
}
|
|
89
89
|
/** Updates a key owned by the authenticated workspace. */
|
|
90
90
|
async updateWorkspaceApiKey(id, input) {
|
|
91
|
-
this.accessControlService.assertWorkspaceCan("
|
|
91
|
+
this.accessControlService.assertWorkspaceCan("write", WorkspaceApiKey);
|
|
92
92
|
const apiKey = await this.findWritableApiKey(id);
|
|
93
|
-
this.accessControlService.assertWorkspaceCan("
|
|
93
|
+
this.accessControlService.assertWorkspaceCan("write", apiKey);
|
|
94
94
|
const permissions = input.permissions === undefined
|
|
95
95
|
? undefined
|
|
96
96
|
: this.normalizePermissions(input.permissions ?? []);
|
|
@@ -103,9 +103,9 @@ let WorkspaceApiKeyService = WorkspaceApiKeyService_1 = class WorkspaceApiKeySer
|
|
|
103
103
|
}
|
|
104
104
|
/** Deletes a key owned by the authenticated workspace. */
|
|
105
105
|
async deleteWorkspaceApiKey(id) {
|
|
106
|
-
this.accessControlService.assertWorkspaceCan("
|
|
106
|
+
this.accessControlService.assertWorkspaceCan("write", WorkspaceApiKey);
|
|
107
107
|
const apiKey = await this.findWritableApiKey(id);
|
|
108
|
-
this.accessControlService.assertWorkspaceCan("
|
|
108
|
+
this.accessControlService.assertWorkspaceCan("write", apiKey);
|
|
109
109
|
return await ApiKeyLifecycle.delete(this.em, this.authOptions, apiKey);
|
|
110
110
|
}
|
|
111
111
|
async createKey(owner, options, permissions) {
|
|
@@ -123,7 +123,7 @@ let WorkspaceApiKeyService = WorkspaceApiKeyService_1 = class WorkspaceApiKeySer
|
|
|
123
123
|
prefix,
|
|
124
124
|
start: plaintextApiKey.slice(0, 8),
|
|
125
125
|
});
|
|
126
|
-
this.accessControlService.assertWorkspaceCan("
|
|
126
|
+
this.accessControlService.assertWorkspaceCan("write", entity);
|
|
127
127
|
await em.persist(entity).flush();
|
|
128
128
|
return entity;
|
|
129
129
|
}, { clear: true });
|
|
@@ -190,10 +190,6 @@ let WorkspaceApiKeyService = WorkspaceApiKeyService_1 = class WorkspaceApiKeySer
|
|
|
190
190
|
return Reference.unwrapReference(apiKey.workspace);
|
|
191
191
|
}
|
|
192
192
|
normalizePermissions(permissions) {
|
|
193
|
-
// Invitations require a human sender; workspace keys have no user identity.
|
|
194
|
-
if (permissions.includes("invitation:create")) {
|
|
195
|
-
throw new BadRequestException("Workspace API keys cannot grant invitation:create; use a user API key");
|
|
196
|
-
}
|
|
197
193
|
const { permissions: availablePermissions, allowed } = resolveApiKeyPermissionCatalog(this.authOptions, "workspace");
|
|
198
194
|
const normalizedPermissions = normalizeAuthPermissions(permissions, availablePermissions, "Workspace API key");
|
|
199
195
|
this.assertPermissionCeiling(normalizedPermissions, allowed, "API key permissions exceed configured allowedPermissions");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-api-key.service.js","sourceRoot":"","sources":["../../src/services/workspace-api-key.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,OAAO,EACL,aAAa,EAEb,SAAS,GAEV,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAGL,iBAAiB,GAClB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"workspace-api-key.service.js","sourceRoot":"","sources":["../../src/services/workspace-api-key.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,7 @@ export declare class WorkspaceService {
|
|
|
24
24
|
getUserWorkspace(id: string, user: User): Promise<Workspace | null>;
|
|
25
25
|
/** Paginates workspaces belonging to the current user's active memberships. */
|
|
26
26
|
getWorkspaceConnectionByUser(user: User, args: ConnectionArgsInterface<Workspace>): Promise<ConnectionInterface<Workspace>>;
|
|
27
|
-
/** Finds
|
|
27
|
+
/** Finds the selected workspace matching the supplied filter and read ability. */
|
|
28
28
|
findOne(where: FilterQuery<Workspace>): Promise<Workspace | null>;
|
|
29
29
|
/** Creates a workspace and its owner membership atomically. */
|
|
30
30
|
createWorkspace(user: User, input: CreateWorkspaceOptions): Promise<Workspace>;
|
|
@@ -63,7 +63,12 @@ let WorkspaceService = class WorkspaceService {
|
|
|
63
63
|
/** Finds a workspace only when the current user is an active member. */
|
|
64
64
|
async getUserWorkspace(id, user) {
|
|
65
65
|
this.accessControlService.assertCurrentUser(user);
|
|
66
|
-
|
|
66
|
+
if (getCurrentApiKey())
|
|
67
|
+
return await this.findOne({ id });
|
|
68
|
+
this.accessControlService.assertUserSession(user);
|
|
69
|
+
const workspace = await this.em.findOne(Workspace, {
|
|
70
|
+
id,
|
|
71
|
+
});
|
|
67
72
|
if (!workspace)
|
|
68
73
|
return null;
|
|
69
74
|
return (await this.findActiveMemberByUser(workspace, user))
|
|
@@ -72,8 +77,7 @@ let WorkspaceService = class WorkspaceService {
|
|
|
72
77
|
}
|
|
73
78
|
/** Paginates workspaces belonging to the current user's active memberships. */
|
|
74
79
|
async getWorkspaceConnectionByUser(user, args) {
|
|
75
|
-
this.accessControlService.
|
|
76
|
-
this.accessControlService.assertUserCan("read", Workspace);
|
|
80
|
+
this.accessControlService.assertUserSession(user);
|
|
77
81
|
const memberships = this.em
|
|
78
82
|
.createQueryBuilder(Member)
|
|
79
83
|
.select("workspace")
|
|
@@ -83,17 +87,22 @@ let WorkspaceService = class WorkspaceService {
|
|
|
83
87
|
id: { $in: memberships.toRaw() },
|
|
84
88
|
},
|
|
85
89
|
});
|
|
86
|
-
for (const { node } of connection.edges) {
|
|
87
|
-
this.accessControlService.assertUserCan("read", node);
|
|
88
|
-
}
|
|
89
90
|
return connection;
|
|
90
91
|
}
|
|
91
|
-
/** Finds
|
|
92
|
+
/** Finds the selected workspace matching the supplied filter and read ability. */
|
|
92
93
|
async findOne(where) {
|
|
93
|
-
|
|
94
|
-
|
|
94
|
+
const current = RequestContext.isActive()
|
|
95
|
+
? RequestContext.get(Workspace)
|
|
96
|
+
: null;
|
|
97
|
+
if (!current)
|
|
98
|
+
throw new ForbiddenException("A workspace must be selected");
|
|
99
|
+
this.accessControlService.assertCurrentWorkspace(current);
|
|
100
|
+
this.accessControlService.assertWorkspaceCan("read", current);
|
|
101
|
+
const workspace = await this.em.findOne(Workspace, {
|
|
102
|
+
$and: [where, { id: current.id }],
|
|
103
|
+
});
|
|
95
104
|
if (workspace)
|
|
96
|
-
this.accessControlService.
|
|
105
|
+
this.accessControlService.assertWorkspaceCan("read", workspace);
|
|
97
106
|
return workspace;
|
|
98
107
|
}
|
|
99
108
|
/** Creates a workspace and its owner membership atomically. */
|
|
@@ -173,8 +182,7 @@ let WorkspaceService = class WorkspaceService {
|
|
|
173
182
|
}
|
|
174
183
|
/** Finds the active membership linking a user and workspace. */
|
|
175
184
|
async findActiveMemberByUser(workspace, user) {
|
|
176
|
-
this.accessControlService.
|
|
177
|
-
this.accessControlService.assertUserCan("read", Workspace);
|
|
185
|
+
this.accessControlService.assertUserSession(user);
|
|
178
186
|
return await this.em.findOne(Member, {
|
|
179
187
|
status: "ACTIVE",
|
|
180
188
|
user,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.service.js","sourceRoot":"","sources":["../../src/services/workspace.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EACL,aAAa,EAEb,QAAQ,GAET,MAAM,iBAAiB,CAAC;AAEzB,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,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,8BAA8B,EAAE,MAAM,2BAA2B,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE,kDAAkD;AAE3C,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAIN;IAEF;IACA;IANnB,0CAA0C;IAC1C;IACE,8DAA8D;IAC3C,EAAiB,EAEnB,WAA8B,EAC9B,oBAA0C;QAHxC,OAAE,GAAF,EAAE,CAAe;QAEnB,gBAAW,GAAX,WAAW,CAAmB;QAC9B,yBAAoB,GAApB,oBAAoB,CAAsB;IAC1D,CAAC;IAEJ,gFAAgF;IAChF,mBAAmB;QACjB,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE;YAAE,OAAO,IAAI,CAAC;QAC5C,MAAM,SAAS,GAAG,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAChD,MAAM,IAAI,GAAG,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC3C,IAAI,IAAI,IAAI,SAAS,IAAI,CAAC,MAAM,EAAE,CAAC;YACjC,MAAM,IAAI,kBAAkB,CAC1B,0DAA0D,CAC3D,CAAC;QACJ,CAAC;QACD,IAAI,SAAS;YACX,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAClE,OAAO,SAAS,IAAI,IAAI,CAAC;IAC3B,CAAC;IAED,oFAAoF;IAC5E,oBAAoB;QAC1B,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE;YAAE,OAAO,IAAI,CAAC;QAC5C,MAAM,MAAM,GAAG,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC1C,IAAI,gBAAgB,EAAE,IAAI,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YAC9D,MAAM,IAAI,kBAAkB,CAC1B,qDAAqD,CACtD,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,IAAI,IAAI,CAAC;IACxB,CAAC;IAED,wEAAwE;IACxE,KAAK,CAAC,gBAAgB,CAAC,EAAU,EAAE,IAAU;QAC3C,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"workspace.service.js","sourceRoot":"","sources":["../../src/services/workspace.service.ts"],"names":[],"mappings":"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"}
|