@nest-boot/auth 8.2.0 → 8.3.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 +47 -8
- package/dist/admin/connections/system-account.connection-definition.js +1 -0
- package/dist/admin/connections/system-account.connection-definition.js.map +1 -1
- package/dist/api-key/connections/create-api-key-connection.js +7 -1
- package/dist/api-key/connections/create-api-key-connection.js.map +1 -1
- package/dist/api-key/decorators/auth-api-key.decorator.d.ts +2 -0
- package/dist/api-key/decorators/{current-api-key.decorator.js → auth-api-key.decorator.js} +2 -2
- package/dist/api-key/decorators/auth-api-key.decorator.js.map +1 -0
- package/dist/api-key/entities/api-key.entity.d.ts +6 -5
- package/dist/api-key/entities/api-key.entity.js +88 -6
- package/dist/api-key/entities/api-key.entity.js.map +1 -1
- package/dist/api-key/entities/base-api-key.entity-schema.d.ts +19 -0
- package/dist/api-key/entities/base-api-key.entity-schema.js +52 -0
- package/dist/api-key/entities/base-api-key.entity-schema.js.map +1 -0
- package/dist/api-key/entities/base-api-key.entity.d.ts +9 -0
- package/dist/api-key/entities/base-api-key.entity.js +7 -0
- package/dist/api-key/entities/base-api-key.entity.js.map +1 -0
- package/dist/api-key/entities/system-account.entity.d.ts +2 -0
- package/dist/api-key/entities/system-account.entity.js +8 -0
- package/dist/api-key/entities/system-account.entity.js.map +1 -1
- package/dist/api-key/interfaces/system-api-key-validation.interface.d.ts +2 -2
- package/dist/api-key/interfaces/user-api-key-validation.interface.d.ts +2 -2
- package/dist/api-key/interfaces/workspace-api-key-validation.interface.d.ts +2 -2
- package/dist/api-key/policies/api-key-owner.policy.js +2 -2
- package/dist/api-key/policies/api-key-owner.policy.js.map +1 -1
- package/dist/api-key/resolvers/user-api-key.resolver.js +3 -3
- package/dist/api-key/resolvers/user-api-key.resolver.js.map +1 -1
- package/dist/api-key/resolvers/workspace-api-key-connection.resolver.js +2 -2
- package/dist/api-key/resolvers/workspace-api-key-connection.resolver.js.map +1 -1
- package/dist/api-key/resolvers/workspace-api-key.resolver.js +3 -3
- package/dist/api-key/resolvers/workspace-api-key.resolver.js.map +1 -1
- package/dist/api-key/services/api-key-authentication.service.js +12 -11
- package/dist/api-key/services/api-key-authentication.service.js.map +1 -1
- package/dist/api-key/services/api-key.service.js +16 -3
- package/dist/api-key/services/api-key.service.js.map +1 -1
- package/dist/api-key/utils/get-current-api-key.util.d.ts +3 -3
- package/dist/api-key/utils/get-current-api-key.util.js +3 -3
- package/dist/api-key/utils/get-current-api-key.util.js.map +1 -1
- package/dist/common/interfaces/ability-context.interface.d.ts +3 -1
- package/dist/common/policies/create-scope-policy.js +2 -1
- package/dist/common/policies/create-scope-policy.js.map +1 -1
- package/dist/common/policies/user-scope.policy.d.ts +1 -1
- package/dist/common/policies/user-scope.policy.js +1 -1
- package/dist/common/policies/workspace-scope.policy.d.ts +1 -1
- package/dist/common/policies/workspace-scope.policy.js +1 -1
- package/dist/common/utils/run-auth-query.js +4 -2
- package/dist/common/utils/run-auth-query.js.map +1 -1
- package/dist/core/adapters/mikro-orm/create-custom-adapter.js +14 -1
- package/dist/core/adapters/mikro-orm/create-custom-adapter.js.map +1 -1
- package/dist/core/auth-context.d.ts +11 -3
- package/dist/core/auth-context.js +43 -25
- package/dist/core/auth-context.js.map +1 -1
- package/dist/core/auth-entities.d.ts +2 -1
- package/dist/core/auth-entities.js +4 -2
- package/dist/core/auth-entities.js.map +1 -1
- package/dist/core/auth.middleware.js +14 -16
- package/dist/core/auth.middleware.js.map +1 -1
- package/dist/core/auth.module.js +4 -2
- package/dist/core/auth.module.js.map +1 -1
- package/dist/core/connections/user.connection-definition.js +1 -0
- package/dist/core/connections/user.connection-definition.js.map +1 -1
- package/dist/core/constants/auth.constants.d.ts +2 -2
- package/dist/core/constants/auth.constants.js +2 -2
- package/dist/core/constants/auth.constants.js.map +1 -1
- package/dist/core/decorators/{current-session.decorator.d.ts → auth-session.decorator.d.ts} +1 -1
- package/dist/core/decorators/{current-session.decorator.js → auth-session.decorator.js} +2 -2
- package/dist/core/decorators/auth-session.decorator.js.map +1 -0
- package/dist/core/decorators/{current-user.decorator.d.ts → auth-user.decorator.d.ts} +1 -1
- package/dist/core/decorators/{current-user.decorator.js → auth-user.decorator.js} +2 -2
- package/dist/core/decorators/auth-user.decorator.js.map +1 -0
- package/dist/core/entities/user.entity.d.ts +2 -0
- package/dist/core/entities/user.entity.js +9 -1
- package/dist/core/entities/user.entity.js.map +1 -1
- package/dist/core/interfaces/auth-change-email-confirmation-data.interface.d.ts +2 -2
- package/dist/core/interfaces/auth-context-patch.interface.d.ts +3 -2
- package/dist/core/interfaces/auth-delete-account-verification-data.interface.d.ts +2 -2
- package/dist/core/interfaces/auth-email-verification-data.interface.d.ts +2 -2
- package/dist/core/interfaces/auth-module-delete-user-options.interface.d.ts +3 -3
- package/dist/core/interfaces/auth-module-email-and-password-options.interface.d.ts +3 -3
- package/dist/core/interfaces/auth-module-email-verification-options.interface.d.ts +3 -3
- package/dist/core/interfaces/auth-reset-password-data.interface.d.ts +2 -2
- package/dist/core/interfaces/{auth-user.interface.d.ts → auth-user-data.interface.d.ts} +1 -1
- package/dist/core/interfaces/auth-user-data.interface.js +2 -0
- package/dist/core/interfaces/auth-user-data.interface.js.map +1 -0
- package/dist/core/interfaces/sign-in-result.interface.d.ts +2 -2
- package/dist/core/interfaces/sign-in-social-result.interface.d.ts +2 -2
- package/dist/core/interfaces/sign-up-result.interface.d.ts +2 -2
- package/dist/core/resolvers/auth.resolver.d.ts +2 -1
- package/dist/core/resolvers/auth.resolver.js +9 -5
- package/dist/core/resolvers/auth.resolver.js.map +1 -1
- package/dist/core/resolvers/session.resolver.js +3 -3
- package/dist/core/resolvers/session.resolver.js.map +1 -1
- package/dist/core/services/auth.service.js.map +1 -1
- package/dist/core/utils/assert-current-identity.util.js +10 -10
- package/dist/core/utils/assert-current-identity.util.js.map +1 -1
- package/dist/core/utils/build-request-ability.util.js +6 -2
- package/dist/core/utils/build-request-ability.util.js.map +1 -1
- package/dist/core/utils/clear-authentication-context.util.d.ts +1 -3
- package/dist/core/utils/clear-authentication-context.util.js +21 -16
- package/dist/core/utils/clear-authentication-context.util.js.map +1 -1
- package/dist/index.d.ts +10 -8
- package/dist/index.js +10 -8
- package/dist/index.js.map +1 -1
- package/dist/workspace/connections/workspace-member.connection-definition.js +1 -0
- package/dist/workspace/connections/workspace-member.connection-definition.js.map +1 -1
- package/dist/workspace/connections/workspace.connection-definition.js +1 -0
- package/dist/workspace/connections/workspace.connection-definition.js.map +1 -1
- package/dist/workspace/decorators/auth-workspace-member.decorator.d.ts +2 -0
- package/dist/workspace/decorators/auth-workspace-member.decorator.js +5 -0
- package/dist/workspace/decorators/auth-workspace-member.decorator.js.map +1 -0
- package/dist/workspace/decorators/auth-workspace.decorator.d.ts +2 -0
- package/dist/workspace/decorators/auth-workspace.decorator.js +6 -0
- package/dist/workspace/decorators/auth-workspace.decorator.js.map +1 -0
- package/dist/workspace/decorators/{current-workspace.decorator.d.ts → selected-workspace.decorator.d.ts} +1 -1
- package/dist/workspace/decorators/selected-workspace.decorator.js +6 -0
- package/dist/workspace/decorators/selected-workspace.decorator.js.map +1 -0
- package/dist/workspace/entities/workspace-invitation.entity.js +1 -1
- package/dist/workspace/entities/workspace-invitation.entity.js.map +1 -1
- package/dist/workspace/entities/workspace-member.entity.d.ts +2 -0
- package/dist/workspace/entities/workspace-member.entity.js +9 -1
- package/dist/workspace/entities/workspace-member.entity.js.map +1 -1
- package/dist/workspace/entities/workspace.entity.d.ts +2 -0
- package/dist/workspace/entities/workspace.entity.js +8 -0
- package/dist/workspace/entities/workspace.entity.js.map +1 -1
- package/dist/workspace/resolvers/workspace-invitation.resolver.js +6 -6
- package/dist/workspace/resolvers/workspace-invitation.resolver.js.map +1 -1
- package/dist/workspace/resolvers/workspace-member.resolver.d.ts +2 -1
- package/dist/workspace/resolvers/workspace-member.resolver.js +10 -5
- package/dist/workspace/resolvers/workspace-member.resolver.js.map +1 -1
- package/dist/workspace/resolvers/workspace.resolver.d.ts +8 -1
- package/dist/workspace/resolvers/workspace.resolver.js +30 -8
- package/dist/workspace/resolvers/workspace.resolver.js.map +1 -1
- package/dist/workspace/services/workspace-member.service.js +5 -5
- package/dist/workspace/services/workspace-member.service.js.map +1 -1
- package/dist/workspace/services/workspace.service.js +11 -6
- package/dist/workspace/services/workspace.service.js.map +1 -1
- package/dist/workspace/utils/resolve-auth-workspace.util.d.ts +8 -0
- package/dist/workspace/utils/resolve-auth-workspace.util.js +27 -0
- package/dist/workspace/utils/resolve-auth-workspace.util.js.map +1 -0
- package/dist/workspace/utils/resolve-request-workspace-member.util.js +2 -2
- package/dist/workspace/utils/resolve-request-workspace-member.util.js.map +1 -1
- package/package.json +4 -4
- package/dist/api-key/decorators/current-api-key.decorator.d.ts +0 -2
- package/dist/api-key/decorators/current-api-key.decorator.js.map +0 -1
- package/dist/api-key/entities/api-key.entity-schema.d.ts +0 -19
- package/dist/api-key/entities/api-key.entity-schema.js +0 -85
- package/dist/api-key/entities/api-key.entity-schema.js.map +0 -1
- package/dist/core/decorators/current-session.decorator.js.map +0 -1
- package/dist/core/decorators/current-user.decorator.js.map +0 -1
- package/dist/core/interfaces/auth-user.interface.js +0 -2
- package/dist/core/interfaces/auth-user.interface.js.map +0 -1
- package/dist/workspace/decorators/current-workspace-member.decorator.d.ts +0 -2
- package/dist/workspace/decorators/current-workspace-member.decorator.js +0 -6
- package/dist/workspace/decorators/current-workspace-member.decorator.js.map +0 -1
- package/dist/workspace/decorators/current-workspace.decorator.js +0 -6
- package/dist/workspace/decorators/current-workspace.decorator.js.map +0 -1
|
@@ -13,14 +13,16 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
13
13
|
import { EntityManager } from "@mikro-orm/core";
|
|
14
14
|
import { RequestContext } from "@nest-boot/request-context";
|
|
15
15
|
import { Inject, Injectable } from "@nestjs/common";
|
|
16
|
+
import { ApiKey, } from "../api-key/entities/api-key.entity.js";
|
|
16
17
|
import { getCurrentApiKey } from "../api-key/utils/get-current-api-key.util.js";
|
|
17
18
|
import { AuthAbility } from "../common/auth.ability.js";
|
|
18
19
|
import { invalidateRequestPermissions } from "../common/utils/resolve-request-permissions.util.js";
|
|
19
20
|
import { Workspace } from "../workspace/entities/workspace.entity.js";
|
|
20
21
|
import { WorkspaceMember } from "../workspace/entities/workspace-member.entity.js";
|
|
22
|
+
import { resolveAuthWorkspace } from "../workspace/utils/resolve-auth-workspace.util.js";
|
|
21
23
|
import { resolveRequestWorkspaceMember } from "../workspace/utils/resolve-request-workspace-member.util.js";
|
|
22
24
|
import { MODULE_OPTIONS_TOKEN } from "./auth.module-definition.js";
|
|
23
|
-
import {
|
|
25
|
+
import { SELECTED_WORKSPACE } from "./constants/auth.constants.js";
|
|
24
26
|
import { Session } from "./entities/session.entity.js";
|
|
25
27
|
import { User } from "./entities/user.entity.js";
|
|
26
28
|
import { buildRequestAbility } from "./utils/build-request-ability.util.js";
|
|
@@ -38,19 +40,24 @@ let AuthContext = class AuthContext {
|
|
|
38
40
|
? (RequestContext.get(User) ?? null)
|
|
39
41
|
: null;
|
|
40
42
|
}
|
|
43
|
+
get apiKey() {
|
|
44
|
+
return getCurrentApiKey();
|
|
45
|
+
}
|
|
46
|
+
/**
|
|
47
|
+
* Workspace scope established from the current identity and effective grants.
|
|
48
|
+
* @returns Authenticated workspace, or null without effective workspace access.
|
|
49
|
+
*/
|
|
50
|
+
get authWorkspace() {
|
|
51
|
+
return resolveAuthWorkspace(this.options);
|
|
52
|
+
}
|
|
41
53
|
get member() {
|
|
42
|
-
return
|
|
43
|
-
? (RequestContext.get(WorkspaceMember) ?? null)
|
|
44
|
-
: null;
|
|
54
|
+
return resolveRequestWorkspaceMember();
|
|
45
55
|
}
|
|
46
|
-
get
|
|
56
|
+
get selectedWorkspace() {
|
|
47
57
|
return RequestContext.isActive()
|
|
48
|
-
? (RequestContext.get(
|
|
58
|
+
? (RequestContext.get(SELECTED_WORKSPACE) ?? null)
|
|
49
59
|
: null;
|
|
50
60
|
}
|
|
51
|
-
get apiKey() {
|
|
52
|
-
return getCurrentApiKey();
|
|
53
|
-
}
|
|
54
61
|
/**
|
|
55
62
|
* Initializes a fully resolved identity before request handling.
|
|
56
63
|
* @param identity - Identity values to publish.
|
|
@@ -89,15 +96,27 @@ let AuthContext = class AuthContext {
|
|
|
89
96
|
}
|
|
90
97
|
clear() {
|
|
91
98
|
if (RequestContext.isActive()) {
|
|
92
|
-
|
|
99
|
+
if (!RequestContext.get(EntityManager)) {
|
|
100
|
+
RequestContext.set(EntityManager, this.requestManager);
|
|
101
|
+
}
|
|
102
|
+
clearAuthenticationContext();
|
|
93
103
|
}
|
|
94
104
|
}
|
|
105
|
+
/** Clears a deleted target and its associated authenticated membership. */
|
|
95
106
|
clearWorkspace() {
|
|
107
|
+
if (!RequestContext.isActive()) {
|
|
108
|
+
return;
|
|
109
|
+
}
|
|
110
|
+
RequestContext.set(SELECTED_WORKSPACE, null);
|
|
111
|
+
this.clearWorkspaceMember();
|
|
112
|
+
}
|
|
113
|
+
/** Revokes membership without changing the independently selected target. */
|
|
114
|
+
clearWorkspaceMember() {
|
|
96
115
|
if (this.apiKey?.ownerType === "workspace_member") {
|
|
97
116
|
this.clear();
|
|
98
117
|
}
|
|
99
118
|
else {
|
|
100
|
-
this.set({ member: null
|
|
119
|
+
this.set({ member: null });
|
|
101
120
|
}
|
|
102
121
|
}
|
|
103
122
|
getAbility() {
|
|
@@ -114,6 +133,7 @@ let AuthContext = class AuthContext {
|
|
|
114
133
|
return;
|
|
115
134
|
}
|
|
116
135
|
invalidateRequestPermissions();
|
|
136
|
+
RequestContext.set(Workspace, this.authWorkspace);
|
|
117
137
|
RequestContext.set(AuthAbility, new AuthAbility());
|
|
118
138
|
RequestContext.set(AuthAbility, buildRequestAbility(this.options));
|
|
119
139
|
}
|
|
@@ -129,17 +149,17 @@ let AuthContext = class AuthContext {
|
|
|
129
149
|
if ("user" in patch) {
|
|
130
150
|
RequestContext.set(User, patch.user ?? null);
|
|
131
151
|
}
|
|
132
|
-
if ("member" in patch) {
|
|
133
|
-
RequestContext.set(WorkspaceMember, patch.member ?? null);
|
|
134
|
-
}
|
|
135
|
-
if ("workspace" in patch) {
|
|
136
|
-
RequestContext.set(Workspace, patch.workspace ?? null);
|
|
137
|
-
}
|
|
138
152
|
if ("session" in patch) {
|
|
139
153
|
RequestContext.set(Session, patch.session ?? null);
|
|
140
154
|
}
|
|
141
155
|
if ("apiKey" in patch) {
|
|
142
|
-
RequestContext.set(
|
|
156
|
+
RequestContext.set(ApiKey, patch.apiKey ?? null);
|
|
157
|
+
}
|
|
158
|
+
if ("workspace" in patch) {
|
|
159
|
+
RequestContext.set(SELECTED_WORKSPACE, patch.workspace ?? null);
|
|
160
|
+
}
|
|
161
|
+
if ("member" in patch) {
|
|
162
|
+
RequestContext.set(WorkspaceMember, patch.member ?? null);
|
|
143
163
|
}
|
|
144
164
|
invalidateRequestPermissions();
|
|
145
165
|
RequestContext.set(AuthAbility, null);
|
|
@@ -147,18 +167,16 @@ let AuthContext = class AuthContext {
|
|
|
147
167
|
databaseScope() {
|
|
148
168
|
const user = this.user;
|
|
149
169
|
const apiKey = this.apiKey;
|
|
150
|
-
const workspace = this.
|
|
170
|
+
const workspace = this.selectedWorkspace;
|
|
151
171
|
const member = resolveRequestWorkspaceMember();
|
|
152
172
|
const authenticated = Boolean(user ?? apiKey);
|
|
153
173
|
return {
|
|
154
174
|
role: authenticated ? "authenticated" : "anonymous",
|
|
155
175
|
variables: {
|
|
156
|
-
"app.user.id": user?.id ?? "",
|
|
157
|
-
"app.workspace.id":
|
|
158
|
-
"app.
|
|
159
|
-
|
|
160
|
-
: "",
|
|
161
|
-
"app.member.id": member?.id ?? "",
|
|
176
|
+
"app.auth.user.id": user?.id ?? "",
|
|
177
|
+
"app.auth.workspace.id": this.authWorkspace?.id ?? "",
|
|
178
|
+
"app.auth.workspace_member.id": member?.id ?? "",
|
|
179
|
+
"app.selected.workspace.id": workspace?.id ?? "",
|
|
162
180
|
},
|
|
163
181
|
};
|
|
164
182
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-context.js","sourceRoot":"","sources":["../../src/core/auth-context.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"auth-context.js","sourceRoot":"","sources":["../../src/core/auth-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ApiKey } from "../api-key/entities/api-key.entity.js";
|
|
1
2
|
import { SystemAccount } from "../api-key/entities/system-account.entity.js";
|
|
2
3
|
import { Workspace } from "../workspace/entities/workspace.entity.js";
|
|
3
4
|
import { WorkspaceInvitation } from "../workspace/entities/workspace-invitation.entity.js";
|
|
@@ -7,6 +8,6 @@ import { Session } from "./entities/session.entity.js";
|
|
|
7
8
|
import { User } from "./entities/user.entity.js";
|
|
8
9
|
import { Verification } from "./entities/verification.entity.js";
|
|
9
10
|
/** Low-level classes for the complete auth graph; use AuthModule for feature-scoped ORM registration. */
|
|
10
|
-
export declare const entities: (typeof User | typeof SystemAccount | typeof Session | import("@mikro-orm/core").EntitySchema<Pick<import("../index.js").
|
|
11
|
+
export declare const entities: (typeof User | typeof SystemAccount | typeof Session | typeof ApiKey | import("@mikro-orm/core").EntitySchema<Pick<import("../index.js").BaseApiKey, "owner">, never, import("@mikro-orm/core").EntityCtor<Pick<import("../index.js").BaseApiKey, "owner">>> | typeof Account | typeof Verification)[];
|
|
11
12
|
/** Workspace entities, registered only when `workspace.enabled` is true. */
|
|
12
13
|
export declare const workspaceEntities: (typeof Workspace | typeof WorkspaceMember | typeof WorkspaceInvitation)[];
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ApiKey } from "../api-key/entities/api-key.entity.js";
|
|
2
|
+
import { BaseApiKeySchema } from "../api-key/entities/base-api-key.entity-schema.js";
|
|
2
3
|
import { SystemAccount } from "../api-key/entities/system-account.entity.js";
|
|
3
4
|
import { Workspace } from "../workspace/entities/workspace.entity.js";
|
|
4
5
|
import { WorkspaceInvitation } from "../workspace/entities/workspace-invitation.entity.js";
|
|
@@ -13,7 +14,8 @@ export const entities = [
|
|
|
13
14
|
Account,
|
|
14
15
|
Session,
|
|
15
16
|
Verification,
|
|
16
|
-
|
|
17
|
+
BaseApiKeySchema,
|
|
18
|
+
ApiKey,
|
|
17
19
|
SystemAccount,
|
|
18
20
|
];
|
|
19
21
|
/** Workspace entities, registered only when `workspace.enabled` is true. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-entities.js","sourceRoot":"","sources":["../../src/core/auth-entities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"auth-entities.js","sourceRoot":"","sources":["../../src/core/auth-entities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mDAAmD,CAAC;AACrF,OAAO,EAAE,aAAa,EAAE,MAAM,8CAA8C,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,sDAAsD,CAAC;AAC3F,OAAO,EAAE,eAAe,EAAE,MAAM,kDAAkD,CAAC;AACnF,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAEjE,yGAAyG;AACzG,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,IAAI;IACJ,OAAO;IACP,OAAO;IACP,YAAY;IACZ,gBAAgB;IAChB,MAAM;IACN,aAAa;CACd,CAAC;AAEF,4EAA4E;AAC5E,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,SAAS;IACT,eAAe;IACf,mBAAmB;CACpB,CAAC"}
|
|
@@ -110,7 +110,7 @@ let AuthMiddleware = class AuthMiddleware {
|
|
|
110
110
|
throw new UnauthorizedException("The new session is not valid");
|
|
111
111
|
}
|
|
112
112
|
try {
|
|
113
|
-
const workspace = this.authContext.
|
|
113
|
+
const workspace = this.authContext.selectedWorkspace;
|
|
114
114
|
const member = await this.findWorkspaceMember(data.user, workspace);
|
|
115
115
|
this.authContext.initialize({
|
|
116
116
|
apiKey: null,
|
|
@@ -203,27 +203,19 @@ let AuthMiddleware = class AuthMiddleware {
|
|
|
203
203
|
user: null,
|
|
204
204
|
session: null,
|
|
205
205
|
member: null,
|
|
206
|
-
workspace: null,
|
|
207
|
-
};
|
|
208
|
-
}
|
|
209
|
-
if (validation.ownerType === "user") {
|
|
210
|
-
return {
|
|
211
|
-
apiKey: validation.apiKey,
|
|
212
|
-
user: validation.user,
|
|
213
|
-
session: null,
|
|
214
206
|
workspace,
|
|
215
|
-
member: await this.findWorkspaceMember(validation.user, workspace),
|
|
216
207
|
};
|
|
217
208
|
}
|
|
218
|
-
if (workspace && workspace.id !== validation.workspace.id) {
|
|
219
|
-
throw new UnauthorizedException("WorkspaceMember API key does not belong to the selected workspace");
|
|
220
|
-
}
|
|
221
209
|
return {
|
|
222
210
|
apiKey: validation.apiKey,
|
|
223
211
|
user: validation.user,
|
|
224
212
|
session: null,
|
|
225
|
-
|
|
226
|
-
|
|
213
|
+
workspace,
|
|
214
|
+
member: validation.ownerType === "user"
|
|
215
|
+
? await this.findWorkspaceMember(validation.user, workspace)
|
|
216
|
+
: workspace?.id === validation.workspace.id
|
|
217
|
+
? validation.member
|
|
218
|
+
: null,
|
|
227
219
|
};
|
|
228
220
|
}
|
|
229
221
|
async findSelectedWorkspace(req) {
|
|
@@ -233,7 +225,13 @@ let AuthMiddleware = class AuthMiddleware {
|
|
|
233
225
|
const header = req.headers["x-workspace-id"];
|
|
234
226
|
const id = ((Array.isArray(header) ? header[0] : header) ??
|
|
235
227
|
cookies().get("workspace_id")?.value)?.trim();
|
|
236
|
-
|
|
228
|
+
if (!id) {
|
|
229
|
+
return null;
|
|
230
|
+
}
|
|
231
|
+
if (!/^\d+$/.test(id) || BigInt(id) > 9223372036854775807n) {
|
|
232
|
+
throw new BadRequestException("Invalid workspace ID");
|
|
233
|
+
}
|
|
234
|
+
return await this.em.findOne(Workspace, { id });
|
|
237
235
|
}
|
|
238
236
|
async findWorkspaceMember(user, workspace) {
|
|
239
237
|
if (this.options.workspace?.enabled !== true || !workspace) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.middleware.js","sourceRoot":"","sources":["../../src/core/auth.middleware.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"auth.middleware.js","sourceRoot":"","sources":["../../src/core/auth.middleware.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EACL,mBAAmB,EACnB,MAAM,EACN,UAAU,EAEV,qBAAqB,GACtB,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAAE,2BAA2B,EAAE,MAAM,uDAAuD,CAAC;AACpG,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,kDAAkD,CAAC;AACnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AAGjD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE/D,0EAA0E;AAEnE,IAAM,cAAc,GAApB,MAAM,cAAc;IAoIN;IACA;IACA;IACA;IACA;IAvInB,0FAA0F;IAC1F,6BAA6B;QAC3B,IAAI,IAAI,CAAC,EAAE,CAAC,eAAe,EAAE,EAAE,CAAC;YAC9B,MAAM,IAAI,mBAAmB,CAC3B,6DAA6D,CAC9D,CAAC;QACJ,CAAC;IACH,CAAC;IAED,iEAAiE;IACjE,mBAAmB;QACjB,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,wBAAwB;QAC5B,MAAM,OAAO,GAAG,cAAc,CAAC,QAAQ,EAAE;YACvC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC;YAC7B,CAAC,CAAC,IAAI,CAAC;QACT,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO;QACT,CAAC;QACD,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,OAAO,CACnC,OAAO,EACP;gBACE,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,SAAS,EAAE,EAAE,GAAG,EAAE,IAAI,IAAI,EAAE,EAAE;aAC/B,EACD,EAAE,OAAO,EAAE,IAAI,EAAE,CAClB,CAAC;YACF,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;YAC3B,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;YACzB,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,kBAAkB;QACtB,MAAM,OAAO,GAAG,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC5E,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO;QACT,CAAC;QACD,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,OAAO,CAChC,IAAI,EACJ,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,EAClB,EAAE,OAAO,EAAE,IAAI,EAAE,CAClB,CAAC;YACF,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,MAAM,IAAI,qBAAqB,CAC7B,yCAAyC,CAC1C,CAAC;YACJ,CAAC;YACD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QACjC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;YACzB,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,mBAAmB,CAAC,KAAa;QACrC,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE;YACpD,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;gBACxC,KAAK;gBACL,SAAS,EAAE,EAAE,GAAG,EAAE,IAAI,IAAI,EAAE,EAAE;aAC/B,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,OAAO;gBAClB,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;gBACjD,CAAC,CAAC,IAAI,CAAC;YACT,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC3B,CAAC,CAAC,CAAC;QACH,IACE,CAAC,IAAI,CAAC,OAAO;YACb,CAAC,IAAI,CAAC,IAAI;YACV,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM;gBACf,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,IAAI,CAAC,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC,CAAC,EACnE,CAAC;YACD,MAAM,IAAI,qBAAqB,CAAC,8BAA8B,CAAC,CAAC;QAClE,CAAC;QACD,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC;YACrD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YACpE,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC;gBAC1B,MAAM,EAAE,IAAI;gBACZ,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,SAAS;gBACT,MAAM;aACP,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;YACzB,MAAM,KAAK,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IACD;;;;;OAKG;IACH,KAAK,CAAC,qBAAqB,CAAC,EAAU;QACpC,OAAO,MAAM,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IAC7E,CAAC;IAED;;;;;;;OAOG;IACH,YAEmB,OAA0B,EAC1B,cAA8B,EAC9B,aAA0C,EAC1C,EAAiB,EACjB,WAAwB;QAJxB,YAAO,GAAP,OAAO,CAAmB;QAC1B,mBAAc,GAAd,cAAc,CAAgB;QAC9B,kBAAa,GAAb,aAAa,CAA6B;QAC1C,OAAE,GAAF,EAAE,CAAe;QACjB,gBAAW,GAAX,WAAW,CAAa;IACxC,CAAC;IAEJ;;;;;OAKG;IACH,KAAK,CAAC,GAAG,CAAC,GAAY,EAAE,IAAc,EAAE,IAAkB;QACxD,IAAI,CAAC;YACH,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC;YAC7D,IAAI,EAAE,CAAC;QACT,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC;gBACH,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;YAC3B,CAAC;YAAC,MAAM,CAAC;gBACP,mDAAmD;YACrD,CAAC;YACD,IAAI,CAAC,KAAK,CAAC,CAAC;QACd,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,GAAY;QACxC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC;QACxD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,8BAA8B,EAAE,CAAC;QAC3E,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO;gBACL,MAAM,EAAE,IAAI;gBACZ,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,SAAS;gBACT,MAAM,EAAE,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC;aAChE,CAAC;QACJ,CAAC;QACD,MAAM,SAAS,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO;gBACL,MAAM,EAAE,IAAI;gBACZ,IAAI,EAAE,IAAI;gBACV,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,IAAI;gBACZ,SAAS;aACV,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACxB,MAAM,IAAI,qBAAqB,CAAC,uBAAuB,CAAC,CAAC;QAC3D,CAAC;QACD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAChE,IAAI,UAAU,CAAC,SAAS,KAAK,gBAAgB,EAAE,CAAC;YAC9C,OAAO;gBACL,MAAM,EAAE,UAAU,CAAC,MAAM;gBACzB,IAAI,EAAE,IAAI;gBACV,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,IAAI;gBACZ,SAAS;aACV,CAAC;QACJ,CAAC;QACD,OAAO;YACL,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,IAAI,EAAE,UAAU,CAAC,IAAI;YACrB,OAAO,EAAE,IAAI;YACb,SAAS;YACT,MAAM,EACJ,UAAU,CAAC,SAAS,KAAK,MAAM;gBAC7B,CAAC,CAAC,MAAM,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,IAAI,EAAE,SAAS,CAAC;gBAC5D,CAAC,CAAC,SAAS,EAAE,EAAE,KAAK,UAAU,CAAC,SAAS,CAAC,EAAE;oBACzC,CAAC,CAAC,UAAU,CAAC,MAAM;oBACnB,CAAC,CAAC,IAAI;SACb,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,qBAAqB,CAAC,GAAY;QAC9C,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,EAAE,CAAC;YAC7C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAC7C,MAAM,EAAE,GAAG,CACT,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YAC5C,OAAO,EAAE,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,KAAK,CACrC,EAAE,IAAI,EAAE,CAAC;QACV,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,EAAE,CAAC,GAAG,oBAAoB,EAAE,CAAC;YAC3D,MAAM,IAAI,mBAAmB,CAAC,sBAAsB,CAAC,CAAC;QACxD,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAClD,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAC/B,IAAU,EACV,SAA2B;QAE3B,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YAC3D,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,MAAM,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CACxC,EAAE,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CACnE,CAAC;IACJ,CAAC;CACF,CAAA;AA7OY,cAAc;IAD1B,UAAU,EAAE;IAoIR,WAAA,MAAM,CAAC,oBAAoB,CAAC,CAAA;6CAEI,cAAc;QACf,2BAA2B;QACtC,aAAa;QACJ,WAAW;GAxIhC,cAAc,CA6O1B"}
|
package/dist/core/auth.module.js
CHANGED
|
@@ -22,7 +22,8 @@ import { APP_INTERCEPTOR } from "@nestjs/core";
|
|
|
22
22
|
import { adminProviders } from "../admin/admin.providers.js";
|
|
23
23
|
import { SystemAccountService } from "../admin/services/system-account.service.js";
|
|
24
24
|
import { apiKeyProviders } from "../api-key/api-key.providers.js";
|
|
25
|
-
import {
|
|
25
|
+
import { ApiKey } from "../api-key/entities/api-key.entity.js";
|
|
26
|
+
import { createBaseApiKeySchema } from "../api-key/entities/base-api-key.entity-schema.js";
|
|
26
27
|
import { SystemAccount } from "../api-key/entities/system-account.entity.js";
|
|
27
28
|
import { ApiKeyUsageInterceptor } from "../api-key/interceptors/api-key-usage.interceptor.js";
|
|
28
29
|
import { ApiKeyService } from "../api-key/services/api-key.service.js";
|
|
@@ -113,11 +114,12 @@ let AuthModule = AuthModule_1 = class AuthModule extends ConfigurableModuleClass
|
|
|
113
114
|
Verification,
|
|
114
115
|
...(features.apiKey
|
|
115
116
|
? [
|
|
116
|
-
|
|
117
|
+
createBaseApiKeySchema({
|
|
117
118
|
user: features.userApiKey,
|
|
118
119
|
workspace: features.workspaceApiKey,
|
|
119
120
|
system: features.systemApiKey,
|
|
120
121
|
}),
|
|
122
|
+
ApiKey,
|
|
121
123
|
]
|
|
122
124
|
: []),
|
|
123
125
|
...(features.systemAccount ? [SystemAccount] : []),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../../src/core/auth.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAEL,iBAAiB,EACjB,gBAAgB,GACjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,wBAAwB,EACxB,oBAAoB,GACrB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAGL,MAAM,EACN,MAAM,EACN,MAAM,GAEP,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../../src/core/auth.module.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.connection-definition.js","sourceRoot":"","sources":["../../../src/core/connections/user.connection-definition.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAElD,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,IAAI,iBAAiB,CAAC,IAAI,CAAC;KAC/D,QAAQ,CAAC;IACR,KAAK,EAAE,MAAM;IACb,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,IAAI;IAChB,IAAI,EAAE,QAAQ;CACf,CAAC;KACD,QAAQ,CAAC;IACR,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,IAAI;IAChB,IAAI,EAAE,QAAQ;CACf,CAAC;KACD,QAAQ,CAAC;IACR,KAAK,EAAE,YAAY;IACnB,WAAW,EAAE,WAAW;IACxB,QAAQ,EAAE,IAAI;IACd,IAAI,EAAE,MAAM;CACb,CAAC;KACD,KAAK,EAAE,CAAC;AAEX,iCAAiC;AAE1B,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,cAAc;CAAG,CAAA;AAA5C,kBAAkB;IAD9B,QAAQ,EAAE;GACE,kBAAkB,CAA0B;;AAEzD,+BAA+B;AAExB,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,UAAU;CAAG,CAAA;AAApC,cAAc;IAD1B,UAAU,EAAE;GACA,cAAc,CAAsB"}
|
|
1
|
+
{"version":3,"file":"user.connection-definition.js","sourceRoot":"","sources":["../../../src/core/connections/user.connection-definition.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAElD,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,GAAG,IAAI,iBAAiB,CAAC,IAAI,CAAC;KAC/D,QAAQ,CAAC;IACR,KAAK,EAAE,MAAM;IACb,QAAQ,EAAE,gBAAgB;IAC1B,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,IAAI;IAChB,IAAI,EAAE,QAAQ;CACf,CAAC;KACD,QAAQ,CAAC;IACR,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,IAAI;IACZ,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,IAAI;IAChB,IAAI,EAAE,QAAQ;CACf,CAAC;KACD,QAAQ,CAAC;IACR,KAAK,EAAE,YAAY;IACnB,WAAW,EAAE,WAAW;IACxB,QAAQ,EAAE,IAAI;IACd,IAAI,EAAE,MAAM;CACb,CAAC;KACD,KAAK,EAAE,CAAC;AAEX,iCAAiC;AAE1B,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,cAAc;CAAG,CAAA;AAA5C,kBAAkB;IAD9B,QAAQ,EAAE;GACE,kBAAkB,CAA0B;;AAEzD,+BAA+B;AAExB,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,UAAU;CAAG,CAAA;AAApC,cAAc;IAD1B,UAAU,EAAE;GACA,cAAc,CAAsB"}
|
|
@@ -5,5 +5,5 @@
|
|
|
5
5
|
export declare const AUTH_TOKEN: unique symbol;
|
|
6
6
|
/** Metadata key used by the {@link Public} decorator to mark public routes. */
|
|
7
7
|
export declare const IS_PUBLIC_KEY: unique symbol;
|
|
8
|
-
/** Request-context token for the
|
|
9
|
-
export declare const
|
|
8
|
+
/** Request-context token for the independently selected workspace target. */
|
|
9
|
+
export declare const SELECTED_WORKSPACE: unique symbol;
|
|
@@ -5,6 +5,6 @@
|
|
|
5
5
|
export const AUTH_TOKEN = Symbol("AUTH");
|
|
6
6
|
/** Metadata key used by the {@link Public} decorator to mark public routes. */
|
|
7
7
|
export const IS_PUBLIC_KEY = Symbol("IS_PUBLIC_KEY");
|
|
8
|
-
/** Request-context token for the
|
|
9
|
-
export const
|
|
8
|
+
/** Request-context token for the independently selected workspace target. */
|
|
9
|
+
export const SELECTED_WORKSPACE = Symbol("SELECTED_WORKSPACE");
|
|
10
10
|
//# sourceMappingURL=auth.constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.constants.js","sourceRoot":"","sources":["../../../src/core/constants/auth.constants.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;AAEzC,+EAA+E;AAC/E,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;AAErD,
|
|
1
|
+
{"version":3,"file":"auth.constants.js","sourceRoot":"","sources":["../../../src/core/constants/auth.constants.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;AAEzC,+EAA+E;AAC/E,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;AAErD,6EAA6E;AAC7E,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
/** Parameter decorator that injects the current {@link Session} from the request context. */
|
|
2
|
-
export declare const
|
|
2
|
+
export declare const AuthSession: (...dataOrPipes: any[]) => ParameterDecorator;
|
|
@@ -2,5 +2,5 @@ import { RequestContext } from "@nest-boot/request-context";
|
|
|
2
2
|
import { createParamDecorator } from "@nestjs/common";
|
|
3
3
|
import { Session } from "../entities/session.entity.js";
|
|
4
4
|
/** Parameter decorator that injects the current {@link Session} from the request context. */
|
|
5
|
-
export const
|
|
6
|
-
//# sourceMappingURL=
|
|
5
|
+
export const AuthSession = createParamDecorator(() => RequestContext.get(Session) ?? null);
|
|
6
|
+
//# sourceMappingURL=auth-session.decorator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth-session.decorator.js","sourceRoot":"","sources":["../../../src/core/decorators/auth-session.decorator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAExD,6FAA6F;AAC7F,MAAM,CAAC,MAAM,WAAW,GAAG,oBAAoB,CAC7C,GAAG,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,CAC1C,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
/** Parameter decorator that injects the current {@link User} from the request context. */
|
|
2
|
-
export declare const
|
|
2
|
+
export declare const AuthUser: (...dataOrPipes: any[]) => ParameterDecorator;
|
|
@@ -2,5 +2,5 @@ import { RequestContext } from "@nest-boot/request-context";
|
|
|
2
2
|
import { createParamDecorator } from "@nestjs/common";
|
|
3
3
|
import { User } from "../entities/user.entity.js";
|
|
4
4
|
/** Parameter decorator that injects the current {@link User} from the request context. */
|
|
5
|
-
export const
|
|
6
|
-
//# sourceMappingURL=
|
|
5
|
+
export const AuthUser = createParamDecorator(() => RequestContext.get(User) ?? null);
|
|
6
|
+
//# sourceMappingURL=auth-user.decorator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth-user.decorator.js","sourceRoot":"","sources":["../../../src/core/decorators/auth-user.decorator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAElD,0FAA0F;AAC1F,MAAM,CAAC,MAAM,QAAQ,GAAG,oBAAoB,CAC1C,GAAG,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CACvC,CAAC"}
|
|
@@ -5,6 +5,8 @@ export declare class User extends BaseEntity {
|
|
|
5
5
|
id: Opt<string>;
|
|
6
6
|
/** Display name of the user. */
|
|
7
7
|
name: string;
|
|
8
|
+
/** Tokenized display name used only for indexed search. */
|
|
9
|
+
searchableName?: string | null;
|
|
8
10
|
/** Unique email address of the user. */
|
|
9
11
|
email: string;
|
|
10
12
|
/** Whether the email address has been verified. */
|
|
@@ -9,7 +9,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
};
|
|
10
10
|
import { BaseEntity, t } from "@mikro-orm/core";
|
|
11
11
|
import { Entity, Index, PrimaryKey, Property, Unique, } from "@mikro-orm/decorators/legacy";
|
|
12
|
-
import {
|
|
12
|
+
import { SearchableProperty } from "@nest-boot/database";
|
|
13
|
+
import { Field, HideField, ID, ObjectType } from "@nest-boot/graphql";
|
|
13
14
|
import { Sonyflake } from "sonyflake-js";
|
|
14
15
|
import { UserPermission } from "../enums/user-permission.enum.js";
|
|
15
16
|
import { UserRole } from "../enums/user-role.enum.js";
|
|
@@ -19,6 +20,8 @@ let User = class User extends BaseEntity {
|
|
|
19
20
|
id = Sonyflake.next().toString();
|
|
20
21
|
/** Display name of the user. */
|
|
21
22
|
name;
|
|
23
|
+
/** Tokenized display name used only for indexed search. */
|
|
24
|
+
searchableName;
|
|
22
25
|
/** Unique email address of the user. */
|
|
23
26
|
email;
|
|
24
27
|
/** Whether the email address has been verified. */
|
|
@@ -54,6 +57,11 @@ __decorate([
|
|
|
54
57
|
Field(() => String),
|
|
55
58
|
__metadata("design:type", String)
|
|
56
59
|
], User.prototype, "name", void 0);
|
|
60
|
+
__decorate([
|
|
61
|
+
SearchableProperty({ properties: "name", nullable: true }),
|
|
62
|
+
HideField(),
|
|
63
|
+
__metadata("design:type", Object)
|
|
64
|
+
], User.prototype, "searchableName", void 0);
|
|
57
65
|
__decorate([
|
|
58
66
|
Property({ type: t.string }),
|
|
59
67
|
Unique(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.entity.js","sourceRoot":"","sources":["../../../src/core/entities/user.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAY,CAAC,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EACL,MAAM,EACN,KAAK,EACL,UAAU,EACV,QAAQ,EACR,MAAM,GACP,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"user.entity.js","sourceRoot":"","sources":["../../../src/core/entities/user.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { AuthUserData } from "./auth-user-data.interface.js";
|
|
2
2
|
/** Data supplied when an email change requires confirmation. */
|
|
3
3
|
export interface AuthChangeEmailConfirmationData {
|
|
4
4
|
/** User requesting the email change. */
|
|
5
|
-
user:
|
|
5
|
+
user: AuthUserData;
|
|
6
6
|
/** Requested new email address. */
|
|
7
7
|
newEmail: string;
|
|
8
8
|
/** Complete confirmation URL. */
|
|
@@ -9,8 +9,9 @@ import type { User } from "../entities/user.entity.js";
|
|
|
9
9
|
*/
|
|
10
10
|
export interface AuthContextPatch {
|
|
11
11
|
user?: User | null;
|
|
12
|
-
member?: WorkspaceMember | null;
|
|
13
|
-
workspace?: Workspace | null;
|
|
14
12
|
session?: Session | null;
|
|
15
13
|
apiKey?: ApiKeyObject | null;
|
|
14
|
+
/** Independent selection; authenticated workspace scope is derived. */
|
|
15
|
+
workspace?: Workspace | null;
|
|
16
|
+
member?: WorkspaceMember | null;
|
|
16
17
|
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { AuthUserData } from "./auth-user-data.interface.js";
|
|
2
2
|
/** Data supplied when account deletion requires email verification. */
|
|
3
3
|
export interface AuthDeleteAccountVerificationData {
|
|
4
4
|
/** User requesting account deletion. */
|
|
5
|
-
user:
|
|
5
|
+
user: AuthUserData;
|
|
6
6
|
/** Complete account-deletion URL. */
|
|
7
7
|
url: string;
|
|
8
8
|
/** Raw account-deletion token. */
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { AuthUserData } from "./auth-user-data.interface.js";
|
|
2
2
|
/** Data supplied when an email verification message must be sent. */
|
|
3
3
|
export interface AuthEmailVerificationData {
|
|
4
4
|
/** User whose email address must be verified. */
|
|
5
|
-
user:
|
|
5
|
+
user: AuthUserData;
|
|
6
6
|
/** Complete verification URL containing the token. */
|
|
7
7
|
url: string;
|
|
8
8
|
/** Raw verification token for custom message flows. */
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { AuthDeleteAccountVerificationData } from "./auth-delete-account-verification-data.interface.js";
|
|
2
|
-
import type {
|
|
2
|
+
import type { AuthUserData } from "./auth-user-data.interface.js";
|
|
3
3
|
/** User-deletion lifecycle options. */
|
|
4
4
|
export interface AuthModuleDeleteUserOptions {
|
|
5
5
|
/** Whether self-service user deletion is enabled. */
|
|
@@ -7,9 +7,9 @@ export interface AuthModuleDeleteUserOptions {
|
|
|
7
7
|
/** Sends an account-deletion verification message. */
|
|
8
8
|
sendDeleteAccountVerification?: (data: AuthDeleteAccountVerificationData, request?: Request) => Promise<void>;
|
|
9
9
|
/** Runs before coordinated user deletion. */
|
|
10
|
-
beforeDelete?: (user:
|
|
10
|
+
beforeDelete?: (user: AuthUserData, request?: Request) => Promise<void>;
|
|
11
11
|
/** Runs after coordinated user deletion. */
|
|
12
|
-
afterDelete?: (user:
|
|
12
|
+
afterDelete?: (user: AuthUserData, request?: Request) => Promise<void>;
|
|
13
13
|
/** Account-deletion token lifetime in seconds. */
|
|
14
14
|
deleteTokenExpiresIn?: number;
|
|
15
15
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { AuthSendResetPassword } from "../types/auth-send-reset-password.type.js";
|
|
2
2
|
import type { AuthModulePasswordOptions } from "./auth-module-password-options.interface.js";
|
|
3
|
-
import type {
|
|
3
|
+
import type { AuthUserData } from "./auth-user-data.interface.js";
|
|
4
4
|
/** Email and password authentication options owned by AuthModule. */
|
|
5
5
|
export interface AuthModuleEmailAndPasswordOptions {
|
|
6
6
|
/** Whether email and password authentication is enabled. Defaults to true. */
|
|
@@ -19,7 +19,7 @@ export interface AuthModuleEmailAndPasswordOptions {
|
|
|
19
19
|
resetPasswordTokenExpiresIn?: number;
|
|
20
20
|
/** Runs after a password has been reset successfully. */
|
|
21
21
|
onPasswordReset?: (data: {
|
|
22
|
-
user:
|
|
22
|
+
user: AuthUserData;
|
|
23
23
|
}, request?: Request) => Promise<void>;
|
|
24
24
|
/** Password hashing and verification callbacks. */
|
|
25
25
|
password?: AuthModulePasswordOptions;
|
|
@@ -29,6 +29,6 @@ export interface AuthModuleEmailAndPasswordOptions {
|
|
|
29
29
|
revokeSessionsOnPasswordReset?: boolean;
|
|
30
30
|
/** Runs when registration is attempted for an existing email address. */
|
|
31
31
|
onExistingUserSignUp?: (data: {
|
|
32
|
-
user:
|
|
32
|
+
user: AuthUserData;
|
|
33
33
|
}, request?: Request) => Promise<void>;
|
|
34
34
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { AuthSendVerificationEmail } from "../types/auth-send-verification-email.type.js";
|
|
2
|
-
import type {
|
|
2
|
+
import type { AuthUserData } from "./auth-user-data.interface.js";
|
|
3
3
|
/** Email verification options owned by AuthModule. */
|
|
4
4
|
export interface AuthModuleEmailVerificationOptions {
|
|
5
5
|
/** Custom verification sender. Defaults to the injected Mailer implementation. */
|
|
@@ -13,7 +13,7 @@ export interface AuthModuleEmailVerificationOptions {
|
|
|
13
13
|
/** Verification-token lifetime in seconds. */
|
|
14
14
|
expiresIn?: number;
|
|
15
15
|
/** Runs immediately before an email address is verified. */
|
|
16
|
-
beforeEmailVerification?: (user:
|
|
16
|
+
beforeEmailVerification?: (user: AuthUserData, request?: Request) => Promise<void>;
|
|
17
17
|
/** Runs after an email address has been verified. */
|
|
18
|
-
afterEmailVerification?: (user:
|
|
18
|
+
afterEmailVerification?: (user: AuthUserData, request?: Request) => Promise<void>;
|
|
19
19
|
}
|