@nest-boot/auth 8.0.7-beta.3 → 8.0.8-beta.0
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 +8 -0
- package/dist/auth.guard.d.ts +12 -16
- package/dist/auth.guard.js +31 -54
- package/dist/auth.guard.js.map +1 -1
- package/dist/decorators/can.decorator.d.ts +3 -3
- package/dist/decorators/can.decorator.js +5 -5
- package/dist/decorators/can.decorator.js.map +1 -1
- package/dist/features/invitations/invitation.service.d.ts +4 -3
- package/dist/features/invitations/invitation.service.js +4 -2
- package/dist/features/invitations/invitation.service.js.map +1 -1
- package/dist/index.d.ts +3 -2
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/infrastructure/api-key-authentication.service.d.ts +3 -3
- package/dist/infrastructure/api-key-authentication.service.js.map +1 -1
- package/dist/infrastructure/api-key-lifecycle.d.ts +3 -3
- package/dist/infrastructure/request-identity.d.ts +4 -4
- package/dist/infrastructure/request-identity.js.map +1 -1
- package/dist/interfaces/can-metadata.interface.d.ts +3 -3
- package/dist/interfaces/request-identity-patch.interface.d.ts +2 -2
- package/dist/objects/password-policy.object.d.ts +7 -0
- package/dist/objects/password-policy.object.js +30 -0
- package/dist/objects/password-policy.object.js.map +1 -0
- package/dist/resolvers/auth.resolver.d.ts +3 -0
- package/dist/resolvers/auth.resolver.js +12 -0
- package/dist/resolvers/auth.resolver.js.map +1 -1
- package/dist/resolvers/user-api-key.resolver.d.ts +3 -2
- package/dist/resolvers/user-api-key.resolver.js.map +1 -1
- package/dist/resolvers/user.resolver.d.ts +9 -7
- package/dist/resolvers/user.resolver.js +25 -19
- package/dist/resolvers/user.resolver.js.map +1 -1
- package/dist/resolvers/workspace-api-key.resolver.d.ts +3 -2
- package/dist/resolvers/workspace-api-key.resolver.js.map +1 -1
- package/dist/resolvers/workspace.resolver.d.ts +6 -4
- package/dist/resolvers/workspace.resolver.js +13 -10
- package/dist/resolvers/workspace.resolver.js.map +1 -1
- package/dist/services/account.service.d.ts +3 -2
- package/dist/services/account.service.js +16 -2
- package/dist/services/account.service.js.map +1 -1
- package/dist/services/auth.service.d.ts +3 -0
- package/dist/services/auth.service.js +4 -0
- package/dist/services/auth.service.js.map +1 -1
- package/dist/services/member.service.d.ts +3 -2
- package/dist/services/member.service.js +2 -2
- package/dist/services/member.service.js.map +1 -1
- package/dist/services/session.service.d.ts +3 -2
- package/dist/services/session.service.js +10 -2
- package/dist/services/session.service.js.map +1 -1
- package/dist/services/user-api-key.service.d.ts +7 -5
- package/dist/services/user-api-key.service.js +13 -5
- package/dist/services/user-api-key.service.js.map +1 -1
- package/dist/services/user.service.d.ts +6 -2
- package/dist/services/user.service.js +13 -4
- package/dist/services/user.service.js.map +1 -1
- package/dist/services/workspace-api-key.service.d.ts +7 -5
- package/dist/services/workspace-api-key.service.js +13 -5
- package/dist/services/workspace-api-key.service.js.map +1 -1
- package/dist/services/workspace.service.d.ts +3 -2
- package/dist/services/workspace.service.js +2 -1
- package/dist/services/workspace.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/types/api-key-metadata.type.d.ts +6 -0
- package/dist/types/api-key-metadata.type.js +2 -0
- package/dist/types/api-key-metadata.type.js.map +1 -0
- package/dist/types/can-subject-callback.type.d.ts +3 -0
- package/dist/types/can-subject-callback.type.js +2 -0
- package/dist/types/can-subject-callback.type.js.map +1 -0
- package/dist/utils/get-current-api-key.util.d.ts +2 -2
- package/dist/utils/get-current-api-key.util.js.map +1 -1
- package/dist/utils/omit-credentials.util.d.ts +2 -0
- package/dist/utils/omit-credentials.util.js +10 -0
- package/dist/utils/omit-credentials.util.js.map +1 -0
- package/package.json +17 -17
- package/dist/types/can-subject-factory.type.d.ts +0 -3
- package/dist/types/can-subject-factory.type.js +0 -2
- package/dist/types/can-subject-factory.type.js.map +0 -1
- package/dist/types/can-subject.type.d.ts +0 -5
- package/dist/types/can-subject.type.js +0 -2
- package/dist/types/can-subject.type.js.map +0 -1
|
@@ -24,6 +24,7 @@ import { RequestIdentity } from "../infrastructure/request-identity.js";
|
|
|
24
24
|
import { normalizeApiKeyPermissions, resolveApiKeyPermissionCatalog, } from "../utils/api-key-permissions.util.js";
|
|
25
25
|
import { authorize } from "../utils/authorize.util.js";
|
|
26
26
|
import { getCurrentApiKey } from "../utils/get-current-api-key.util.js";
|
|
27
|
+
import { omitCredentials } from "../utils/omit-credentials.util.js";
|
|
27
28
|
import { assertApiKeyPermissionCeiling, assertCanGrantPermissions, canGrantPermissions, } from "../utils/permission-grants.util.js";
|
|
28
29
|
import { resolveRequestPermissions } from "../utils/resolve-request-permissions.util.js";
|
|
29
30
|
/** Manages workspace-owned API keys within the current request's authorization scope. */
|
|
@@ -58,14 +59,15 @@ let WorkspaceApiKeyService = WorkspaceApiKeyService_1 = class WorkspaceApiKeySer
|
|
|
58
59
|
if (apiKey) {
|
|
59
60
|
authorize("read", apiKey);
|
|
60
61
|
}
|
|
61
|
-
return apiKey;
|
|
62
|
+
return apiKey ? omitCredentials(apiKey, ["key"]) : null;
|
|
62
63
|
}
|
|
63
64
|
/** Paginates selected-workspace keys after applying ownership and permission ceilings. */
|
|
64
|
-
async getWorkspaceApiKeyConnection(workspace, args) {
|
|
65
|
+
async getWorkspaceApiKeyConnection(workspace, args, info) {
|
|
65
66
|
this.assertWorkspacePrincipal(workspace);
|
|
66
67
|
authorize("read", WorkspaceApiKey);
|
|
67
68
|
const where = this.getOwnedListFilter(workspace);
|
|
68
69
|
const connection = await new ConnectionManager(this.em).find(WorkspaceApiKeyConnection, args, {
|
|
70
|
+
...(info && { info }),
|
|
69
71
|
where,
|
|
70
72
|
exclude: ["key"],
|
|
71
73
|
});
|
|
@@ -73,7 +75,13 @@ let WorkspaceApiKeyService = WorkspaceApiKeyService_1 = class WorkspaceApiKeySer
|
|
|
73
75
|
for (const { node } of connection.edges) {
|
|
74
76
|
authorize("read", node);
|
|
75
77
|
}
|
|
76
|
-
return
|
|
78
|
+
return {
|
|
79
|
+
...connection,
|
|
80
|
+
edges: connection.edges.map((edge) => ({
|
|
81
|
+
...edge,
|
|
82
|
+
node: omitCredentials(edge.node, ["key"]),
|
|
83
|
+
})),
|
|
84
|
+
};
|
|
77
85
|
}
|
|
78
86
|
/** Creates an API key owned by a workspace. */
|
|
79
87
|
async createWorkspaceApiKey(workspace, options) {
|
|
@@ -97,14 +105,14 @@ let WorkspaceApiKeyService = WorkspaceApiKeyService_1 = class WorkspaceApiKeySer
|
|
|
97
105
|
normalizeApiKeyPermissions(this.authOptions, "workspace", apiKey.permissions ?? []);
|
|
98
106
|
assertCanGrantPermissions(this.authOptions, "workspace", finalPermissions);
|
|
99
107
|
}
|
|
100
|
-
return await ApiKeyLifecycle.update(this.em, this.authOptions, apiKey, input, permissions);
|
|
108
|
+
return omitCredentials(await ApiKeyLifecycle.update(this.em, this.authOptions, apiKey, input, permissions), ["key"]);
|
|
101
109
|
}
|
|
102
110
|
/** Deletes a key owned by the authenticated workspace. */
|
|
103
111
|
async deleteWorkspaceApiKey(id) {
|
|
104
112
|
authorize("write", WorkspaceApiKey);
|
|
105
113
|
const apiKey = await this.findWritableApiKey(id);
|
|
106
114
|
authorize("write", apiKey);
|
|
107
|
-
return await ApiKeyLifecycle.delete(this.em, this.authOptions, apiKey);
|
|
115
|
+
return omitCredentials(await ApiKeyLifecycle.delete(this.em, this.authOptions, apiKey), ["key"]);
|
|
108
116
|
}
|
|
109
117
|
async createKey(workspace, options, permissions) {
|
|
110
118
|
const { apiKey, data } = ApiKeyLifecycle.prepareCreation(options, permissions, this.authOptions.apiKey?.workspace?.defaultPrefix ??
|
|
@@ -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,
|
|
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,EAEL,iBAAiB,GAElB,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;AAGxB,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;AAMxE,OAAO,EACL,0BAA0B,EAC1B,8BAA8B,GAC/B,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EACL,6BAA6B,EAC7B,yBAAyB,EACzB,mBAAmB,GACpB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,yBAAyB,EAAE,MAAM,8CAA8C,CAAC;AAEzF,yFAAyF;AAElF,IAAM,sBAAsB,8BAA5B,MAAM,sBAAsB;IAMZ;IAEF;IAPF,MAAM,GAAG,IAAI,MAAM,CAAC,wBAAsB,CAAC,IAAI,CAAC,CAAC;IAElE,yCAAyC;IACzC;IACE,4DAA4D;IACzC,EAAiB,EAEnB,WAA8B;QAF5B,OAAE,GAAF,EAAE,CAAe;QAEnB,gBAAW,GAAX,WAAW,CAAmB;IAC9C,CAAC;IAEJ,8EAA8E;IAC9E,6BAA6B,CAC3B,SAAoB;QAEpB,eAAe,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;QAClD,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,8BAA8B,CACvE,IAAI,CAAC,WAAW,EAChB,WAAW,CACZ,CAAC;QACF,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;QACpC,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YACtC,UAAU;YACV,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC;YACtC,SAAS,EACP,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC;gBAC1B,mBAAmB,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,EAAE,CAAC,UAAU,CAAC,CAAC;SACnE,CAAC,CAAC,CAAC;IACN,CAAC;IAED,wFAAwF;IACxF,KAAK,CAAC,kBAAkB,CACtB,EAAU,EACV,SAAoB;QAEpB,IAAI,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;QACzC,SAAS,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QACnC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;QAC1D,IAAI,MAAM,EAAE,CAAC;YACX,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC5B,CAAC;QACD,OAAO,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC1D,CAAC;IAED,0FAA0F;IAC1F,KAAK,CAAC,4BAA4B,CAChC,SAAoB,EACpB,IAA8C,EAC9C,IAAyB;QAEzB,IAAI,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;QACzC,SAAS,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QACnC,MAAM,KAAK,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QACjD,MAAM,UAAU,GAAG,MAAM,IAAI,iBAAiB,CAC5C,IAAI,CAAC,EAAsB,CAC5B,CAAC,IAAI,CAAC,yBAAyB,EAAE,IAAI,EAAE;YACtC,GAAG,CAAC,IAAI,IAAI,EAAE,IAAI,EAAE,CAAC;YACrB,KAAK;YACL,OAAO,EAAE,CAAC,KAAK,CAAC;SACjB,CAAC,CAAC;QACH,yEAAyE;QACzE,KAAK,MAAM,EAAE,IAAI,EAAE,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;YACxC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC1B,CAAC;QACD,OAAO;YACL,GAAG,UAAU;YACb,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACrC,GAAG,IAAI;gBACP,IAAI,EAAE,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC;aAC1C,CAAC,CAAC;SACJ,CAAC;IACJ,CAAC;IAED,+CAA+C;IAC/C,KAAK,CAAC,qBAAqB,CACzB,SAAoB,EACpB,OAA4B;QAE5B,IAAI,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;QACzC,SAAS,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QACpC,MAAM,WAAW,GAAG,0BAA0B,CAC5C,IAAI,CAAC,WAAW,EAChB,WAAW,EACX,OAAO,CAAC,WAAW,CACpB,CAAC;QACF,yBAAyB,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;QACtE,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;IAC/D,CAAC;IAED,0DAA0D;IAC1D,KAAK,CAAC,qBAAqB,CACzB,EAAU,EACV,KAA0B;QAE1B,SAAS,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QACpC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QACjD,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC3B,MAAM,WAAW,GACf,KAAK,CAAC,WAAW,KAAK,SAAS;YAC7B,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,0BAA0B,CACxB,IAAI,CAAC,WAAW,EAChB,WAAW,EACX,KAAK,CAAC,WAAW,IAAI,EAAE,CACxB,CAAC;QACR,uDAAuD;QACvD,IAAI,KAAK,CAAC,OAAO,KAAK,KAAK,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YACzD,MAAM,gBAAgB,GACpB,WAAW;gBACX,0BAA0B,CACxB,IAAI,CAAC,WAAW,EAChB,WAAW,EACX,MAAM,CAAC,WAAW,IAAI,EAAE,CACzB,CAAC;YACJ,yBAAyB,CACvB,IAAI,CAAC,WAAW,EAChB,WAAW,EACX,gBAAgB,CACjB,CAAC;QACJ,CAAC;QACD,OAAO,eAAe,CACpB,MAAM,eAAe,CAAC,MAAM,CAC1B,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,WAAW,EAChB,MAAM,EACN,KAAK,EACL,WAAW,CACZ,EACD,CAAC,KAAK,CAAC,CACR,CAAC;IACJ,CAAC;IAED,0DAA0D;IAC1D,KAAK,CAAC,qBAAqB,CACzB,EAAU;QAEV,SAAS,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QACpC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QACjD,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC3B,OAAO,eAAe,CACpB,MAAM,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,EAC/D,CAAC,KAAK,CAAC,CACR,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,SAAS,CACrB,SAAoB,EACpB,OAA4B,EAC5B,WAAqB;QAErB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,eAAe,CAAC,eAAe,CACtD,OAAO,EACP,WAAW,EACX,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,EAAE,aAAa;YAC/C,OAAO,CAAC,GAAG,CAAC,cAAc;YAC1B,KAAK,CACR,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,aAAa,CACxC,KAAK,EAAE,EAAE,EAAE,EAAE;YACX,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC,eAAe,EAAE;gBACxC,GAAG,IAAI;gBACP,SAAS;aACV,CAAC,CAAC;YACH,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC3B,MAAM,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC;YACjC,OAAO,MAAM,CAAC;QAChB,CAAC,EACD,EAAE,KAAK,EAAE,IAAI,EAAE,CAChB,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,iBAAiB,EAAE;YACjC,QAAQ,EAAE,MAAM,CAAC,EAAE;YACnB,OAAO,EAAE,SAAS,CAAC,EAAE;YACrB,SAAS,EAAE,WAAW;SACvB,CAAC,CAAC;QACH,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAC5B,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC5B,EAAU,EACV,SAAoB;QAEpB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,OAAO,CAClC,eAAe,EACf;YACE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;SACnD,EACD,EAAE,QAAQ,EAAE,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE,CAC9C,CAAC;QACF,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YACxC,6BAA6B,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;QAC5E,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAC9B,EAAU;QAEV,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,OAAO,CAClC,eAAe,EACf,EAAE,EAAE,EAAE,EACN;YACE,QAAQ,EAAE,CAAC,WAAW,CAAC;YACvB,OAAO,EAAE,CAAC,KAAK,CAAC;YAChB,OAAO,EAAE,IAAI;SACd,CACF,CAAC;QACF,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;QACnD,CAAC;QACD,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;QAC5D,6BAA6B,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;QAC1E,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,kBAAkB,CACxB,SAAoB;QAEpB,MAAM,OAAO,GAAG,yBAAyB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC;QACnE,OAAO;YACL,SAAS;YACT,GAAG,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACtE,CAAC;IACJ,CAAC;IAEO,wBAAwB,CAAC,SAAoB;QACnD,eAAe,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;QAClD,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;QAClC,IAAI,MAAM,IAAI,MAAM,YAAY,eAAe,EAAE,CAAC;YAChD,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YACxC,OAAO;QACT,CAAC;QACD,MAAM,MAAM,GAAG,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC1C,IAAI,MAAM,EAAE,MAAM,KAAK,QAAQ,EAAE,CAAC;YAChC,MAAM,IAAI,kBAAkB,CAAC,wCAAwC,CAAC,CAAC;QACzE,CAAC;QACD,eAAe,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,SAAS,CAAC,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,SAAS,CAAC,EAAE,EAAE,CAAC;YACpE,MAAM,IAAI,kBAAkB,CAC1B,oDAAoD,CACrD,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,eAAe,CACrB,MAAuC,EACvC,iBAA4B;QAE5B,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAC/C,IAAI,SAAS,CAAC,EAAE,KAAK,iBAAiB,CAAC,EAAE,EAAE,CAAC;YAC1C,MAAM,IAAI,kBAAkB,CAC1B,4CAA4C,CAC7C,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,eAAe,CAAC,MAAuC;QAC7D,IAAI,CAAC,MAAM,CAAC,SAAS;YACnB,MAAM,IAAI,kBAAkB,CAAC,0BAA0B,CAAC,CAAC;QAC3D,OAAO,SAAS,CAAC,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACrD,CAAC;CACF,CAAA;AArQY,sBAAsB;IADlC,UAAU,EAAE;IAQR,WAAA,MAAM,CAAC,oBAAoB,CAAC,CAAA;qCADN,aAAa;GAN3B,sBAAsB,CAqQlC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { EntityManager, type FilterQuery } from "@mikro-orm/core";
|
|
2
|
-
import { type ConnectionArgsInterface, type
|
|
2
|
+
import { type ConnectionArgsInterface, type ConnectionResult } from "@nest-boot/graphql-connection";
|
|
3
|
+
import type { GraphQLResolveInfo } from "graphql";
|
|
3
4
|
import type { AuthModuleOptions } from "../auth-module-options.interface.js";
|
|
4
5
|
import { User } from "../entities/user.entity.js";
|
|
5
6
|
import { Workspace } from "../entities/workspace.entity.js";
|
|
@@ -21,7 +22,7 @@ export declare class WorkspaceService {
|
|
|
21
22
|
/** Finds a workspace only when the current user is an active member. */
|
|
22
23
|
getUserWorkspace(id: string, user: User): Promise<Workspace | null>;
|
|
23
24
|
/** Paginates workspaces belonging to the current user's active memberships. */
|
|
24
|
-
getWorkspaceConnectionByUser(user: User, args: ConnectionArgsInterface<Workspace
|
|
25
|
+
getWorkspaceConnectionByUser(user: User, args: ConnectionArgsInterface<Workspace>, info?: GraphQLResolveInfo): Promise<ConnectionResult<Workspace>>;
|
|
25
26
|
/** Finds the selected workspace matching the supplied filter and read ability. */
|
|
26
27
|
findOne(where: FilterQuery<Workspace>): Promise<Workspace | null>;
|
|
27
28
|
/** Creates a workspace and its owner membership atomically. */
|
|
@@ -74,13 +74,14 @@ let WorkspaceService = class WorkspaceService {
|
|
|
74
74
|
: null;
|
|
75
75
|
}
|
|
76
76
|
/** Paginates workspaces belonging to the current user's active memberships. */
|
|
77
|
-
async getWorkspaceConnectionByUser(user, args) {
|
|
77
|
+
async getWorkspaceConnectionByUser(user, args, info) {
|
|
78
78
|
RequestIdentity.assertUserSession(user);
|
|
79
79
|
const memberships = this.em
|
|
80
80
|
.createQueryBuilder(Member)
|
|
81
81
|
.select("workspace")
|
|
82
82
|
.where({ status: "ACTIVE", user: user.id });
|
|
83
83
|
const connection = await new ConnectionManager(this.em).find(WorkspaceConnection, args, {
|
|
84
|
+
...(info && { info }),
|
|
84
85
|
where: {
|
|
85
86
|
id: { $in: memberships.toRaw() },
|
|
86
87
|
},
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"workspace.service.js","sourceRoot":"","sources":["../../src/services/workspace.service.ts"],"names":[],"mappings":"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"}
|