@nest-boot/auth 8.2.0 → 8.4.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 +55 -15
- 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/decorators/can.decorator.d.ts +8 -1
- package/dist/common/decorators/can.decorator.js +28 -6
- package/dist/common/decorators/can.decorator.js.map +1 -1
- package/dist/common/interfaces/ability-context.interface.d.ts +3 -1
- package/dist/common/interfaces/can-metadata.interface.d.ts +10 -3
- 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.guard.js +4 -2
- package/dist/core/auth.guard.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/types/can-subject.type.d.ts +4 -0
- package/dist/core/types/can-subject.type.js +2 -0
- package/dist/core/types/can-subject.type.js.map +1 -0
- 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 +11 -8
- package/dist/index.js +11 -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 +7 -7
- 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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-api-key.resolver.js","sourceRoot":"","sources":["../../../src/api-key/resolvers/user-api-key.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EACL,IAAI,EACJ,EAAE,EACF,IAAI,EACJ,QAAQ,EACR,MAAM,EACN,KAAK,EACL,YAAY,EACZ,QAAQ,GACT,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"user-api-key.resolver.js","sourceRoot":"","sources":["../../../src/api-key/resolvers/user-api-key.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
11
11
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
12
12
|
};
|
|
13
13
|
import { Args, ID, Info, Parent, Query, ResolveField, Resolver, } from "@nest-boot/graphql";
|
|
14
|
-
import {
|
|
14
|
+
import { SelectedWorkspace } from "../../workspace/decorators/selected-workspace.decorator.js";
|
|
15
15
|
import { Workspace } from "../../workspace/entities/workspace.entity.js";
|
|
16
16
|
import { WorkspaceApiKeyConnection, WorkspaceApiKeyConnectionArgs, } from "../connections/workspace-api-key.connection-definition.js";
|
|
17
17
|
import { WorkspaceApiKey } from "../objects/workspace-api-key.object.js";
|
|
@@ -56,7 +56,7 @@ __decorate([
|
|
|
56
56
|
], WorkspaceApiKeyConnectionResolver.prototype, "apiKey", null);
|
|
57
57
|
__decorate([
|
|
58
58
|
Query(() => WorkspaceApiKeyConnection),
|
|
59
|
-
__param(0,
|
|
59
|
+
__param(0, SelectedWorkspace()),
|
|
60
60
|
__param(1, Args({ type: () => WorkspaceApiKeyConnectionArgs })),
|
|
61
61
|
__param(2, Info()),
|
|
62
62
|
__metadata("design:type", Function),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-api-key-connection.resolver.js","sourceRoot":"","sources":["../../../src/api-key/resolvers/workspace-api-key-connection.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EACL,IAAI,EACJ,EAAE,EACF,IAAI,EACJ,MAAM,EACN,KAAK,EACL,YAAY,EACZ,QAAQ,GACT,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"workspace-api-key-connection.resolver.js","sourceRoot":"","sources":["../../../src/api-key/resolvers/workspace-api-key-connection.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EACL,IAAI,EACJ,EAAE,EACF,IAAI,EACJ,MAAM,EACN,KAAK,EACL,YAAY,EACZ,QAAQ,GACT,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,4DAA4D,CAAC;AAC/F,OAAO,EAAE,SAAS,EAAE,MAAM,8CAA8C,CAAC;AACzE,OAAO,EACL,yBAAyB,EACzB,6BAA6B,GAC9B,MAAM,2DAA2D,CAAC;AAEnE,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAElF,0DAA0D;AAEnD,IAAM,iCAAiC,GAAvC,MAAM,iCAAiC;IAKvB;IAJrB;;;OAGG;IACH,YAAqB,aAAqC;QAArC,kBAAa,GAAb,aAAa,CAAwB;IAAG,CAAC;IAE9D;;;;;OAKG;IAEG,AAAN,KAAK,CAAC,MAAM,CACA,SAAoB,EACE,EAAU;QAE1C,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;IACpE,CAAC;IAED;;;;;;OAMG;IAEG,AAAN,KAAK,CAAC,gBAAgB,CACC,SAAoB,EAEzC,IAAqC,EAC7B,IAAyB;QAEjC,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,4BAA4B,CAC1D,SAAS,EACT,IAAI,EACJ,IAAI,CACL,CAAC;IACJ,CAAC;CACF,CAAA;AA3BO;IADL,YAAY,CAAC,GAAG,EAAE,CAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAErD,WAAA,MAAM,EAAE,CAAA;IACR,WAAA,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;;qCADV,SAAS;;+DAI/B;AAUK;IADL,KAAK,CAAC,GAAG,EAAE,CAAC,yBAAyB,CAAC;IAEpC,WAAA,iBAAiB,EAAE,CAAA;IACnB,WAAA,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,6BAA6B,EAAE,CAAC,CAAA;IAEnD,WAAA,IAAI,EAAE,CAAA;;qCAHyB,SAAS;;yEAU1C;AAxCU,iCAAiC;IAD7C,QAAQ,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;qCAMY,sBAAsB;GAL/C,iCAAiC,CAyC7C"}
|
|
@@ -12,7 +12,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
12
12
|
};
|
|
13
13
|
import { Reference } from "@mikro-orm/core";
|
|
14
14
|
import { Args, ID, Info, Mutation, Parent, Query, ResolveField, Resolver, } from "@nest-boot/graphql";
|
|
15
|
-
import {
|
|
15
|
+
import { SelectedWorkspace } from "../../workspace/decorators/selected-workspace.decorator.js";
|
|
16
16
|
import { Workspace } from "../../workspace/entities/workspace.entity.js";
|
|
17
17
|
import { WorkspaceMember } from "../../workspace/entities/workspace-member.entity.js";
|
|
18
18
|
import { WorkspaceApiKeyConnection, WorkspaceApiKeyConnectionArgs, } from "../connections/workspace-api-key.connection-definition.js";
|
|
@@ -93,7 +93,7 @@ let WorkspaceApiKeyResolver = class WorkspaceApiKeyResolver {
|
|
|
93
93
|
};
|
|
94
94
|
__decorate([
|
|
95
95
|
Query(() => [WorkspaceApiKeyPermissionOption]),
|
|
96
|
-
__param(0,
|
|
96
|
+
__param(0, SelectedWorkspace()),
|
|
97
97
|
__metadata("design:type", Function),
|
|
98
98
|
__metadata("design:paramtypes", [Workspace]),
|
|
99
99
|
__metadata("design:returntype", Array)
|
|
@@ -101,7 +101,7 @@ __decorate([
|
|
|
101
101
|
__decorate([
|
|
102
102
|
Mutation(() => CreateWorkspaceApiKeyResult),
|
|
103
103
|
__param(0, Args("input")),
|
|
104
|
-
__param(1,
|
|
104
|
+
__param(1, SelectedWorkspace()),
|
|
105
105
|
__metadata("design:type", Function),
|
|
106
106
|
__metadata("design:paramtypes", [CreateWorkspaceApiKeyInput,
|
|
107
107
|
Workspace]),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-api-key.resolver.js","sourceRoot":"","sources":["../../../src/api-key/resolvers/workspace-api-key.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,IAAI,EACJ,EAAE,EACF,IAAI,EACJ,QAAQ,EACR,MAAM,EACN,KAAK,EACL,YAAY,EACZ,QAAQ,GACT,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"workspace-api-key.resolver.js","sourceRoot":"","sources":["../../../src/api-key/resolvers/workspace-api-key.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,6 @@ import { WorkspaceMember } from "../../workspace/entities/workspace-member.entit
|
|
|
16
16
|
import { ApiKey } from "../entities/api-key.entity.js";
|
|
17
17
|
import { SystemAccount } from "../entities/system-account.entity.js";
|
|
18
18
|
import { hashApiKey } from "../utils/api-key-credential.util.js";
|
|
19
|
-
import { toApiKeyView } from "../utils/api-key-view.util.js";
|
|
20
19
|
import { assertApiKeyOwner } from "../utils/assert-api-key-owner.util.js";
|
|
21
20
|
/**
|
|
22
21
|
* Authenticates all three credential kinds; management stays in their domain services.
|
|
@@ -53,7 +52,7 @@ let ApiKeyAuthenticationService = class ApiKeyAuthenticationService {
|
|
|
53
52
|
const apiKey = await em.findOne(ApiKey, {
|
|
54
53
|
key,
|
|
55
54
|
ownerType: { $in: owners },
|
|
56
|
-
}, { refresh: true });
|
|
55
|
+
}, { refresh: true, exclude: ["key"] });
|
|
57
56
|
if (!apiKey || !owners.includes(apiKey.ownerType)) {
|
|
58
57
|
throw new UnauthorizedException("Invalid API key");
|
|
59
58
|
}
|
|
@@ -78,7 +77,7 @@ let ApiKeyAuthenticationService = class ApiKeyAuthenticationService {
|
|
|
78
77
|
}
|
|
79
78
|
assertApiKeyOwner(apiKey, "system_account");
|
|
80
79
|
return {
|
|
81
|
-
apiKey
|
|
80
|
+
apiKey,
|
|
82
81
|
ownerType: "system_account",
|
|
83
82
|
systemAccount,
|
|
84
83
|
};
|
|
@@ -93,7 +92,7 @@ let ApiKeyAuthenticationService = class ApiKeyAuthenticationService {
|
|
|
93
92
|
throw new UnauthorizedException("Invalid API key");
|
|
94
93
|
}
|
|
95
94
|
assertApiKeyOwner(apiKey, "user");
|
|
96
|
-
return { apiKey
|
|
95
|
+
return { apiKey, ownerType: "user", user };
|
|
97
96
|
}
|
|
98
97
|
const member = await em.findOne(WorkspaceMember, ownerId, {
|
|
99
98
|
refresh: true,
|
|
@@ -113,7 +112,7 @@ let ApiKeyAuthenticationService = class ApiKeyAuthenticationService {
|
|
|
113
112
|
const workspace = Reference.unwrapReference(member.workspace);
|
|
114
113
|
assertApiKeyOwner(apiKey, "workspace_member");
|
|
115
114
|
return {
|
|
116
|
-
apiKey
|
|
115
|
+
apiKey,
|
|
117
116
|
ownerType: "workspace_member",
|
|
118
117
|
workspace,
|
|
119
118
|
member,
|
|
@@ -127,15 +126,17 @@ let ApiKeyAuthenticationService = class ApiKeyAuthenticationService {
|
|
|
127
126
|
* @returns Callback that records usage for the captured key.
|
|
128
127
|
*/
|
|
129
128
|
captureUsage(apiKey) {
|
|
130
|
-
const
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
//
|
|
129
|
+
const isolated = apiKey.ownerType === "system_account" ||
|
|
130
|
+
(apiKey.ownerType === "workspace_member" &&
|
|
131
|
+
this.em.getSessionContext()?.variables?.["app.auth.workspace_member.id"] !== apiKey.member?.id);
|
|
132
|
+
// System credentials and member keys used outside their owning workspace have
|
|
133
|
+
// no request-role access to their key row. Isolate only that captured audit
|
|
134
|
+
// write; never change the business request's database scope or transaction.
|
|
134
135
|
const manager = this.em.fork({
|
|
135
136
|
useContext: false,
|
|
136
|
-
keepTransactionContext: !
|
|
137
|
+
keepTransactionContext: !isolated,
|
|
137
138
|
});
|
|
138
|
-
if (
|
|
139
|
+
if (isolated) {
|
|
139
140
|
manager.clearSessionContext();
|
|
140
141
|
}
|
|
141
142
|
return () => this.writeUsage(manager, apiKey);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-key-authentication.service.js","sourceRoot":"","sources":["../../../src/api-key/services/api-key-authentication.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAEnE,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AACpE,OAAO,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAE1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,gDAAgD,CAAC;AACrF,OAAO,EAAE,eAAe,EAAE,MAAM,qDAAqD,CAAC;AACtF,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAGrE,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AACjE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"api-key-authentication.service.js","sourceRoot":"","sources":["../../../src/api-key/services/api-key-authentication.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,13 +8,14 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
10
|
import { EntityManager, TransactionContext } from "@mikro-orm/core";
|
|
11
|
+
import { onFullTextCreate } from "@nest-boot/database";
|
|
11
12
|
import { RequestContext } from "@nest-boot/request-context";
|
|
12
13
|
import { BadRequestException, Injectable, NotFoundException, } from "@nestjs/common";
|
|
13
14
|
import { authorize } from "../../common/utils/authorize.util.js";
|
|
15
|
+
import { omitCredentials } from "../../common/utils/omit-credentials.util.js";
|
|
14
16
|
import { AuthContext } from "../../core/auth-context.js";
|
|
15
17
|
import { ApiKey } from "../entities/api-key.entity.js";
|
|
16
18
|
import { generateApiKey, hashApiKey, } from "../utils/api-key-credential.util.js";
|
|
17
|
-
import { toApiKeyView } from "../utils/api-key-view.util.js";
|
|
18
19
|
import { isCurrentApiKey } from "../utils/is-current-api-key.util.js";
|
|
19
20
|
/**
|
|
20
21
|
* Shared credential authorization, persistence and request-identity synchronization.
|
|
@@ -99,8 +100,18 @@ let ApiKeyService = class ApiKeyService {
|
|
|
99
100
|
authorize("write", updated, field);
|
|
100
101
|
}
|
|
101
102
|
if (Object.keys(data).length) {
|
|
103
|
+
// Native writes have no ORM snapshot, so maintain derived name tokens explicitly.
|
|
104
|
+
if (input.name !== undefined) {
|
|
105
|
+
updated.searchableName = onFullTextCreate("name")(updated);
|
|
106
|
+
}
|
|
102
107
|
updated.updatedAt = new Date();
|
|
103
|
-
const affected = await this.manager.nativeUpdate(ApiKey, { id: apiKey.id, ownerType: apiKey.ownerType }, {
|
|
108
|
+
const affected = await this.manager.nativeUpdate(ApiKey, { id: apiKey.id, ownerType: apiKey.ownerType }, {
|
|
109
|
+
...data,
|
|
110
|
+
...(input.name !== undefined && {
|
|
111
|
+
searchableName: updated.searchableName,
|
|
112
|
+
}),
|
|
113
|
+
updatedAt: updated.updatedAt,
|
|
114
|
+
});
|
|
104
115
|
if (affected === 0) {
|
|
105
116
|
throw new NotFoundException("API key not found");
|
|
106
117
|
}
|
|
@@ -177,7 +188,9 @@ let ApiKeyService = class ApiKeyService {
|
|
|
177
188
|
this.authContext.clear();
|
|
178
189
|
}
|
|
179
190
|
else {
|
|
180
|
-
|
|
191
|
+
const identity = omitCredentials(apiKey, ["key"]);
|
|
192
|
+
identity.permissions = [...apiKey.permissions];
|
|
193
|
+
this.authContext.set({ apiKey: identity });
|
|
181
194
|
}
|
|
182
195
|
}
|
|
183
196
|
assertCurrentKeyCanChange(apiKey) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-key.service.js","sourceRoot":"","sources":["../../../src/api-key/services/api-key.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EACL,mBAAmB,EACnB,UAAU,EACV,iBAAiB,GAClB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,MAAM,EAAqB,MAAM,+BAA+B,CAAC;AAG1E,OAAO,EACL,cAAc,EACd,UAAU,GACX,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"api-key.service.js","sourceRoot":"","sources":["../../../src/api-key/services/api-key.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EACL,mBAAmB,EACnB,UAAU,EACV,iBAAiB,GAClB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,MAAM,EAAqB,MAAM,+BAA+B,CAAC;AAG1E,OAAO,EACL,cAAc,EACd,UAAU,GACX,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAEtE;;;GAGG;AAEI,IAAM,aAAa,GAAnB,MAAM,aAAa;IAEL;IACA;IAFnB,YACmB,EAAiB,EACjB,WAAwB;QADxB,OAAE,GAAF,EAAE,CAAe;QACjB,gBAAW,GAAX,WAAW,CAAa;IACxC,CAAC;IACJ;;;;;;OAMG;IACH,eAAe,CACb,OAA4B,EAC5B,WAAqB,EACrB,aAAqB;QAErB,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,aAAa,CAAC;QAC/C,MAAM,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;QACtC,OAAO;YACL,MAAM;YACN,IAAI,EAAE;gBACJ,SAAS,EAAE,IAAI;gBACf,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,IAAI;gBACpC,GAAG,EAAE,UAAU,CAAC,MAAM,CAAC;gBACvB,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,WAAW;gBACX,MAAM;gBACN,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;aAC1B;SACF,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,iBAAiB,CAAC,MAAoB,EAAE,KAA0B;QAChE,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC3B,MAAM,MAAM,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QACvC,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YAClC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC3B,CAAC;QACD,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC/B,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxB,CAAC;QACD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,gBAAgB,CAAC,SAAkC;QACjD,IAAI,SAAS,IAAI,SAAS,IAAI,IAAI,IAAI,EAAE,EAAE,CAAC;YACzC,MAAM,IAAI,mBAAmB,CAAC,0CAA0C,CAAC,CAAC;QAC5E,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,MAAM,CACV,MAAW,EACX,KAA0B,EAC1B,WAAiC;QAEjC,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC;QACvC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACvC,MAAM,IAAI,GAAG;YACX,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;YACrD,GAAG,CAAC,KAAK,CAAC,SAAS,KAAK,SAAS,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC;YACpE,GAAG,CAAC,WAAW,KAAK,SAAS,IAAI,EAAE,WAAW,EAAE,CAAC;SAClD,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAC1D,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC5B,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACtC,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QACrC,CAAC;QACD,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;YAC7B,kFAAkF;YAClF,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBAC7B,OAAO,CAAC,cAAc,GAAG,gBAAgB,CAAS,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC;YACrE,CAAC;YACD,OAAO,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;YAC/B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAC9C,MAAM,EACN,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,EAC9C;gBACE,GAAG,IAAI;gBACP,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI;oBAC9B,cAAc,EAAE,OAAO,CAAC,cAAc;iBACvC,CAAC;gBACF,SAAS,EAAE,OAAO,CAAC,SAAS;aAC7B,CACF,CAAC;YACF,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;gBACnB,MAAM,IAAI,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;YACnD,CAAC;QACH,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACtB,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,MAAM,CAA2B,MAAW;QAChD,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC;QACvC,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;QACxC,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YACrB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACrB,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;QAC7B,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QACrE,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC9B,SAAS,CAAC,OAAO,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAC3C,iFAAiF;QACjF,MAAM,OAAO,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;QACxC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAC9C,MAAM,EACN,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,EAC/D;YACE,SAAS;YACT,SAAS,EAAE,SAAS;YACpB,GAAG,CAAC,OAAO,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;SAC1C,CACF,CAAC;QACF,IAAI,QAAQ,EAAE,CAAC;YACb,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC;YAChC,IAAI,OAAO,EAAE,CAAC;gBACZ,SAAS,CAAC,UAAU,GAAG,SAAS,CAAC;YACnC,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAC1C,MAAM,EACN,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,EAC9C,EAAE,OAAO,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAC5C,CAAC;YACF,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,CAAC;gBAC1B,MAAM,IAAI,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;YACnD,CAAC;YACD,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC;YAC1C,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC;YAC1C,SAAS,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC;QAC9C,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACxB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,MAAM,CAA2B,MAAW;QAChD,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC;QACvC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC;QAC1C,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC3B,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,IAAY,OAAO;QACjB,OAAO,CACL,kBAAkB,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC;YACjD,CAAC,cAAc,CAAC,QAAQ,EAAE;gBACxB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,aAAa,CAAC;gBACnC,CAAC,CAAC,SAAS,CAAC;YACd,IAAI,CAAC,EAAE,CACR,CAAC;IACJ,CAAC;IACO,OAAO,CAAC,MAAoB,EAAE,OAAO,GAAG,KAAK;QACnD,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7B,OAAO;QACT,CAAC;QACD,IACE,OAAO;YACP,MAAM,CAAC,SAAS;YAChB,CAAC,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,SAAS,IAAI,IAAI,IAAI,EAAE,CAAC,EACpD,CAAC;YACD,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QAC3B,CAAC;aAAM,CAAC;YACN,MAAM,QAAQ,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;YAClD,QAAQ,CAAC,WAAW,GAAG,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;YAC/C,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;IAEO,yBAAyB,CAAC,MAAoB;QACpD,IAAI,eAAe,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC;YAC9D,MAAM,IAAI,mBAAmB,CAC3B,0DAA0D,CAC3D,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAA;AA7MY,aAAa;IADzB,UAAU,EAAE;qCAGY,aAAa;QACJ,WAAW;GAHhC,aAAa,CA6MzB"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type ApiKeyRecord } from "../entities/api-key.entity.js";
|
|
2
2
|
/**
|
|
3
|
-
* Returns the
|
|
3
|
+
* Returns the authenticated ORM credential without loading its hash.
|
|
4
4
|
* @returns API key metadata for this request, or null for other authentication methods.
|
|
5
5
|
* @internal
|
|
6
6
|
*/
|
|
7
|
-
export declare function getCurrentApiKey():
|
|
7
|
+
export declare function getCurrentApiKey(): ApiKeyRecord | null;
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { RequestContext } from "@nest-boot/request-context";
|
|
2
|
-
import {
|
|
2
|
+
import { ApiKey } from "../entities/api-key.entity.js";
|
|
3
3
|
/**
|
|
4
|
-
* Returns the
|
|
4
|
+
* Returns the authenticated ORM credential without loading its hash.
|
|
5
5
|
* @returns API key metadata for this request, or null for other authentication methods.
|
|
6
6
|
* @internal
|
|
7
7
|
*/
|
|
8
8
|
export function getCurrentApiKey() {
|
|
9
9
|
return RequestContext.isActive()
|
|
10
|
-
? (RequestContext.get(
|
|
10
|
+
? (RequestContext.get(ApiKey) ?? null)
|
|
11
11
|
: null;
|
|
12
12
|
}
|
|
13
13
|
//# sourceMappingURL=get-current-api-key.util.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-current-api-key.util.js","sourceRoot":"","sources":["../../../src/api-key/utils/get-current-api-key.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"get-current-api-key.util.js","sourceRoot":"","sources":["../../../src/api-key/utils/get-current-api-key.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,MAAM,EAAqB,MAAM,+BAA+B,CAAC;AAE1E;;;;GAIG;AACH,MAAM,UAAU,gBAAgB;IAC9B,OAAO,cAAc,CAAC,QAAQ,EAAE;QAC9B,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAe,MAAM,CAAC,IAAI,IAAI,CAAC;QACpD,CAAC,CAAC,IAAI,CAAC;AACX,CAAC"}
|
|
@@ -1,7 +1,14 @@
|
|
|
1
|
-
import type { Subject } from "@casl/ability";
|
|
1
|
+
import type { Subject, SubjectType } from "@casl/ability";
|
|
2
2
|
import type { CustomDecorator } from "@nestjs/common";
|
|
3
3
|
import type { CanSubjectCallback } from "../../core/types/can-subject-callback.type.js";
|
|
4
4
|
import { CAN_METADATA } from "../constants/permission.constants.js";
|
|
5
|
+
/**
|
|
6
|
+
* Requires an action on a static subject type; repeated declarations must all be allowed.
|
|
7
|
+
* @param action - Permission action to check.
|
|
8
|
+
* @param subject - Entity class or subject name to authorize.
|
|
9
|
+
* @returns Decorator that appends authorization metadata to the handler.
|
|
10
|
+
*/
|
|
11
|
+
export declare function Can(action: string, subject: SubjectType): CustomDecorator<typeof CAN_METADATA>;
|
|
5
12
|
/**
|
|
6
13
|
* Requires an action on the callback result; repeated declarations must all be allowed.
|
|
7
14
|
* @param action - Permission action to check.
|
|
@@ -1,16 +1,38 @@
|
|
|
1
1
|
import { CAN_METADATA } from "../constants/permission.constants.js";
|
|
2
2
|
import { appendMetadata } from "../utils/append-metadata.util.js";
|
|
3
|
+
const CLASS_CONSTRUCTOR_PATTERN = /^class(?:\s|\{)/;
|
|
3
4
|
/**
|
|
4
|
-
*
|
|
5
|
+
* Determines whether a value passed to `Can` is a static subject type rather than a callback.
|
|
6
|
+
* @param value - Candidate subject type or callback.
|
|
7
|
+
* @returns `true` when the value is a non-empty subject name or ES class constructor.
|
|
8
|
+
*/
|
|
9
|
+
function isSubjectType(value) {
|
|
10
|
+
if (typeof value === "string") {
|
|
11
|
+
return value.length > 0;
|
|
12
|
+
}
|
|
13
|
+
if (typeof value !== "function") {
|
|
14
|
+
return false;
|
|
15
|
+
}
|
|
16
|
+
return CLASS_CONSTRUCTOR_PATTERN.test(Function.prototype.toString.call(value));
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* Requires an action on a static subject type or callback result; repeated declarations must all be allowed.
|
|
5
20
|
* @param action - Permission action to check.
|
|
6
|
-
* @param
|
|
21
|
+
* @param subjectOrCallback - Static subject type or callback resolving the resource being authorized.
|
|
7
22
|
* @returns Decorator that appends authorization metadata to the handler.
|
|
8
23
|
*/
|
|
9
|
-
export function Can(action,
|
|
10
|
-
if (
|
|
11
|
-
|
|
24
|
+
export function Can(action, subjectOrCallback) {
|
|
25
|
+
if (isSubjectType(subjectOrCallback)) {
|
|
26
|
+
const metadata = { action, subject: subjectOrCallback };
|
|
27
|
+
return appendMetadata(CAN_METADATA, metadata);
|
|
28
|
+
}
|
|
29
|
+
if (typeof subjectOrCallback !== "function") {
|
|
30
|
+
throw new TypeError("Permission subject type or callback is required.");
|
|
12
31
|
}
|
|
13
|
-
const metadata = {
|
|
32
|
+
const metadata = {
|
|
33
|
+
action,
|
|
34
|
+
subjectCallback: subjectOrCallback,
|
|
35
|
+
};
|
|
14
36
|
return appendMetadata(CAN_METADATA, metadata);
|
|
15
37
|
}
|
|
16
38
|
//# sourceMappingURL=can.decorator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"can.decorator.js","sourceRoot":"","sources":["../../../src/common/decorators/can.decorator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"can.decorator.js","sourceRoot":"","sources":["../../../src/common/decorators/can.decorator.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAEpE,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAElE,MAAM,yBAAyB,GAAG,iBAAiB,CAAC;AAEpD;;;;GAIG;AACH,SAAS,aAAa,CAAC,KAAc;IACnC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE,CAAC;QAChC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,yBAAyB,CAAC,IAAI,CACnC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CACxC,CAAC;AACJ,CAAC;AA4BD;;;;;GAKG;AACH,MAAM,UAAU,GAAG,CAKjB,MAAc,EACd,iBAA8C;IAE9C,IAAI,aAAa,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACrC,MAAM,QAAQ,GAAmB,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC;QACxE,OAAO,cAAc,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;IAChD,CAAC;IAED,IAAI,OAAO,iBAAiB,KAAK,UAAU,EAAE,CAAC;QAC5C,MAAM,IAAI,SAAS,CAAC,kDAAkD,CAAC,CAAC;IAC1E,CAAC;IAED,MAAM,QAAQ,GAAmB;QAC/B,MAAM;QACN,eAAe,EAAE,iBAA0C;KAC5D,CAAC;IACF,OAAO,cAAc,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;AAChD,CAAC"}
|
|
@@ -8,8 +8,10 @@ export interface AbilityContext<UserPermission extends string = string, Workspac
|
|
|
8
8
|
readonly systemAccount?: SystemAccount | null;
|
|
9
9
|
/** Authenticated user; absent for anonymous and member API-key requests. */
|
|
10
10
|
readonly user: User | null;
|
|
11
|
-
/**
|
|
11
|
+
/** Authenticated workspace backed by matching membership or effective system grants. */
|
|
12
12
|
readonly workspace: Workspace | null;
|
|
13
|
+
/** Request-selected target; selection alone carries no grants. */
|
|
14
|
+
readonly selectedWorkspace?: Workspace | null;
|
|
13
15
|
/** Active user or service-account membership; absent outside an authorized workspace. */
|
|
14
16
|
readonly member: WorkspaceMember | null;
|
|
15
17
|
/** Effective user grants after applying the authenticating credential's ceiling. */
|
|
@@ -1,9 +1,16 @@
|
|
|
1
|
-
import type { Subject } from "@casl/ability";
|
|
1
|
+
import type { Subject, SubjectType } from "@casl/ability";
|
|
2
2
|
import type { CanSubjectCallback } from "../../core/types/can-subject-callback.type.js";
|
|
3
3
|
/** Route metadata produced by the unified Can decorator. */
|
|
4
|
-
export
|
|
4
|
+
export type CanMetadata<T extends Subject = Subject> = {
|
|
5
|
+
/** Permission action that must be allowed. */
|
|
6
|
+
action: string;
|
|
7
|
+
/** Static entity class or subject name to check. */
|
|
8
|
+
subject: SubjectType;
|
|
9
|
+
subjectCallback?: never;
|
|
10
|
+
} | {
|
|
5
11
|
/** Permission action that must be allowed. */
|
|
6
12
|
action: string;
|
|
7
13
|
/** Callback returning the entity type or record to check. */
|
|
8
14
|
subjectCallback: CanSubjectCallback<T>;
|
|
9
|
-
|
|
15
|
+
subject?: never;
|
|
16
|
+
};
|
|
@@ -29,7 +29,8 @@ export function createScopePolicy(scope, options) {
|
|
|
29
29
|
throw new TypeError(`Scope policy requires a mapped column for property: ${property}`);
|
|
30
30
|
}
|
|
31
31
|
const column = columns[property].replaceAll('"', '""');
|
|
32
|
-
|
|
32
|
+
const variable = scope === "workspace" ? "app.auth.workspace.id" : "app.auth.user.id";
|
|
33
|
+
return `"${column}" = nullif(current_setting('${variable}', true), '')::${type}`;
|
|
33
34
|
};
|
|
34
35
|
return {
|
|
35
36
|
...(options.name !== undefined ? { name: options.name } : {}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-scope-policy.js","sourceRoot":"","sources":["../../../src/common/policies/create-scope-policy.ts"],"names":[],"mappings":"AAIA;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAC/B,KAA2B,EAC3B,OAA2B;IAE3B,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,QAAQ,CAAC;IACtC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,KAAK,CAAC;IAC3C,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,KAAK,CAAC;IACzC,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IAExD,IAAI,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,SAAS,CAAC,kCAAkC,IAAI,EAAE,CAAC,CAAC;IAChE,CAAC;IACD,IAAI,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QACvE,MAAM,IAAI,SAAS,CAAC,qCAAqC,OAAO,EAAE,CAAC,CAAC;IACtE,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;QACrB,MAAM,IAAI,SAAS,CAAC,yCAAyC,CAAC,CAAC;IACjE,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;QACxD,MAAM,IAAI,SAAS,CAAC,sCAAsC,CAAC,CAAC;IAC9D,CAAC;IAED,MAAM,YAAY,GAA4C,CAAC,OAAO,EAAE,EAAE;QACxE,IACE,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC;YACjC,OAAO,OAAO,CAAC,QAAQ,CAAC,KAAK,QAAQ;YACrC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAClB,CAAC;YACD,MAAM,IAAI,SAAS,CACjB,uDAAuD,QAAQ,EAAE,CAClE,CAAC;QACJ,CAAC;QACD,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACvD,OAAO,IAAI,MAAM,
|
|
1
|
+
{"version":3,"file":"create-scope-policy.js","sourceRoot":"","sources":["../../../src/common/policies/create-scope-policy.ts"],"names":[],"mappings":"AAIA;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAC/B,KAA2B,EAC3B,OAA2B;IAE3B,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,QAAQ,CAAC;IACtC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,KAAK,CAAC;IAC3C,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,KAAK,CAAC;IACzC,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IAExD,IAAI,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,SAAS,CAAC,kCAAkC,IAAI,EAAE,CAAC,CAAC;IAChE,CAAC;IACD,IAAI,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QACvE,MAAM,IAAI,SAAS,CAAC,qCAAqC,OAAO,EAAE,CAAC,CAAC;IACtE,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;QACrB,MAAM,IAAI,SAAS,CAAC,yCAAyC,CAAC,CAAC;IACjE,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;QACxD,MAAM,IAAI,SAAS,CAAC,sCAAsC,CAAC,CAAC;IAC9D,CAAC;IAED,MAAM,YAAY,GAA4C,CAAC,OAAO,EAAE,EAAE;QACxE,IACE,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC;YACjC,OAAO,OAAO,CAAC,QAAQ,CAAC,KAAK,QAAQ;YACrC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAClB,CAAC;YACD,MAAM,IAAI,SAAS,CACjB,uDAAuD,QAAQ,EAAE,CAClE,CAAC;QACJ,CAAC;QACD,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACvD,MAAM,QAAQ,GACZ,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,kBAAkB,CAAC;QACvE,OAAO,IAAI,MAAM,+BAA+B,QAAQ,kBAAkB,IAAI,EAAE,CAAC;IACnF,CAAC,CAAC;IAEF,OAAO;QACL,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7D,OAAO;QACP,KAAK;QACL,GAAG,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACxD,GAAG,CAAC,OAAO,KAAK,KAAK,IAAI,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,QAAQ;YACnE,CAAC,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE;YACzB,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { PolicyDef } from "@mikro-orm/core";
|
|
2
2
|
import type { ScopePolicyOptions } from "../interfaces/scope-policy-options.interface.js";
|
|
3
3
|
/**
|
|
4
|
-
* Creates a native permissive RLS policy matching app.user.id.
|
|
4
|
+
* Creates a native permissive RLS policy matching app.auth.user.id.
|
|
5
5
|
* Defaults to `type: "bigint"`, `property: "user"`, `command: "all"` for the
|
|
6
6
|
* authenticated database role. Set command: "select" for read-only ownership.
|
|
7
7
|
* Missing/empty session identifiers match no rows. The property must map to a
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { createScopePolicy } from "./create-scope-policy.js";
|
|
2
2
|
/**
|
|
3
|
-
* Creates a native permissive RLS policy matching app.user.id.
|
|
3
|
+
* Creates a native permissive RLS policy matching app.auth.user.id.
|
|
4
4
|
* Defaults to `type: "bigint"`, `property: "user"`, `command: "all"` for the
|
|
5
5
|
* authenticated database role. Set command: "select" for read-only ownership.
|
|
6
6
|
* Missing/empty session identifiers match no rows. The property must map to a
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { PolicyDef } from "@mikro-orm/core";
|
|
2
2
|
import type { ScopePolicyOptions } from "../interfaces/scope-policy-options.interface.js";
|
|
3
3
|
/**
|
|
4
|
-
* Creates a native permissive RLS policy matching app.workspace.id.
|
|
4
|
+
* Creates a native permissive RLS policy matching app.auth.workspace.id.
|
|
5
5
|
* Defaults to `type: "bigint"`, `property: "workspace"`, `command: "all"` for the
|
|
6
6
|
* authenticated database role. Does not query the parent workspace or replace
|
|
7
7
|
* service authorization. Missing/empty session identifiers match no rows.
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { createScopePolicy } from "./create-scope-policy.js";
|
|
2
2
|
/**
|
|
3
|
-
* Creates a native permissive RLS policy matching app.workspace.id.
|
|
3
|
+
* Creates a native permissive RLS policy matching app.auth.workspace.id.
|
|
4
4
|
* Defaults to `type: "bigint"`, `property: "workspace"`, `command: "all"` for the
|
|
5
5
|
* authenticated database role. Does not query the parent workspace or replace
|
|
6
6
|
* service authorization. Missing/empty session identifiers match no rows.
|
|
@@ -39,14 +39,16 @@ export async function runAuthQuery(em, callback) {
|
|
|
39
39
|
})).catch((error) => {
|
|
40
40
|
// Only an explicit post-commit rejection can revoke identity on failure.
|
|
41
41
|
if (error instanceof RevokedAuthenticationException) {
|
|
42
|
-
|
|
42
|
+
RequestContext.set(EntityManager, current);
|
|
43
|
+
clearAuthenticationContext();
|
|
43
44
|
}
|
|
44
45
|
throw error;
|
|
45
46
|
});
|
|
46
47
|
// Publish an explicit, successful credential revocation back to the caller.
|
|
47
48
|
// Other failed operations leave its identity and scoped manager unchanged.
|
|
48
49
|
if (revoked) {
|
|
49
|
-
|
|
50
|
+
RequestContext.set(EntityManager, current);
|
|
51
|
+
clearAuthenticationContext();
|
|
50
52
|
}
|
|
51
53
|
return result;
|
|
52
54
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-auth-query.js","sourceRoot":"","sources":["../../../src/common/utils/run-auth-query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAC;AACnF,OAAO,EAAE,OAAO,EAAE,MAAM,uCAAuC,CAAC;AAChE,OAAO,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAC1D,OAAO,EAAE,8BAA8B,EAAE,MAAM,gDAAgD,CAAC;AAChG,OAAO,EAAE,0BAA0B,EAAE,MAAM,uDAAuD,CAAC;AAEnG;;;;;;GAMG;AACH,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;IAED,2EAA2E;IAC3E,4EAA4E;IAC5E,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,EAAE,CAAC;QAC9B,MAAM,WAAW,GAAG,GAAG,EAAE,CACvB,OAAO,CACL,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC;YACxB,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC;YAC3B,gBAAgB,EAAE,CACnB,CAAC;QACJ,MAAM,aAAa,GAAG,WAAW,EAAE,CAAC;QACpC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,cAAc,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;YAClE,MAAM,EAAE,MAAM,GAAG,EAAE;YACnB,OAAO,EAAE,aAAa,IAAI,CAAC,WAAW,EAAE;SACzC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;YAC3B,yEAAyE;YACzE,IAAI,KAAK,YAAY,8BAA8B,EAAE,CAAC;gBACpD,
|
|
1
|
+
{"version":3,"file":"run-auth-query.js","sourceRoot":"","sources":["../../../src/common/utils/run-auth-query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAC;AACnF,OAAO,EAAE,OAAO,EAAE,MAAM,uCAAuC,CAAC;AAChE,OAAO,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAC1D,OAAO,EAAE,8BAA8B,EAAE,MAAM,gDAAgD,CAAC;AAChG,OAAO,EAAE,0BAA0B,EAAE,MAAM,uDAAuD,CAAC;AAEnG;;;;;;GAMG;AACH,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;IAED,2EAA2E;IAC3E,4EAA4E;IAC5E,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,EAAE,CAAC;QAC9B,MAAM,WAAW,GAAG,GAAG,EAAE,CACvB,OAAO,CACL,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC;YACxB,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC;YAC3B,gBAAgB,EAAE,CACnB,CAAC;QACJ,MAAM,aAAa,GAAG,WAAW,EAAE,CAAC;QACpC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,cAAc,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;YAClE,MAAM,EAAE,MAAM,GAAG,EAAE;YACnB,OAAO,EAAE,aAAa,IAAI,CAAC,WAAW,EAAE;SACzC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;YAC3B,yEAAyE;YACzE,IAAI,KAAK,YAAY,8BAA8B,EAAE,CAAC;gBACpD,cAAc,CAAC,GAAG,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;gBAC3C,0BAA0B,EAAE,CAAC;YAC/B,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC,CAAC,CAAC;QACH,4EAA4E;QAC5E,2EAA2E;QAC3E,IAAI,OAAO,EAAE,CAAC;YACZ,cAAc,CAAC,GAAG,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;YAC3C,0BAA0B,EAAE,CAAC;QAC/B,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,OAAO,MAAM,cAAc,CAAC,GAAG,CAC7B,IAAI,cAAc,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC,EAChD,GAAG,CACJ,CAAC;AACJ,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { LockMode } from "@mikro-orm/core";
|
|
2
|
+
import { onFullTextCreate } from "@nest-boot/database";
|
|
2
3
|
import { runAuthQuery } from "../../../common/utils/run-auth-query.js";
|
|
3
4
|
import { createEntityMetadataResolver } from "./entity-metadata-resolver.js";
|
|
4
5
|
import { convertWhereToMikroOrm } from "./where-compiler.js";
|
|
@@ -45,7 +46,19 @@ export function createMikroOrmCustomAdapter({ defaultUserRole, em, entities, inT
|
|
|
45
46
|
await em.flush();
|
|
46
47
|
return resolver.toAdapterRecord(model, entity);
|
|
47
48
|
}),
|
|
48
|
-
updateMany: async ({ model, where, update }) => await runUnrestricted(async (em) =>
|
|
49
|
+
updateMany: async ({ model, where, update }) => await runUnrestricted(async (em) => {
|
|
50
|
+
const entity = resolver.getEntityClass(model);
|
|
51
|
+
const data = resolver.toEntityData(model, update);
|
|
52
|
+
if (entity === entities.user &&
|
|
53
|
+
typeof data.name === "string" &&
|
|
54
|
+
Object.hasOwn(em.getMetadata().get(entity).properties, "searchableName")) {
|
|
55
|
+
// Native bulk updates bypass snapshot-dependent derived-property callbacks.
|
|
56
|
+
data.searchableName = onFullTextCreate("name")({
|
|
57
|
+
name: data.name,
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
return await em.nativeUpdate(entity, convertWhere(model, where), data);
|
|
61
|
+
}),
|
|
49
62
|
delete: async ({ model, where }) => {
|
|
50
63
|
await runUnrestricted(async (em) => {
|
|
51
64
|
await em.nativeDelete(resolver.getEntityClass(model), convertWhere(model, where));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-custom-adapter.js","sourceRoot":"","sources":["../../../../src/core/adapters/mikro-orm/create-custom-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,QAAQ,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"create-custom-adapter.js","sourceRoot":"","sources":["../../../../src/core/adapters/mikro-orm/create-custom-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { EntityManager } from "@mikro-orm/core";
|
|
2
|
-
import type
|
|
2
|
+
import { type ApiKeyRecord } from "../api-key/entities/api-key.entity.js";
|
|
3
3
|
import { AuthAbility } from "../common/auth.ability.js";
|
|
4
4
|
import { Workspace } from "../workspace/entities/workspace.entity.js";
|
|
5
5
|
import { WorkspaceMember } from "../workspace/entities/workspace-member.entity.js";
|
|
@@ -12,9 +12,14 @@ export declare class AuthContext {
|
|
|
12
12
|
private readonly options;
|
|
13
13
|
constructor(em: EntityManager, options: AuthModuleOptions);
|
|
14
14
|
get user(): User | null;
|
|
15
|
+
get apiKey(): ApiKeyRecord | null;
|
|
16
|
+
/**
|
|
17
|
+
* Workspace scope established from the current identity and effective grants.
|
|
18
|
+
* @returns Authenticated workspace, or null without effective workspace access.
|
|
19
|
+
*/
|
|
20
|
+
get authWorkspace(): Workspace | null;
|
|
15
21
|
get member(): WorkspaceMember | null;
|
|
16
|
-
get
|
|
17
|
-
get apiKey(): ApiKeyObject | null;
|
|
22
|
+
get selectedWorkspace(): Workspace | null;
|
|
18
23
|
/**
|
|
19
24
|
* Initializes a fully resolved identity before request handling.
|
|
20
25
|
* @param identity - Identity values to publish.
|
|
@@ -26,7 +31,10 @@ export declare class AuthContext {
|
|
|
26
31
|
*/
|
|
27
32
|
set(identity: AuthContextPatch): void;
|
|
28
33
|
clear(): void;
|
|
34
|
+
/** Clears a deleted target and its associated authenticated membership. */
|
|
29
35
|
clearWorkspace(): void;
|
|
36
|
+
/** Revokes membership without changing the independently selected target. */
|
|
37
|
+
clearWorkspaceMember(): void;
|
|
30
38
|
getAbility(): AuthAbility | undefined;
|
|
31
39
|
refresh(): void;
|
|
32
40
|
private get requestManager();
|