@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
package/README.md
CHANGED
|
@@ -49,10 +49,10 @@ This is a startup setting. Use a fresh process when changing feature modes,
|
|
|
49
49
|
because Nest GraphQL retains type and resolver metadata for the process lifetime.
|
|
50
50
|
|
|
51
51
|
AuthModule automatically registers its enabled entities through `DatabaseModule`.
|
|
52
|
-
Use `nb database
|
|
52
|
+
Use `nb database migration`, `nb database schema`, and `nb database seeder`
|
|
53
53
|
from your application's CLI entry to share runtime configuration and entity metadata.
|
|
54
54
|
No separate MikroORM config file or auth configuration helper is needed.
|
|
55
|
-
For direct ORM consumers, `entities` and `workspaceEntities` contain the complete model, including the
|
|
55
|
+
For direct ORM consumers, `entities` and `workspaceEntities` contain the complete model, including the decorated `ApiKey` and abstract `BaseApiKeySchema`. Register `ApiKey` alongside `createBaseApiKeySchema({ user, workspace, system })` and the enabled owner classes for a feature-specific model. `BaseApiKey` declares only the owner relation; its schema supplies feature-dependent owner targets, constraints and RLS. Ordinary fields, indexes and `SearchableProperty` are defined on `ApiKey`. Auth entities share the application database schema; Auth has no separate schema configuration.
|
|
56
56
|
|
|
57
57
|
Disabled applications expose no workspace/member/invitation/member-key GraphQL APIs
|
|
58
58
|
or user workspace/invitation relation fields. Their middleware ignores workspace
|
|
@@ -67,7 +67,7 @@ of optional entities; use `WorkspaceMemberService` for membership queries.
|
|
|
67
67
|
## WorkspaceMember and WorkspaceInvitation rename
|
|
68
68
|
|
|
69
69
|
Use `WorkspaceMember`,
|
|
70
|
-
`WorkspaceInvitation`, `WorkspaceMemberService`, `WorkspaceInvitationService`, and `
|
|
70
|
+
`WorkspaceInvitation`, `WorkspaceMemberService`, `WorkspaceInvitationService`, and `AuthWorkspaceMember`.
|
|
71
71
|
Workspace ownership remains the
|
|
72
72
|
`workspace` relation, and workspace-role configuration still lives under
|
|
73
73
|
`workspace`.
|
|
@@ -100,7 +100,7 @@ inherit ORM state or expose stored credential hashes.
|
|
|
100
100
|
|
|
101
101
|
`AuthModule` registers the core entities through `DatabaseModule` automatically and
|
|
102
102
|
includes workspace models when `workspace.enabled` is true. Use the application's
|
|
103
|
-
`nb database
|
|
103
|
+
`nb database` commands for schema, migration, and seeding operations; no separate
|
|
104
104
|
`mikro-orm.config.ts` is needed. Direct MikroORM consumers register the required entity classes and native API-key schema explicitly. All Auth models share the application database schema; Auth does not read database environment configuration or configure SQL search paths.
|
|
105
105
|
|
|
106
106
|
Use separate related business entities and additional field resolvers to extend
|
|
@@ -388,8 +388,28 @@ RLS-scoped manager. Foreign keys cascade to members and invitations. Users and A
|
|
|
388
388
|
context or restore operation. Successful deletion clears the request's workspace
|
|
389
389
|
identity and ability. Keys whose member was deleted retain their metadata and usage timestamps for audit, but cannot authenticate.
|
|
390
390
|
|
|
391
|
-
|
|
392
|
-
`
|
|
391
|
+
Request identity tokens use the entity classes `User`, `Session`, `ApiKey`,
|
|
392
|
+
`Workspace` and `WorkspaceMember`. The independent target uses the
|
|
393
|
+
`SELECTED_WORKSPACE` Symbol; authentication decorators resolve the class tokens.
|
|
394
|
+
|
|
395
|
+
Request decorators distinguish `@AuthUser()`, `@AuthSession()`, `@AuthApiKey()`, `@AuthWorkspaceMember()`,
|
|
396
|
+
`@AuthWorkspace()` and `@SelectedWorkspace()`. GraphQL retains `currentUser`, `currentSession` and `currentWorkspaceMember`,
|
|
397
|
+
with `selectedWorkspace` for selection and `currentWorkspace` for authenticated workspace scope.
|
|
398
|
+
|
|
399
|
+
All credentials use Header `x-workspace-id` or Cookie `workspace_id` to select a
|
|
400
|
+
target. The Header takes precedence, including an empty Header that clears
|
|
401
|
+
selection. Workspace keys require explicit selection and retain private grants
|
|
402
|
+
only in their owning workspace. Any identity can select a different workspace
|
|
403
|
+
for explicitly public resources.
|
|
404
|
+
|
|
405
|
+
Database request contexts use `app.auth.user.id`, `app.auth.workspace_member.id`,
|
|
406
|
+
`app.auth.workspace.id`, and `app.selected.workspace.id`. The selected target does
|
|
407
|
+
not grant authentication. Matching active membership or effective system
|
|
408
|
+
workspace grants establish the authenticated workspace scope. System API keys
|
|
409
|
+
use the `authenticated` role with no user or member identity. Clearing
|
|
410
|
+
credentials or membership retains selection for public access; deleting the
|
|
411
|
+
selected workspace also clears selection.
|
|
412
|
+
`app.auth.workspace_member.id` identifies the active member in the selected workspace for authenticated
|
|
393
413
|
requests, including service accounts; it is empty when no active member is present
|
|
394
414
|
and is cleared when workspace access or authentication is revoked.
|
|
395
415
|
Application permissions are not passed to the database. Services enforce Ability
|
|
@@ -489,9 +509,28 @@ They reference built-in classes directly; no named-type registration, resolver
|
|
|
489
509
|
factories, or application connection definitions are required. Additional application
|
|
490
510
|
field resolvers may target these classes without replacing built-in fields.
|
|
491
511
|
|
|
512
|
+
## Name search
|
|
513
|
+
|
|
514
|
+
User, Workspace, WorkspaceMember, SystemAccount and all three API-key connections
|
|
515
|
+
search names by token through their existing `query` argument. For example,
|
|
516
|
+
`Deployment` matches `Production Deployment`, and Chinese search input uses the
|
|
517
|
+
same tokenizer as indexed names. This is word search rather than arbitrary
|
|
518
|
+
substring matching. The hidden `searchableName` property is maintained by ORM
|
|
519
|
+
creation and name updates and has a native full-text index; it is not a GraphQL
|
|
520
|
+
field. The three API-key connections share the ApiKey table and index.
|
|
521
|
+
Built-in key mutations and Better Auth bulk user updates maintain search tokens
|
|
522
|
+
in the same native write as the name change.
|
|
523
|
+
|
|
524
|
+
Email fields retain their existing exact/prefix filtering, including
|
|
525
|
+
`email:alice*` on users and workspace members. Existing explicit name prefix
|
|
526
|
+
queries such as `name:Alice*` also remain supported there. Credentials and their
|
|
527
|
+
hashes never participate in name search. Generate schema migrations from your
|
|
528
|
+
registered entities before using the new search fields. The example's generated
|
|
529
|
+
schema migration is rebuilt from the current definitions for a fresh database.
|
|
530
|
+
|
|
492
531
|
## Native query migration
|
|
493
532
|
|
|
494
|
-
- Single-key queries move from root `userApiKey(id)` to `User.apiKey(id)` and from root `apiKey(id)` to `Workspace.apiKey(id)`. They resolve `UserApiKey` and `WorkspaceApiKey`, respectively, with nullable field results and pass their parent to `UserApiKeyService` and `WorkspaceApiKeyService`; mutation authorization is unchanged (see the operation naming migration below). Query through `currentUser { apiKey(id: ...) { id } }` or `
|
|
533
|
+
- Single-key queries move from root `userApiKey(id)` to `User.apiKey(id)` and from root `apiKey(id)` to `Workspace.apiKey(id)`. They resolve `UserApiKey` and `WorkspaceApiKey`, respectively, with nullable field results and pass their parent to `UserApiKeyService` and `WorkspaceApiKeyService`; mutation authorization is unchanged (see the operation naming migration below). Query through `currentUser { apiKey(id: ...) { id } }` or `selectedWorkspace { apiKey(id: ...) { id } }`. Service authorization, ownership filters, permission ceilings and request RLS remain in effect.
|
|
495
534
|
- `users` uses `UserConnectionArgs` / `UserConnection` (first/after or last/before, query/filter/orderBy). `ListUsersInput` and `UserListType` are removed.
|
|
496
535
|
- `User.accounts` now returns `AccountConnection!` through `AccountService.getAccountConnectionByUser(user, args)`: use `currentUser { accounts(first: 20) { edges { node { id providerId scopes } } pageInfo { hasNextPage endCursor } } }`. The array shape and `UserService.listUserAccounts` are removed. Account inspection requires the owning browser session; API keys are rejected and credentials are excluded.
|
|
497
536
|
- Registration/sign-in payloads reference the built-in `User`, not `AuthUserType`. The entity-oriented AuthService methods establish the newly issued session and refresh RLS and abilities before resolving nested fields. Registration without a session does not authenticate the request; protected nested fields still require authentication.
|
|
@@ -713,7 +752,7 @@ for invitation creation.
|
|
|
713
752
|
|
|
714
753
|
Update operation documents, ability subject mappings, and generated client types together. The example uses a fresh-database baseline: infrastructure initialization followed by a MikroORM-generated schema that creates the shared API-key table and system accounts directly.
|
|
715
754
|
|
|
716
|
-
Authentication and successful-use tracking are internal infrastructure responsibilities. Credential lookup queries the shared `api_key` table by hash and restricts matches to enabled identity kinds. `@
|
|
755
|
+
Authentication and successful-use tracking are internal infrastructure responsibilities. Credential lookup queries the shared `api_key` table by hash and restricts matches to enabled identity kinds. `@AuthApiKey()` returns request credential metadata; use the scoped services to mutate credentials.
|
|
717
756
|
|
|
718
757
|
## Removed collection APIs
|
|
719
758
|
|
|
@@ -10,6 +10,7 @@ import { SystemAccount } from "../../api-key/entities/system-account.entity.js";
|
|
|
10
10
|
const { Connection, ConnectionArgs, Edge } = new ConnectionBuilder(SystemAccount)
|
|
11
11
|
.addField({
|
|
12
12
|
field: "name",
|
|
13
|
+
fulltext: "searchableName",
|
|
13
14
|
searchable: true,
|
|
14
15
|
filterable: true,
|
|
15
16
|
type: "string",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system-account.connection-definition.js","sourceRoot":"","sources":["../../../src/admin/connections/system-account.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,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAEhF,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,IAAI,EAAE,GAAG,IAAI,iBAAiB,CAChE,aAAa,CACd;KACE,QAAQ,CAAC;IACR,KAAK,EAAE,MAAM;IACb,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,IAAI;IAChB,IAAI,EAAE,QAAQ;CACf,CAAC;KACD,QAAQ,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;KACjE,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,6DAA6D;AAC7D,UAAU,CAAC,mBAAmB,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;AAC5D,8CAA8C;AAEvC,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,cAAc;CAAG,CAAA;AAArD,2BAA2B;IADvC,QAAQ,EAAE;GACE,2BAA2B,CAA0B;;AAClE,kDAAkD;AAE3C,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,UAAU;CAAG,CAAA;AAA7C,uBAAuB;IADnC,UAAU,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;GACpB,uBAAuB,CAAsB"}
|
|
1
|
+
{"version":3,"file":"system-account.connection-definition.js","sourceRoot":"","sources":["../../../src/admin/connections/system-account.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,aAAa,EAAE,MAAM,iDAAiD,CAAC;AAEhF,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,IAAI,EAAE,GAAG,IAAI,iBAAiB,CAChE,aAAa,CACd;KACE,QAAQ,CAAC;IACR,KAAK,EAAE,MAAM;IACb,QAAQ,EAAE,gBAAgB;IAC1B,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,IAAI;IAChB,IAAI,EAAE,QAAQ;CACf,CAAC;KACD,QAAQ,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;KACjE,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,6DAA6D;AAC7D,UAAU,CAAC,mBAAmB,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;AAC5D,8CAA8C;AAEvC,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,cAAc;CAAG,CAAA;AAArD,2BAA2B;IADvC,QAAQ,EAAE;GACE,2BAA2B,CAA0B;;AAClE,kDAAkD;AAE3C,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,UAAU;CAAG,CAAA;AAA7C,uBAAuB;IADnC,UAAU,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;GACpB,uBAAuB,CAAsB"}
|
|
@@ -21,7 +21,13 @@ export function createApiKeyConnection(view) {
|
|
|
21
21
|
const fields = new Map([
|
|
22
22
|
[
|
|
23
23
|
"name",
|
|
24
|
-
{
|
|
24
|
+
{
|
|
25
|
+
field: "name",
|
|
26
|
+
type: "string",
|
|
27
|
+
searchable: true,
|
|
28
|
+
filterable: true,
|
|
29
|
+
fulltext: "searchableName",
|
|
30
|
+
},
|
|
25
31
|
],
|
|
26
32
|
["prefix", { field: "prefix", type: "string", filterable: true }],
|
|
27
33
|
[
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-api-key-connection.js","sourceRoot":"","sources":["../../../src/api-key/connections/create-api-key-connection.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAEL,gBAAgB,EAChB,oBAAoB,EACpB,YAAY,EACZ,WAAW,GAEZ,MAAM,+BAA+B,CAAC;AAGvC,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAGvD;;;;;;GAMG;AACH,MAAM,UAAU,sBAAsB,CACpC,IAAe;IAEf,MAAM,MAAM,GAAG,IAAI,GAAG,CAAyC;QAC7D;YACE,MAAM;YACN,
|
|
1
|
+
{"version":3,"file":"create-api-key-connection.js","sourceRoot":"","sources":["../../../src/api-key/connections/create-api-key-connection.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAEL,gBAAgB,EAChB,oBAAoB,EACpB,YAAY,EACZ,WAAW,GAEZ,MAAM,+BAA+B,CAAC;AAGvC,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAGvD;;;;;;GAMG;AACH,MAAM,UAAU,sBAAsB,CACpC,IAAe;IAEf,MAAM,MAAM,GAAG,IAAI,GAAG,CAAyC;QAC7D;YACE,MAAM;YACN;gBACE,KAAK,EAAE,MAAM;gBACb,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE,IAAI;gBAChB,UAAU,EAAE,IAAI;gBAChB,QAAQ,EAAE,gBAAgB;aAC3B;SACF;QACD,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;QACjE;YACE,YAAY;YACZ;gBACE,KAAK,EAAE,YAAY;gBACnB,WAAW,EAAE,WAAW;gBACxB,IAAI,EAAE,MAAM;gBACZ,UAAU,EAAE,IAAI;gBAChB,QAAQ,EAAE,IAAI;aACf;SACF;QACD;YACE,cAAc;YACd;gBACE,KAAK,EAAE,cAAc;gBACrB,WAAW,EAAE,YAAY;gBACzB,IAAI,EAAE,MAAM;gBACZ,UAAU,EAAE,IAAI;gBAChB,QAAQ,EAAE,IAAI;aACf;SACF;QACD;YACE,YAAY;YACZ;gBACE,KAAK,EAAE,YAAY;gBACnB,WAAW,EAAE,WAAW;gBACxB,IAAI,EAAE,MAAM;gBACZ,UAAU,EAAE,IAAI;gBAChB,QAAQ,EAAE,IAAI;aACf;SACF;KACF,CAAC,CAAC;IAEH,IAAM,IAAI,GAAV,MAAM,IAAI;QACR,qJAAqJ;QAIrJ,IAAI,CAAU;QAMd,MAAM,CAAU;KACjB,CAAA;IAPC;QAHC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE;YACjB,WAAW,EAAE,0BAA0B,IAAI,CAAC,IAAI,OAAO;SACxD,CAAC;kCACK,MAAM;sCAAC;IAMd;QAJC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE;YACnB,UAAU,EAAE,CAAC;YACb,WAAW,EAAE,iCAAiC;SAC/C,CAAC;;wCACc;IAXZ,IAAI;QADT,UAAU,CAAC,GAAG,IAAI,CAAC,IAAI,MAAM,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;OAC/C,IAAI,CAYT;IACD,MAAM,EAAE,KAAK,EAAE,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACjD,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE;QACpE,QAAQ,EAAE,CAAC;QACX,aAAa,EAAE,EAAE;QACjB,aAAa,EAAE,CAAC;QAChB,cAAc,EAAE,GAAG;KACpB,CAAC,CAAC;IACH,qFAAqF;IACrF,MAAM,UAAU,GAAG,gBAAgB,CACjC,MAAM,EACN,IAAI,CAAC,IAAI,EACT,IAAI,EACJ,MAAM,EACN,iBAAiB,CAClB,CAAC;IACF,MAAM,cAAc,GAAG,oBAAoB,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAC9E,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC;AACxC,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createParamDecorator } from "@nestjs/common";
|
|
2
2
|
import { getCurrentApiKey } from "../utils/get-current-api-key.util.js";
|
|
3
3
|
/** Parameter decorator that injects the API key used for the current request. */
|
|
4
|
-
export const
|
|
5
|
-
//# sourceMappingURL=
|
|
4
|
+
export const AuthApiKey = createParamDecorator(() => getCurrentApiKey());
|
|
5
|
+
//# sourceMappingURL=auth-api-key.decorator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth-api-key.decorator.js","sourceRoot":"","sources":["../../../src/api-key/decorators/auth-api-key.decorator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AAExE,iFAAiF;AACjF,MAAM,CAAC,MAAM,UAAU,GAAG,oBAAoB,CAAC,GAAG,EAAE,CAAC,gBAAgB,EAAE,CAAC,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { type Opt, type Ref } from "@mikro-orm/core";
|
|
2
2
|
import { User } from "../../core/entities/user.entity.js";
|
|
3
3
|
import { WorkspaceMember } from "../../workspace/entities/workspace-member.entity.js";
|
|
4
|
+
import { BaseApiKey } from "./base-api-key.entity.js";
|
|
4
5
|
import { SystemAccount } from "./system-account.entity.js";
|
|
5
6
|
/** Concrete identity types supported by the native polymorphic owner. */
|
|
6
7
|
export interface ApiKeyOwnerMap {
|
|
@@ -15,15 +16,13 @@ export type OwnedApiKey<Kind extends keyof ApiKeyOwnerMap> = ApiKeyRecord & {
|
|
|
15
16
|
readonly ownerType: Kind;
|
|
16
17
|
owner: Ref<ApiKeyOwnerMap[Kind]>;
|
|
17
18
|
};
|
|
18
|
-
/**
|
|
19
|
-
export declare class ApiKey extends
|
|
19
|
+
/** Shared credential entity with a feature-specific abstract owner mapping. */
|
|
20
|
+
export declare class ApiKey extends BaseApiKey {
|
|
20
21
|
/**
|
|
21
22
|
* Polymorphic owner discriminator, maintained by the owner relation.
|
|
22
23
|
* @returns Concrete kind of the polymorphic credential owner.
|
|
23
24
|
*/
|
|
24
25
|
get ownerType(): Opt<"user" | "workspace_member" | "system_account">;
|
|
25
|
-
/** User, workspace member or independent system account that owns the credential. */
|
|
26
|
-
owner: Ref<User | WorkspaceMember | SystemAccount>;
|
|
27
26
|
/**
|
|
28
27
|
* Owning user exposed by the user-key management API.
|
|
29
28
|
* @returns Owning user reference, or undefined for other owner kinds.
|
|
@@ -67,6 +66,8 @@ export declare class ApiKey extends BaseEntity {
|
|
|
67
66
|
id: Opt<string>;
|
|
68
67
|
/** API-key display name. */
|
|
69
68
|
name: string;
|
|
69
|
+
/** Tokenized display name used only for indexed search. */
|
|
70
|
+
searchableName?: string | null;
|
|
70
71
|
/** Starting characters retained for recognition in user interfaces. */
|
|
71
72
|
start?: Opt<string> | null;
|
|
72
73
|
/** Public prefix embedded in the plaintext key. */
|
|
@@ -1,9 +1,21 @@
|
|
|
1
|
-
|
|
1
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
2
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
+
};
|
|
7
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
|
+
};
|
|
10
|
+
import { ref, Reference, t } from "@mikro-orm/core";
|
|
11
|
+
import { Entity, Index, ManyToOne, PrimaryKey, Property, } from "@mikro-orm/decorators/legacy";
|
|
12
|
+
import { SearchableProperty } from "@nest-boot/database";
|
|
2
13
|
import { Sonyflake } from "sonyflake-js";
|
|
3
14
|
import { User } from "../../core/entities/user.entity.js";
|
|
4
15
|
import { WorkspaceMember } from "../../workspace/entities/workspace-member.entity.js";
|
|
5
|
-
|
|
6
|
-
|
|
16
|
+
import { BaseApiKey } from "./base-api-key.entity.js";
|
|
17
|
+
/** Shared credential entity with a feature-specific abstract owner mapping. */
|
|
18
|
+
let ApiKey = class ApiKey extends BaseApiKey {
|
|
7
19
|
/**
|
|
8
20
|
* Polymorphic owner discriminator, maintained by the owner relation.
|
|
9
21
|
* @returns Concrete kind of the polymorphic credential owner.
|
|
@@ -16,8 +28,6 @@ export class ApiKey extends BaseEntity {
|
|
|
16
28
|
? "workspace_member"
|
|
17
29
|
: "system_account";
|
|
18
30
|
}
|
|
19
|
-
/** User, workspace member or independent system account that owns the credential. */
|
|
20
|
-
owner;
|
|
21
31
|
/**
|
|
22
32
|
* Owning user exposed by the user-key management API.
|
|
23
33
|
* @returns Owning user reference, or undefined for other owner kinds.
|
|
@@ -96,9 +106,12 @@ export class ApiKey extends BaseEntity {
|
|
|
96
106
|
return Reference.unwrapReference(member).workspace.id;
|
|
97
107
|
}
|
|
98
108
|
/** Primary key (Sonyflake ID, auto-generated). */
|
|
109
|
+
// eslint-disable-next-line @nest-boot/entity-property-config-from-types -- Preserve bigint storage and string hydration without inferred runtime types.
|
|
99
110
|
id = Sonyflake.next().toString();
|
|
100
111
|
/** API-key display name. */
|
|
101
112
|
name;
|
|
113
|
+
/** Tokenized display name used only for indexed search. */
|
|
114
|
+
searchableName;
|
|
102
115
|
/** Starting characters retained for recognition in user interfaces. */
|
|
103
116
|
start = null;
|
|
104
117
|
/** Public prefix embedded in the plaintext key. */
|
|
@@ -117,5 +130,74 @@ export class ApiKey extends BaseEntity {
|
|
|
117
130
|
lastUsedAt = null;
|
|
118
131
|
/** Expiration timestamp; `null` means the key does not expire. */
|
|
119
132
|
expiresAt = null;
|
|
120
|
-
}
|
|
133
|
+
};
|
|
134
|
+
__decorate([
|
|
135
|
+
Property({ type: t.string, persist: false, fieldName: "owner_type" }),
|
|
136
|
+
__metadata("design:type", Object),
|
|
137
|
+
__metadata("design:paramtypes", [])
|
|
138
|
+
], ApiKey.prototype, "ownerType", null);
|
|
139
|
+
__decorate([
|
|
140
|
+
ManyToOne(() => User, { ref: true, nullable: true, deleteRule: "set null" }),
|
|
141
|
+
__metadata("design:type", Object)
|
|
142
|
+
], ApiKey.prototype, "createdBy", void 0);
|
|
143
|
+
__decorate([
|
|
144
|
+
PrimaryKey({ type: new t.bigint("string"), autoincrement: true }),
|
|
145
|
+
__metadata("design:type", Object)
|
|
146
|
+
], ApiKey.prototype, "id", void 0);
|
|
147
|
+
__decorate([
|
|
148
|
+
Property({ type: t.string }),
|
|
149
|
+
__metadata("design:type", String)
|
|
150
|
+
], ApiKey.prototype, "name", void 0);
|
|
151
|
+
__decorate([
|
|
152
|
+
SearchableProperty({ properties: "name", nullable: true }),
|
|
153
|
+
__metadata("design:type", Object)
|
|
154
|
+
], ApiKey.prototype, "searchableName", void 0);
|
|
155
|
+
__decorate([
|
|
156
|
+
Property({ type: t.string, nullable: true }),
|
|
157
|
+
__metadata("design:type", Object)
|
|
158
|
+
], ApiKey.prototype, "start", void 0);
|
|
159
|
+
__decorate([
|
|
160
|
+
Property({ type: t.string, nullable: true }),
|
|
161
|
+
__metadata("design:type", Object)
|
|
162
|
+
], ApiKey.prototype, "prefix", void 0);
|
|
163
|
+
__decorate([
|
|
164
|
+
Property({ type: t.text, unique: true }),
|
|
165
|
+
__metadata("design:type", String)
|
|
166
|
+
], ApiKey.prototype, "key", void 0);
|
|
167
|
+
__decorate([
|
|
168
|
+
Property({ type: t.datetime, nullable: true }),
|
|
169
|
+
__metadata("design:type", Object)
|
|
170
|
+
], ApiKey.prototype, "revokedAt", void 0);
|
|
171
|
+
__decorate([
|
|
172
|
+
Property({ type: t.array, defaultRaw: "'{}'" }),
|
|
173
|
+
__metadata("design:type", Object)
|
|
174
|
+
], ApiKey.prototype, "permissions", void 0);
|
|
175
|
+
__decorate([
|
|
176
|
+
Property({ type: t.datetime, defaultRaw: "now()" }),
|
|
177
|
+
__metadata("design:type", Object)
|
|
178
|
+
], ApiKey.prototype, "createdAt", void 0);
|
|
179
|
+
__decorate([
|
|
180
|
+
Property({
|
|
181
|
+
type: t.datetime,
|
|
182
|
+
defaultRaw: "now()",
|
|
183
|
+
onUpdate: () => new Date(),
|
|
184
|
+
}),
|
|
185
|
+
__metadata("design:type", Object)
|
|
186
|
+
], ApiKey.prototype, "updatedAt", void 0);
|
|
187
|
+
__decorate([
|
|
188
|
+
Property({ type: t.datetime, nullable: true }),
|
|
189
|
+
__metadata("design:type", Object)
|
|
190
|
+
], ApiKey.prototype, "lastUsedAt", void 0);
|
|
191
|
+
__decorate([
|
|
192
|
+
Property({ type: t.datetime, nullable: true }),
|
|
193
|
+
__metadata("design:type", Object)
|
|
194
|
+
], ApiKey.prototype, "expiresAt", void 0);
|
|
195
|
+
ApiKey = __decorate([
|
|
196
|
+
Entity(),
|
|
197
|
+
Index({ properties: ["owner"] }),
|
|
198
|
+
Index({ properties: ["key"] }),
|
|
199
|
+
Index({ properties: ["prefix"] }),
|
|
200
|
+
Index({ properties: ["createdAt"] })
|
|
201
|
+
], ApiKey);
|
|
202
|
+
export { ApiKey };
|
|
121
203
|
//# sourceMappingURL=api-key.entity.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-key.entity.js","sourceRoot":"","sources":["../../../src/api-key/entities/api-key.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"api-key.entity.js","sourceRoot":"","sources":["../../../src/api-key/entities/api-key.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { EntitySchema } from "@mikro-orm/core";
|
|
2
|
+
import { BaseApiKey } from "./base-api-key.entity.js";
|
|
3
|
+
/** Explicit persistence settings for the enabled credential owners. */
|
|
4
|
+
export interface BaseApiKeySchemaOptions {
|
|
5
|
+
user?: boolean;
|
|
6
|
+
workspace?: boolean;
|
|
7
|
+
system?: boolean;
|
|
8
|
+
}
|
|
9
|
+
/**
|
|
10
|
+
* Defines only the owner mapping and policies that depend on enabled features.
|
|
11
|
+
* @param options - Enabled owner targets.
|
|
12
|
+
* @param options.user - Whether user credentials are enabled.
|
|
13
|
+
* @param options.workspace - Whether member credentials are enabled.
|
|
14
|
+
* @param options.system - Whether system credentials are enabled.
|
|
15
|
+
* @returns Abstract native schema inherited by the decorated ApiKey entity.
|
|
16
|
+
*/
|
|
17
|
+
export declare function createBaseApiKeySchema({ user, workspace, system, }?: BaseApiKeySchemaOptions): EntitySchema<Pick<BaseApiKey, "owner">, never, import("@mikro-orm/core").EntityCtor<Pick<BaseApiKey, "owner">>>;
|
|
18
|
+
/** Complete owner mapping for direct ORM consumers; register alongside ApiKey. */
|
|
19
|
+
export declare const BaseApiKeySchema: EntitySchema<Pick<BaseApiKey, "owner">, never, import("@mikro-orm/core").EntityCtor<Pick<BaseApiKey, "owner">>>;
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import { EntitySchema } from "@mikro-orm/core";
|
|
2
|
+
import { User } from "../../core/entities/user.entity.js";
|
|
3
|
+
import { WorkspaceMember } from "../../workspace/entities/workspace-member.entity.js";
|
|
4
|
+
import { apiKeyOwnerPolicy } from "../policies/api-key-owner.policy.js";
|
|
5
|
+
import { BaseApiKey } from "./base-api-key.entity.js";
|
|
6
|
+
import { SystemAccount } from "./system-account.entity.js";
|
|
7
|
+
/**
|
|
8
|
+
* Defines only the owner mapping and policies that depend on enabled features.
|
|
9
|
+
* @param options - Enabled owner targets.
|
|
10
|
+
* @param options.user - Whether user credentials are enabled.
|
|
11
|
+
* @param options.workspace - Whether member credentials are enabled.
|
|
12
|
+
* @param options.system - Whether system credentials are enabled.
|
|
13
|
+
* @returns Abstract native schema inherited by the decorated ApiKey entity.
|
|
14
|
+
*/
|
|
15
|
+
export function createBaseApiKeySchema({ user = true, workspace = true, system = true, } = {}) {
|
|
16
|
+
const properties = {
|
|
17
|
+
owner: {
|
|
18
|
+
kind: "m:1",
|
|
19
|
+
entity: () => owners,
|
|
20
|
+
ref: true,
|
|
21
|
+
discriminator: "owner",
|
|
22
|
+
},
|
|
23
|
+
};
|
|
24
|
+
const owners = [
|
|
25
|
+
...(user ? [User] : []),
|
|
26
|
+
...(workspace ? [WorkspaceMember] : []),
|
|
27
|
+
...(system ? [SystemAccount] : []),
|
|
28
|
+
];
|
|
29
|
+
const kinds = [
|
|
30
|
+
...(user ? ["user"] : []),
|
|
31
|
+
...(system ? ["system_account"] : []),
|
|
32
|
+
...(workspace ? ["workspace_member"] : []),
|
|
33
|
+
];
|
|
34
|
+
if (!owners.length) {
|
|
35
|
+
throw new Error("An API-key schema requires at least one enabled owner");
|
|
36
|
+
}
|
|
37
|
+
return new EntitySchema({
|
|
38
|
+
class: BaseApiKey,
|
|
39
|
+
abstract: true,
|
|
40
|
+
policies: [apiKeyOwnerPolicy(workspace)],
|
|
41
|
+
checks: [
|
|
42
|
+
{
|
|
43
|
+
name: "api_key_owner_type_check",
|
|
44
|
+
expression: `"owner_type" in (${kinds.map((kind) => `'${kind}'`).join(", ")})`,
|
|
45
|
+
},
|
|
46
|
+
],
|
|
47
|
+
properties,
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
/** Complete owner mapping for direct ORM consumers; register alongside ApiKey. */
|
|
51
|
+
export const BaseApiKeySchema = createBaseApiKeySchema();
|
|
52
|
+
//# sourceMappingURL=base-api-key.entity-schema.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"base-api-key.entity-schema.js","sourceRoot":"","sources":["../../../src/api-key/entities/base-api-key.entity-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,qDAAqD,CAAC;AACtF,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAS3D;;;;;;;GAOG;AACH,MAAM,UAAU,sBAAsB,CAAC,EACrC,IAAI,GAAG,IAAI,EACX,SAAS,GAAG,IAAI,EAChB,MAAM,GAAG,IAAI,MACc,EAAE;IAC7B,MAAM,UAAU,GAAG;QACjB,KAAK,EAAE;YACL,IAAI,EAAE,KAAc;YACpB,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM;YACpB,GAAG,EAAE,IAAI;YACT,aAAa,EAAE,OAAO;SACvB;KACO,CAAC;IACX,MAAM,MAAM,GAAG;QACb,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACvB,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACvC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KACnC,CAAC;IACF,MAAM,KAAK,GAAG;QACZ,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACzB,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACrC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KAC3C,CAAC;IACF,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;IAC3E,CAAC;IACD,OAAO,IAAI,YAAY,CAA4B;QACjD,KAAK,EAAE,UAAU;QACjB,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;QACxC,MAAM,EAAE;YACN;gBACE,IAAI,EAAE,0BAA0B;gBAChC,UAAU,EAAE,oBAAoB,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;aAC/E;SACF;QACD,UAAU;KACX,CAAC,CAAC;AACL,CAAC;AAED,kFAAkF;AAClF,MAAM,CAAC,MAAM,gBAAgB,GAAG,sBAAsB,EAAE,CAAC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { BaseEntity, type Ref } from "@mikro-orm/core";
|
|
2
|
+
import type { User } from "../../core/entities/user.entity.js";
|
|
3
|
+
import type { WorkspaceMember } from "../../workspace/entities/workspace-member.entity.js";
|
|
4
|
+
import type { SystemAccount } from "./system-account.entity.js";
|
|
5
|
+
/** Abstract persistence base for the feature-specific polymorphic owner mapping. */
|
|
6
|
+
export declare abstract class BaseApiKey extends BaseEntity {
|
|
7
|
+
/** User, workspace member or independent system account that owns the credential. */
|
|
8
|
+
owner: Ref<User | WorkspaceMember | SystemAccount>;
|
|
9
|
+
}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { BaseEntity } from "@mikro-orm/core";
|
|
2
|
+
/** Abstract persistence base for the feature-specific polymorphic owner mapping. */
|
|
3
|
+
export class BaseApiKey extends BaseEntity {
|
|
4
|
+
/** User, workspace member or independent system account that owns the credential. */
|
|
5
|
+
owner;
|
|
6
|
+
}
|
|
7
|
+
//# sourceMappingURL=base-api-key.entity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"base-api-key.entity.js","sourceRoot":"","sources":["../../../src/api-key/entities/base-api-key.entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAY,MAAM,iBAAiB,CAAC;AAMvD,oFAAoF;AACpF,MAAM,OAAgB,UAAW,SAAQ,UAAU;IACjD,qFAAqF;IACrF,KAAK,CAA+C;CACrD"}
|
|
@@ -6,6 +6,8 @@ export declare class SystemAccount extends BaseEntity {
|
|
|
6
6
|
id: Opt<string>;
|
|
7
7
|
/** Name of the integration or background system. */
|
|
8
8
|
name: string;
|
|
9
|
+
/** Tokenized display name used only for indexed search. */
|
|
10
|
+
searchableName?: string | null;
|
|
9
11
|
/** Disabling the account invalidates all its credentials. */
|
|
10
12
|
enabled: Opt<boolean>;
|
|
11
13
|
/** Explicit maximum grants for credentials owned by this account. */
|
|
@@ -10,6 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
/* eslint-disable @nest-boot/graphql-field-config-from-types -- MikroORM Opt/Ref markers require explicit GraphQL metadata. */
|
|
11
11
|
import { BaseEntity, t } from "@mikro-orm/core";
|
|
12
12
|
import { Entity, Index, ManyToOne, PrimaryKey, Property, } from "@mikro-orm/decorators/legacy";
|
|
13
|
+
import { SearchableProperty } from "@nest-boot/database";
|
|
13
14
|
import { Field, HideField, ID, ObjectType } from "@nest-boot/graphql";
|
|
14
15
|
import { Sonyflake } from "sonyflake-js";
|
|
15
16
|
import { SystemAccountPermission } from "../../admin/enums/system-account-permission.enum.js";
|
|
@@ -20,6 +21,8 @@ let SystemAccount = class SystemAccount extends BaseEntity {
|
|
|
20
21
|
id = Sonyflake.next().toString();
|
|
21
22
|
/** Name of the integration or background system. */
|
|
22
23
|
name;
|
|
24
|
+
/** Tokenized display name used only for indexed search. */
|
|
25
|
+
searchableName;
|
|
23
26
|
/** Disabling the account invalidates all its credentials. */
|
|
24
27
|
enabled = true;
|
|
25
28
|
/** Explicit maximum grants for credentials owned by this account. */
|
|
@@ -48,6 +51,11 @@ __decorate([
|
|
|
48
51
|
Field(() => String),
|
|
49
52
|
__metadata("design:type", String)
|
|
50
53
|
], SystemAccount.prototype, "name", void 0);
|
|
54
|
+
__decorate([
|
|
55
|
+
SearchableProperty({ properties: "name", nullable: true }),
|
|
56
|
+
HideField(),
|
|
57
|
+
__metadata("design:type", Object)
|
|
58
|
+
], SystemAccount.prototype, "searchableName", void 0);
|
|
51
59
|
__decorate([
|
|
52
60
|
Property({ type: t.boolean, default: true }),
|
|
53
61
|
Field(() => Boolean),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system-account.entity.js","sourceRoot":"","sources":["../../../src/api-key/entities/system-account.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,8HAA8H;AAC9H,OAAO,EAAE,UAAU,EAAsB,CAAC,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EACL,MAAM,EACN,KAAK,EACL,SAAS,EACT,UAAU,EACV,QAAQ,GACT,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,uBAAuB,EAAE,MAAM,qDAAqD,CAAC;AAC9F,OAAO,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAE1D,kFAAkF;AAc3E,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,UAAU;IAC3C,kCAAkC;IAGlC,EAAE,GAAgB,SAAS,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC;IAE9C,oDAAoD;IAGpD,IAAI,CAAU;IAEd,6DAA6D;IAG7D,OAAO,GAAiB,IAAI,CAAC;IAE7B,qEAAqE;IAGrE,WAAW,GAAkB,EAAE,CAAC;IAEhC,+EAA+E;IAG/E,SAAS,GAA2B,IAAI,CAAC;IAEzC;;;OAGG;IACH,IACI,WAAW;QACb,OAAO,IAAI,CAAC,SAAS,EAAE,EAAE,IAAI,IAAI,CAAC;IACpC,CAAC;IAED,0BAA0B;IAG1B,SAAS,GAAc,IAAI,IAAI,EAAE,CAAC;IAElC,mCAAmC;IAOnC,SAAS,GAAc,IAAI,IAAI,EAAE,CAAC;CACnC,CAAA;
|
|
1
|
+
{"version":3,"file":"system-account.entity.js","sourceRoot":"","sources":["../../../src/api-key/entities/system-account.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
+
import type { OwnedApiKey } from "../entities/api-key.entity.js";
|
|
1
2
|
import type { SystemAccount } from "../entities/system-account.entity.js";
|
|
2
|
-
import type { SystemApiKey } from "../objects/system-api-key.object.js";
|
|
3
3
|
/** Successfully authenticated independent system credential. */
|
|
4
4
|
export interface SystemApiKeyValidation {
|
|
5
|
-
apiKey:
|
|
5
|
+
apiKey: OwnedApiKey<"system_account">;
|
|
6
6
|
ownerType: "system_account";
|
|
7
7
|
systemAccount: SystemAccount;
|
|
8
8
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import type { User } from "../../core/entities/user.entity.js";
|
|
2
|
-
import type {
|
|
2
|
+
import type { OwnedApiKey } from "../entities/api-key.entity.js";
|
|
3
3
|
/** Successful authentication for a user-owned API key. */
|
|
4
4
|
export interface UserApiKeyValidation {
|
|
5
5
|
/** Validated API-key entity. */
|
|
6
|
-
apiKey:
|
|
6
|
+
apiKey: OwnedApiKey<"user">;
|
|
7
7
|
/** Identifies the owner branch. */
|
|
8
8
|
ownerType: "user";
|
|
9
9
|
/** User represented by the key. */
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import type { User } from "../../core/entities/user.entity.js";
|
|
2
2
|
import type { Workspace } from "../../workspace/entities/workspace.entity.js";
|
|
3
3
|
import type { WorkspaceMember } from "../../workspace/entities/workspace-member.entity.js";
|
|
4
|
-
import type {
|
|
4
|
+
import type { OwnedApiKey } from "../entities/api-key.entity.js";
|
|
5
5
|
/** Successful authentication for a member-owned, workspace-scoped API key. */
|
|
6
6
|
export interface WorkspaceApiKeyValidation {
|
|
7
7
|
/** Validated API-key entity. */
|
|
8
|
-
apiKey:
|
|
8
|
+
apiKey: OwnedApiKey<"workspace_member">;
|
|
9
9
|
/** Identifies the owner branch. */
|
|
10
10
|
ownerType: "workspace_member";
|
|
11
11
|
/** WorkspaceMember represented by the key. */
|
|
@@ -5,9 +5,9 @@
|
|
|
5
5
|
* @returns Identical owner predicates for reads and writes.
|
|
6
6
|
*/
|
|
7
7
|
export function apiKeyOwnerPolicy(workspace) {
|
|
8
|
-
const user = `("owner_type" = 'user' AND "owner_id" = nullif(current_setting('app.user.id', true), '')::bigint)`;
|
|
8
|
+
const user = `("owner_type" = 'user' AND "owner_id" = nullif(current_setting('app.auth.user.id', true), '')::bigint)`;
|
|
9
9
|
const predicate = workspace
|
|
10
|
-
? `(${user} OR ("owner_type" = 'workspace_member' AND EXISTS (SELECT 1 FROM "workspace_member" WHERE "workspace_member"."id" = "owner_id" AND "workspace_member"."workspace_id" = nullif(current_setting('app.workspace.id', true), '')::bigint)))`
|
|
10
|
+
? `(${user} OR ("owner_type" = 'workspace_member' AND nullif(current_setting('app.auth.workspace_member.id', true), '') IS NOT NULL AND EXISTS (SELECT 1 FROM "workspace_member" WHERE "workspace_member"."id" = "owner_id" AND "workspace_member"."workspace_id" = nullif(current_setting('app.auth.workspace.id', true), '')::bigint)))`
|
|
11
11
|
: user;
|
|
12
12
|
return {
|
|
13
13
|
command: "all",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-key-owner.policy.js","sourceRoot":"","sources":["../../../src/api-key/policies/api-key-owner.policy.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAAC,SAAkB;IAClD,MAAM,IAAI,GAAG,
|
|
1
|
+
{"version":3,"file":"api-key-owner.policy.js","sourceRoot":"","sources":["../../../src/api-key/policies/api-key-owner.policy.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAAC,SAAkB;IAClD,MAAM,IAAI,GAAG,wGAAwG,CAAC;IACtH,MAAM,SAAS,GAAG,SAAS;QACzB,CAAC,CAAC,IAAI,IAAI,gUAAgU;QAC1U,CAAC,CAAC,IAAI,CAAC;IACT,OAAO;QACL,OAAO,EAAE,KAAK;QACd,KAAK,EAAE,CAAC,eAAe,CAAC;QACxB,KAAK,EAAE,SAAS;QAChB,KAAK,EAAE,SAAS;KACjB,CAAC;AACJ,CAAC"}
|
|
@@ -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, Mutation, Parent, Query, ResolveField, Resolver, } from "@nest-boot/graphql";
|
|
14
|
-
import {
|
|
14
|
+
import { AuthUser } from "../../core/decorators/auth-user.decorator.js";
|
|
15
15
|
import { User } from "../../core/entities/user.entity.js";
|
|
16
16
|
import { UserApiKeyConnection, UserApiKeyConnectionArgs, } from "../connections/user-api-key.connection-definition.js";
|
|
17
17
|
import { CreateUserApiKeyInput } from "../inputs/create-user-api-key.input.js";
|
|
@@ -96,7 +96,7 @@ let UserApiKeyResolver = class UserApiKeyResolver {
|
|
|
96
96
|
};
|
|
97
97
|
__decorate([
|
|
98
98
|
Query(() => [UserApiKeyPermissionOption]),
|
|
99
|
-
__param(0,
|
|
99
|
+
__param(0, AuthUser()),
|
|
100
100
|
__metadata("design:type", Function),
|
|
101
101
|
__metadata("design:paramtypes", [User]),
|
|
102
102
|
__metadata("design:returntype", Array)
|
|
@@ -104,7 +104,7 @@ __decorate([
|
|
|
104
104
|
__decorate([
|
|
105
105
|
Mutation(() => CreateUserApiKeyResult),
|
|
106
106
|
__param(0, Args("input")),
|
|
107
|
-
__param(1,
|
|
107
|
+
__param(1, AuthUser()),
|
|
108
108
|
__metadata("design:type", Function),
|
|
109
109
|
__metadata("design:paramtypes", [CreateUserApiKeyInput,
|
|
110
110
|
User]),
|
|
@@ -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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"}
|