@nest-boot/auth 8.0.5-beta.2 → 8.0.5-beta.4
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 +33 -22
- package/dist/abilities/auth.ability.d.ts +6 -0
- package/dist/abilities/{user.ability.js → auth.ability.js} +4 -4
- package/dist/abilities/auth.ability.js.map +1 -0
- package/dist/abilities/index.d.ts +1 -2
- package/dist/abilities/index.js +1 -2
- package/dist/abilities/index.js.map +1 -1
- package/dist/auth-module-options.interface.d.ts +3 -0
- package/dist/auth.guard.d.ts +3 -9
- package/dist/auth.guard.js +13 -38
- package/dist/auth.guard.js.map +1 -1
- package/dist/auth.module.js +0 -6
- package/dist/auth.module.js.map +1 -1
- package/dist/decorators/can.decorator.d.ts +3 -11
- package/dist/decorators/can.decorator.js +8 -14
- package/dist/decorators/can.decorator.js.map +1 -1
- package/dist/decorators/index.d.ts +0 -2
- package/dist/decorators/index.js +0 -2
- package/dist/decorators/index.js.map +1 -1
- package/dist/entities/account.entity.d.ts +1 -1
- package/dist/entities/account.entity.js +1 -1
- package/dist/entities/invitation.entity.d.ts +2 -0
- package/dist/entities/invitation.entity.js +9 -0
- package/dist/entities/invitation.entity.js.map +1 -1
- package/dist/entities/member.entity.d.ts +2 -0
- package/dist/entities/member.entity.js +9 -0
- package/dist/entities/member.entity.js.map +1 -1
- package/dist/entities/workspace-api-key.entity.d.ts +2 -0
- package/dist/entities/workspace-api-key.entity.js +9 -0
- package/dist/entities/workspace-api-key.entity.js.map +1 -1
- package/dist/index.d.ts +4 -8
- package/dist/index.js +4 -8
- package/dist/index.js.map +1 -1
- package/dist/infrastructure/api-key-lifecycle.d.ts +14 -0
- package/dist/infrastructure/api-key-lifecycle.js +19 -0
- package/dist/infrastructure/api-key-lifecycle.js.map +1 -1
- package/dist/infrastructure/auth-ability.factory.d.ts +4 -9
- package/dist/infrastructure/auth-ability.factory.js +35 -32
- package/dist/infrastructure/auth-ability.factory.js.map +1 -1
- package/dist/infrastructure/auth-service.providers.js +9 -11
- package/dist/infrastructure/auth-service.providers.js.map +1 -1
- package/dist/infrastructure/request-identity.d.ts +16 -4
- package/dist/infrastructure/request-identity.js +61 -40
- package/dist/infrastructure/request-identity.js.map +1 -1
- package/dist/interfaces/ability-context.interface.d.ts +16 -0
- package/dist/interfaces/ability-context.interface.js +2 -0
- package/dist/interfaces/ability-context.interface.js.map +1 -0
- package/dist/interfaces/ability-rules.interface.d.ts +8 -2
- package/dist/interfaces/auth-module-api-key-options.interface.d.ts +1 -1
- package/dist/interfaces/auth-module-user-options.interface.d.ts +0 -3
- package/dist/interfaces/auth-module-workspace-options.interface.d.ts +0 -3
- package/dist/interfaces/{user-can-metadata.interface.d.ts → can-metadata.interface.d.ts} +2 -2
- package/dist/interfaces/can-metadata.interface.js +2 -0
- package/dist/interfaces/can-metadata.interface.js.map +1 -0
- package/dist/permission.constants.d.ts +2 -4
- package/dist/permission.constants.js +2 -4
- package/dist/permission.constants.js.map +1 -1
- package/dist/resolvers/auth.resolver.d.ts +2 -4
- package/dist/resolvers/auth.resolver.js +5 -16
- package/dist/resolvers/auth.resolver.js.map +1 -1
- package/dist/services/account.service.d.ts +1 -3
- package/dist/services/account.service.js +4 -7
- package/dist/services/account.service.js.map +1 -1
- package/dist/services/invitation.service.d.ts +1 -3
- package/dist/services/invitation.service.js +38 -45
- package/dist/services/invitation.service.js.map +1 -1
- package/dist/services/member.service.d.ts +2 -4
- package/dist/services/member.service.js +63 -60
- package/dist/services/member.service.js.map +1 -1
- package/dist/services/session.service.d.ts +1 -4
- package/dist/services/session.service.js +12 -16
- package/dist/services/session.service.js.map +1 -1
- package/dist/services/user-api-key.service.d.ts +3 -7
- package/dist/services/user-api-key.service.js +52 -73
- package/dist/services/user-api-key.service.js.map +1 -1
- package/dist/services/user-deletion.service.js.map +1 -1
- package/dist/services/user.service.d.ts +1 -3
- package/dist/services/user.service.js +46 -44
- package/dist/services/user.service.js.map +1 -1
- package/dist/services/workspace-api-key.service.d.ts +3 -7
- package/dist/services/workspace-api-key.service.js +51 -76
- package/dist/services/workspace-api-key.service.js.map +1 -1
- package/dist/services/workspace.service.d.ts +2 -4
- package/dist/services/workspace.service.js +36 -30
- package/dist/services/workspace.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/types/build-ability-callback.type.d.ts +4 -0
- package/dist/types/build-ability-callback.type.js +2 -0
- package/dist/types/build-ability-callback.type.js.map +1 -0
- package/dist/user.constants.d.ts +5 -5
- package/dist/user.constants.js +11 -13
- package/dist/user.constants.js.map +1 -1
- package/dist/utils/api-key-permissions.util.d.ts +2 -0
- package/dist/utils/api-key-permissions.util.js +10 -2
- package/dist/utils/api-key-permissions.util.js.map +1 -1
- package/dist/utils/assert-can.util.d.ts +3 -0
- package/dist/utils/assert-can.util.js +8 -0
- package/dist/utils/assert-can.util.js.map +1 -0
- package/dist/utils/build-request-ability.util.d.ts +3 -6
- package/dist/utils/build-request-ability.util.js +25 -15
- package/dist/utils/build-request-ability.util.js.map +1 -1
- package/dist/utils/can.util.d.ts +2 -3
- package/dist/utils/can.util.js +9 -7
- package/dist/utils/can.util.js.map +1 -1
- package/dist/utils/extend-ability.util.d.ts +5 -1
- package/dist/utils/extend-ability.util.js +13 -6
- package/dist/utils/extend-ability.util.js.map +1 -1
- package/dist/utils/get-ability.util.d.ts +5 -0
- package/dist/utils/get-ability.util.js +20 -0
- package/dist/utils/get-ability.util.js.map +1 -0
- package/dist/utils/permission-grants.util.d.ts +9 -0
- package/dist/utils/permission-grants.util.js +25 -0
- package/dist/utils/permission-grants.util.js.map +1 -0
- package/dist/workspace.constants.d.ts +7 -7
- package/dist/workspace.constants.js +18 -18
- package/dist/workspace.constants.js.map +1 -1
- package/package.json +8 -8
- package/dist/abilities/user.ability.d.ts +0 -8
- package/dist/abilities/user.ability.js.map +0 -1
- package/dist/abilities/workspace.ability.d.ts +0 -8
- package/dist/abilities/workspace.ability.js +0 -13
- package/dist/abilities/workspace.ability.js.map +0 -1
- package/dist/decorators/user-can.decorator.d.ts +0 -13
- package/dist/decorators/user-can.decorator.js +0 -21
- package/dist/decorators/user-can.decorator.js.map +0 -1
- package/dist/decorators/workspace-can.decorator.d.ts +0 -13
- package/dist/decorators/workspace-can.decorator.js +0 -21
- package/dist/decorators/workspace-can.decorator.js.map +0 -1
- package/dist/interfaces/can-options.interface.d.ts +0 -5
- package/dist/interfaces/can-options.interface.js +0 -2
- package/dist/interfaces/can-options.interface.js.map +0 -1
- package/dist/interfaces/user-can-metadata.interface.js +0 -2
- package/dist/interfaces/user-can-metadata.interface.js.map +0 -1
- package/dist/interfaces/workspace-can-metadata.interface.d.ts +0 -9
- package/dist/interfaces/workspace-can-metadata.interface.js +0 -2
- package/dist/interfaces/workspace-can-metadata.interface.js.map +0 -1
- package/dist/services/access-control.service.d.ts +0 -52
- package/dist/services/access-control.service.js +0 -201
- package/dist/services/access-control.service.js.map +0 -1
- package/dist/types/build-user-ability-callback.type.d.ts +0 -10
- package/dist/types/build-user-ability-callback.type.js +0 -2
- package/dist/types/build-user-ability-callback.type.js.map +0 -1
- package/dist/types/build-workspace-ability-callback.type.d.ts +0 -10
- package/dist/types/build-workspace-ability-callback.type.js +0 -2
- package/dist/types/build-workspace-ability-callback.type.js.map +0 -1
- package/dist/utils/get-user-ability.util.d.ts +0 -3
- package/dist/utils/get-user-ability.util.js +0 -14
- package/dist/utils/get-user-ability.util.js.map +0 -1
- package/dist/utils/get-workspace-ability.util.d.ts +0 -3
- package/dist/utils/get-workspace-ability.util.js +0 -14
- package/dist/utils/get-workspace-ability.util.js.map +0 -1
- package/dist/utils/user-can.util.d.ts +0 -3
- package/dist/utils/user-can.util.js +0 -9
- package/dist/utils/user-can.util.js.map +0 -1
- package/dist/utils/workspace-can.util.d.ts +0 -3
- package/dist/utils/workspace-can.util.js +0 -10
- package/dist/utils/workspace-can.util.js.map +0 -1
package/README.md
CHANGED
|
@@ -16,7 +16,7 @@ The inverse user collection is `User.members`. Workspace ownership remains the
|
|
|
16
16
|
`workspace` relation, and workspace-role configuration still lives under
|
|
17
17
|
`workspace`.
|
|
18
18
|
|
|
19
|
-
|
|
19
|
+
Member permissions use `member:*`, including `member:invite` for invitation management,
|
|
20
20
|
including custom ability builders, stored grants, and application policies.
|
|
21
21
|
The example database tables, foreign keys, indexes, policies, and grants use
|
|
22
22
|
`member` / `invitation` without legacy table names. The regenerated
|
|
@@ -112,14 +112,14 @@ transports call the service's connection methods directly.
|
|
|
112
112
|
`getInvitationWorkspace(invitation)` implement the corresponding GraphQL relation
|
|
113
113
|
fields. Users may read their own member-user association before selecting
|
|
114
114
|
a workspace. Other member-user access, including API keys, requires the selected
|
|
115
|
-
workspace and global user-scoped `user:read`. Invitation parent access allows either
|
|
116
|
-
|
|
117
|
-
|
|
115
|
+
workspace and global user-scoped `user:read`. Invitation parent access allows either
|
|
116
|
+
the recipient's user session or the selected workspace with `member:invite`.
|
|
117
|
+
Reading another inviter's User additionally requires global user-read permission. They re-read parents and targets with injected
|
|
118
118
|
`this.em` and request RLS, never using a privileged reference's cached entity.
|
|
119
119
|
|
|
120
120
|
`InvitationService.getInvitation(id)` is the RLS-backed single-invitation lookup.
|
|
121
|
-
It
|
|
122
|
-
then checks recipient or
|
|
121
|
+
It allows the recipient's session or the selected workspace's `member:invite`
|
|
122
|
+
permission, then checks recipient ownership or workspace ownership and instance-level ability.
|
|
123
123
|
Workspace API keys can use the workspace path without a user identity; failing
|
|
124
124
|
recipient authorization does not prevent independently authorized workspace access.
|
|
125
125
|
It uses the request manager without clearing its native session or disabling filters.
|
|
@@ -186,7 +186,7 @@ connection definition is required. Its GraphQL transport exposes these connectio
|
|
|
186
186
|
### Follow-ups
|
|
187
187
|
|
|
188
188
|
- [x] Support multiple requirements from the same authorization scope on one
|
|
189
|
-
handler. Repeated `@
|
|
189
|
+
handler. Repeated `@Can` and `@Can` declarations always use
|
|
190
190
|
`all` matching semantics.
|
|
191
191
|
- [x] Document permission catalogs, direct-permission validation, creator-role
|
|
192
192
|
invariants, API-key permission ceilings, and multi-requirement behavior
|
|
@@ -194,7 +194,7 @@ connection definition is required. Its GraphQL transport exposes these connectio
|
|
|
194
194
|
|
|
195
195
|
## User and session connections
|
|
196
196
|
|
|
197
|
-
`UserService.getUserConnection(args)`, `SessionService.getSessionConnectionByUser(user, args)` and `AccountService.getAccountConnectionByUser(user, args)` use the built-in connection definitions registered by `AuthModule`. Own browser-session reads do not require administrative permissions; foreign-user and delegated API-key session reads require `session:
|
|
197
|
+
`UserService.getUserConnection(args)`, `SessionService.getSessionConnectionByUser(user, args)` and `AccountService.getAccountConnectionByUser(user, args)` use the built-in connection definitions registered by `AuthModule`. Own browser-session reads do not require administrative permissions; foreign-user and delegated API-key session reads require `session:read`. Application RLS must grant the corresponding SELECT access. Account connections require the owning user session, reject API keys and exclude credential columns. `UserService.listUserAccounts` is removed without an alias.
|
|
198
198
|
|
|
199
199
|
`SessionService` owns `getSessionConnectionByUser`,
|
|
200
200
|
`getSessionImpersonator`, `revokeSession`, and `revokeUserSessions`;
|
|
@@ -238,7 +238,8 @@ new privileged context is introduced.
|
|
|
238
238
|
The internal email lookup context moves to `MemberService.getUserForMembership`;
|
|
239
239
|
acceptance/rejection contexts move to `InvitationService`. Ordinary
|
|
240
240
|
member/invitation reads and writes keep request RLS.
|
|
241
|
-
`
|
|
241
|
+
`can()` and `assertCan()` evaluate the request-scoped `AuthAbility` directly.
|
|
242
|
+
The internal `RequestIdentity` owns identity checks and publication, while
|
|
242
243
|
`UserDeletionService` coordinates atomic deletion across auth-owned entities.
|
|
243
244
|
The impersonator relation checks User profile authorization in SessionService;
|
|
244
245
|
permission to read a session alone does not reveal its impersonator's profile.
|
|
@@ -264,10 +265,10 @@ in depth, not a substitute for these checks or for correctly configured policies
|
|
|
264
265
|
Workspace deletion and member profile edits use the target's `delete` and
|
|
265
266
|
`update` abilities, respectively, rather than requiring the caller's creator
|
|
266
267
|
role. Editing the creator's shared contact fields follows the same rule;
|
|
267
|
-
disabling/removing a creator checks the same
|
|
268
|
+
disabling/removing a creator checks the same member write ability as other members.
|
|
268
269
|
Any current member may leave, including the last creator; the workspace is retained.
|
|
269
270
|
Creator roles can be assigned or replaced through `setMemberRoles`, subject to
|
|
270
|
-
|
|
271
|
+
`member:set-roles` ability and permission-grant checks. Multiple owners are allowed; no
|
|
271
272
|
dedicated ownership-transfer operation is provided. API-key update/delete checks both the entity
|
|
272
273
|
type and the loaded instance so conditional abilities remain enforced.
|
|
273
274
|
|
|
@@ -300,7 +301,7 @@ direct ORM/SQL access does not enforce those application authorization rules.
|
|
|
300
301
|
Permission identifiers use lowercase `resource:action` names. Catalog membership,
|
|
301
302
|
grant ceilings and API-key intersections use exact string equality; invalid
|
|
302
303
|
names are rejected rather than case-converted. Auth owns the mappings for
|
|
303
|
-
`user:*`, `session:*`, `workspace:*`, `member:*`,
|
|
304
|
+
`user:*`, `session:*`, `workspace:*`, `member:*`, and scoped API-key
|
|
304
305
|
permissions. Custom permission names only grant business abilities through
|
|
305
306
|
explicit permission-bound rules; they cannot redefine built-in auth operations.
|
|
306
307
|
|
|
@@ -412,16 +413,23 @@ The example migration sequence `Initial → generated schema migrations` enables
|
|
|
412
413
|
### Management mutations
|
|
413
414
|
|
|
414
415
|
Auth builds its own permission-to-ability mappings in `AuthAbilityFactory`;
|
|
415
|
-
`
|
|
416
|
-
`buildAbility
|
|
417
|
-
`
|
|
418
|
-
|
|
419
|
-
|
|
416
|
+
one `AuthAbility` contains the rules for the current user and optional workspace.
|
|
417
|
+
The top-level `buildAbility(rules, context)` receives
|
|
418
|
+
`{ user, workspace, member, userPermissions, workspacePermissions }`; identity
|
|
419
|
+
fields are nullable and permission sources remain separate.
|
|
420
|
+
Use `can({ user: permission }, action, subject, conditions?)` or
|
|
421
|
+
`can({ workspace: permission }, action, subject, conditions?)` for permission-bound
|
|
422
|
+
business grants and `cannot(action, subject, conditions?)` for restrictions.
|
|
423
|
+
Both support field restrictions. `@Can()`, `can()`, and `assertCan()`
|
|
424
|
+
evaluate this same ability. The frontend queries `currentAbilityRules` and uses
|
|
425
|
+
`useAbility()` for both personal and workspace pages. Callbacks are synchronous and return nothing.
|
|
420
426
|
They cannot grant operations on built-in auth entities or `all`, access the raw
|
|
421
427
|
builder, or replace the resulting ability. Restrictions take precedence over
|
|
422
428
|
business grants. The frontend consumes the final serialized rules.
|
|
423
429
|
|
|
424
|
-
`api-key:read/
|
|
430
|
+
Personal keys use `user-api-key:read/write`; workspace keys use
|
|
431
|
+
`workspace-api-key:read/write`. Write covers creation, updates, enabling/disabling,
|
|
432
|
+
and deletion without granting reads.
|
|
425
433
|
User administrators and workspace owners inherit them; ordinary users and
|
|
426
434
|
workspace administrators require explicit role or direct grants. Existing
|
|
427
435
|
ownership checks and self-service operations remain enforced by Services.
|
|
@@ -431,8 +439,10 @@ The `userRoles` and `workspaceRoles` queries return `{ role, grantable }` object
|
|
|
431
439
|
`userApiKeyPermissions` and `workspaceApiKeyPermissions` also return
|
|
432
440
|
`{ permission, grantable, default }` entries. `grantable` includes the API-key
|
|
433
441
|
allowlist and issuer's grant ceiling; `default` reflects configured defaults.
|
|
434
|
-
Editors preselect only `default && grantable`.
|
|
435
|
-
|
|
442
|
+
Editors preselect only `default && grantable`. `member:invite` allows querying,
|
|
443
|
+
creating, and canceling workspace invitations; it does not grant member writes.
|
|
444
|
+
Accepting or rejecting one's own invitation requires the recipient's user session,
|
|
445
|
+
not invitation management permission.
|
|
436
446
|
|
|
437
447
|
Configure these independently with `apiKey.user` and `apiKey.workspace`, each
|
|
438
448
|
containing `defaultPermissions` and `allowedPermissions`. Defaults are empty;
|
|
@@ -581,8 +591,9 @@ API-key entities, services, resolvers, connections, inputs, and creation results
|
|
|
581
591
|
|
|
582
592
|
API-key enums cover the full scope catalogs, independently of the current grant
|
|
583
593
|
allowlist, so existing keys remain readable after the allowlist is tightened.
|
|
584
|
-
Workspace keys
|
|
585
|
-
as sender
|
|
594
|
+
Workspace keys may carry `member:invite` to read and cancel invitations.
|
|
595
|
+
Creating an invitation also requires a user as sender; use a personal API key
|
|
596
|
+
for invitation creation.
|
|
586
597
|
|
|
587
598
|
Update operation documents, ability subject mappings, and generated client types together. The example preserves `Migration00000000000000_Initial` and regenerates the entity baseline with two tables. Recreate development databases before applying this baseline; existing databases require a separate data-preserving upgrade migration.
|
|
588
599
|
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { Ability, type AbilityOptions, type AbilityTuple, type MongoQuery, type RawRuleFrom } from "@casl/ability";
|
|
2
|
+
/** CASL ability for the authenticated request and its selected workspace. */
|
|
3
|
+
export declare class AuthAbility extends Ability<AbilityTuple, MongoQuery> {
|
|
4
|
+
/** Creates an ability with CASL's Mongo-style condition matching. */
|
|
5
|
+
constructor(rules?: RawRuleFrom<AbilityTuple, MongoQuery>[], options?: AbilityOptions<AbilityTuple, MongoQuery>);
|
|
6
|
+
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Ability, fieldPatternMatcher, mongoQueryMatcher, } from "@casl/ability";
|
|
2
|
-
/** CASL ability
|
|
3
|
-
export class
|
|
4
|
-
/** Creates
|
|
2
|
+
/** CASL ability for the authenticated request and its selected workspace. */
|
|
3
|
+
export class AuthAbility extends Ability {
|
|
4
|
+
/** Creates an ability with CASL's Mongo-style condition matching. */
|
|
5
5
|
constructor(rules = [], options = {}) {
|
|
6
6
|
super(rules, {
|
|
7
7
|
conditionsMatcher: mongoQueryMatcher,
|
|
@@ -10,4 +10,4 @@ export class UserAbility extends Ability {
|
|
|
10
10
|
});
|
|
11
11
|
}
|
|
12
12
|
}
|
|
13
|
-
//# sourceMappingURL=
|
|
13
|
+
//# sourceMappingURL=auth.ability.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth.ability.js","sourceRoot":"","sources":["../../src/abilities/auth.ability.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAGP,mBAAmB,EAEnB,iBAAiB,GAElB,MAAM,eAAe,CAAC;AAEvB,6EAA6E;AAC7E,MAAM,OAAO,WAAY,SAAQ,OAAiC;IAChE,qEAAqE;IACrE,YACE,QAAiD,EAAE,EACnD,UAAoD,EAAE;QAEtD,KAAK,CAAC,KAAK,EAAE;YACX,iBAAiB,EAAE,iBAAiB;YACpC,YAAY,EAAE,mBAAmB;YACjC,GAAG,OAAO;SACX,CAAC,CAAC;IACL,CAAC;CACF"}
|
|
@@ -1,2 +1 @@
|
|
|
1
|
-
export * from "./
|
|
2
|
-
export * from "./workspace.ability.js";
|
|
1
|
+
export * from "./auth.ability.js";
|
package/dist/abilities/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/abilities/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/abilities/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC"}
|
|
@@ -8,6 +8,7 @@ import type { AuthModuleUserOptions } from "./interfaces/auth-module-user-option
|
|
|
8
8
|
import type { AuthModuleWorkspaceOptions } from "./interfaces/auth-module-workspace-options.interface.js";
|
|
9
9
|
import type { AuthMaybePromise } from "./types/auth-maybe-promise.type.js";
|
|
10
10
|
import type { AuthModuleProvider } from "./types/auth-module-provider.type.js";
|
|
11
|
+
import type { BuildAbilityCallback } from "./types/build-ability-callback.type.js";
|
|
11
12
|
import type { DEFAULT_USER_PERMISSIONS, DEFAULT_USER_ROLES } from "./user.constants.js";
|
|
12
13
|
import type { DEFAULT_WORKSPACE_PERMISSIONS, DEFAULT_WORKSPACE_ROLES } from "./workspace.constants.js";
|
|
13
14
|
/** Configuration options for the AuthModule. */
|
|
@@ -20,6 +21,8 @@ export interface AuthModuleOptions<UserPermission extends string = string, Works
|
|
|
20
21
|
basePath?: string;
|
|
21
22
|
/** Secret used for authentication signing and encryption. */
|
|
22
23
|
secret?: string;
|
|
24
|
+
/** Synchronously extends the unified request ability; auth owns grants and credential ceilings. */
|
|
25
|
+
buildAbility?: BuildAbilityCallback<NoInfer<UserPermission | (typeof DEFAULT_USER_PERMISSIONS)[number]>, NoInfer<WorkspacePermission | (typeof DEFAULT_WORKSPACE_PERMISSIONS)[number]>>;
|
|
23
26
|
/** Origins permitted to initiate browser authentication requests. */
|
|
24
27
|
trustedOrigins?: string[] | ((request?: Request) => AuthMaybePromise<(string | null | undefined)[]>);
|
|
25
28
|
/** OAuth account persistence and state-validation options. */
|
package/dist/auth.guard.d.ts
CHANGED
|
@@ -1,24 +1,21 @@
|
|
|
1
1
|
import type { CanActivate, ExecutionContext } from "@nestjs/common";
|
|
2
2
|
import { ModuleRef, Reflector } from "@nestjs/core";
|
|
3
3
|
import type { AuthModuleOptions } from "./auth-module-options.interface.js";
|
|
4
|
-
import { AccessControlService } from "./services/access-control.service.js";
|
|
5
4
|
/** Guard that enforces authentication and evaluates route permissions. */
|
|
6
5
|
export declare class AuthGuard implements CanActivate {
|
|
7
6
|
protected readonly reflector: Reflector;
|
|
8
7
|
private readonly options;
|
|
9
8
|
private readonly moduleRef;
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
refreshAbilities(): void;
|
|
9
|
+
/** Rebuilds the ability after an explicit sign-in changes the request identity. */
|
|
10
|
+
refreshAbility(): void;
|
|
13
11
|
/**
|
|
14
12
|
* Creates the authentication and permission guard.
|
|
15
13
|
*
|
|
16
14
|
* @param reflector - Nest metadata reflector.
|
|
17
15
|
* @param options - Auth module options.
|
|
18
16
|
* @param moduleRef - Nest module reference used to resolve handler instances.
|
|
19
|
-
* @param accessControlService - Shared fail-closed operation authorization.
|
|
20
17
|
*/
|
|
21
|
-
constructor(reflector: Reflector, options: AuthModuleOptions, moduleRef: ModuleRef
|
|
18
|
+
constructor(reflector: Reflector, options: AuthModuleOptions, moduleRef: ModuleRef);
|
|
22
19
|
/**
|
|
23
20
|
* Determines whether the current route is marked as public.
|
|
24
21
|
*
|
|
@@ -39,9 +36,6 @@ export declare class AuthGuard implements CanActivate {
|
|
|
39
36
|
* @returns `true` when access is allowed.
|
|
40
37
|
*/
|
|
41
38
|
canActivate(context: ExecutionContext): Promise<boolean>;
|
|
42
|
-
private checkPermissions;
|
|
43
|
-
private checkUserPermission;
|
|
44
|
-
private checkWorkspacePermission;
|
|
45
39
|
private resolveSubject;
|
|
46
40
|
private isSubjectType;
|
|
47
41
|
private resolveProvider;
|
package/dist/auth.guard.js
CHANGED
|
@@ -17,17 +17,17 @@ import { IS_PUBLIC_KEY } from "./auth.constants.js";
|
|
|
17
17
|
import { MODULE_OPTIONS_TOKEN } from "./auth.module-definition.js";
|
|
18
18
|
import { Session } from "./entities/session.entity.js";
|
|
19
19
|
import { RequestIdentity } from "./infrastructure/request-identity.js";
|
|
20
|
-
import { CUSTOM_ROUTE_ARGS_METADATA, GQL_PARAM_TYPES, ROUTE_ARGS_METADATA, ROUTE_PARAM_TYPES,
|
|
21
|
-
import {
|
|
20
|
+
import { CAN_METADATA, CUSTOM_ROUTE_ARGS_METADATA, GQL_PARAM_TYPES, ROUTE_ARGS_METADATA, ROUTE_PARAM_TYPES, } from "./permission.constants.js";
|
|
21
|
+
import { can } from "./utils/can.util.js";
|
|
22
|
+
import { readRequestAbility } from "./utils/get-ability.util.js";
|
|
22
23
|
import { getCurrentApiKey } from "./utils/get-current-api-key.util.js";
|
|
23
24
|
/** Guard that enforces authentication and evaluates route permissions. */
|
|
24
25
|
let AuthGuard = class AuthGuard {
|
|
25
26
|
reflector;
|
|
26
27
|
options;
|
|
27
28
|
moduleRef;
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
refreshAbilities() {
|
|
29
|
+
/** Rebuilds the ability after an explicit sign-in changes the request identity. */
|
|
30
|
+
refreshAbility() {
|
|
31
31
|
RequestIdentity.refresh(this.options);
|
|
32
32
|
}
|
|
33
33
|
/**
|
|
@@ -36,13 +36,11 @@ let AuthGuard = class AuthGuard {
|
|
|
36
36
|
* @param reflector - Nest metadata reflector.
|
|
37
37
|
* @param options - Auth module options.
|
|
38
38
|
* @param moduleRef - Nest module reference used to resolve handler instances.
|
|
39
|
-
* @param accessControlService - Shared fail-closed operation authorization.
|
|
40
39
|
*/
|
|
41
|
-
constructor(reflector, options, moduleRef
|
|
40
|
+
constructor(reflector, options, moduleRef) {
|
|
42
41
|
this.reflector = reflector;
|
|
43
42
|
this.options = options;
|
|
44
43
|
this.moduleRef = moduleRef;
|
|
45
|
-
this.accessControlService = accessControlService;
|
|
46
44
|
}
|
|
47
45
|
/**
|
|
48
46
|
* Determines whether the current route is marked as public.
|
|
@@ -81,42 +79,20 @@ let AuthGuard = class AuthGuard {
|
|
|
81
79
|
throw new UnauthorizedException("Authentication is required");
|
|
82
80
|
}
|
|
83
81
|
if (RequestContext.isActive()) {
|
|
84
|
-
RequestContext.set(AccessControlService, this.accessControlService);
|
|
85
82
|
RequestIdentity.prepare(this.options);
|
|
86
83
|
}
|
|
87
|
-
const
|
|
88
|
-
|
|
89
|
-
const workspaceCanMetadata = this.reflector.getAllAndMerge(WORKSPACE_CAN_METADATA, targets);
|
|
90
|
-
if (!userCanMetadata?.length && !workspaceCanMetadata?.length) {
|
|
84
|
+
const metadata = this.reflector.getAllAndMerge(CAN_METADATA, [context.getHandler(), context.getClass()]);
|
|
85
|
+
if (!metadata?.length)
|
|
91
86
|
return true;
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
}
|
|
95
|
-
async checkPermissions(userCanMetadata, workspaceCanMetadata, context) {
|
|
96
|
-
for (const metadata of userCanMetadata) {
|
|
97
|
-
if (!(await this.checkUserPermission(metadata, context))) {
|
|
87
|
+
for (const requirement of metadata) {
|
|
88
|
+
if (!readRequestAbility())
|
|
98
89
|
return false;
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
for (const metadata of workspaceCanMetadata) {
|
|
102
|
-
if (!(await this.checkWorkspacePermission(metadata, context))) {
|
|
90
|
+
const subject = await this.resolveSubject(requirement, context);
|
|
91
|
+
if (!can(requirement.action, subject))
|
|
103
92
|
return false;
|
|
104
|
-
}
|
|
105
93
|
}
|
|
106
94
|
return true;
|
|
107
95
|
}
|
|
108
|
-
async checkUserPermission(canOptions, context) {
|
|
109
|
-
if (!this.accessControlService.getUserAbility())
|
|
110
|
-
return false;
|
|
111
|
-
const subject = await this.resolveSubject(canOptions, context);
|
|
112
|
-
return this.accessControlService.userCan(canOptions.action, subject);
|
|
113
|
-
}
|
|
114
|
-
async checkWorkspacePermission(canOptions, context) {
|
|
115
|
-
if (!this.accessControlService.getWorkspaceAbility())
|
|
116
|
-
return false;
|
|
117
|
-
const subject = await this.resolveSubject(canOptions, context);
|
|
118
|
-
return this.accessControlService.workspaceCan(canOptions.action, subject);
|
|
119
|
-
}
|
|
120
96
|
async resolveSubject(canOptions, context) {
|
|
121
97
|
const { subject } = canOptions;
|
|
122
98
|
if (this.isSubjectType(subject)) {
|
|
@@ -264,8 +240,7 @@ let AuthGuard = class AuthGuard {
|
|
|
264
240
|
AuthGuard = __decorate([
|
|
265
241
|
Injectable(),
|
|
266
242
|
__param(1, Inject(MODULE_OPTIONS_TOKEN)),
|
|
267
|
-
__metadata("design:paramtypes", [Reflector, Object, ModuleRef
|
|
268
|
-
AccessControlService])
|
|
243
|
+
__metadata("design:paramtypes", [Reflector, Object, ModuleRef])
|
|
269
244
|
], AuthGuard);
|
|
270
245
|
export { AuthGuard };
|
|
271
246
|
//# sourceMappingURL=auth.guard.js.map
|
package/dist/auth.guard.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.guard.js","sourceRoot":"","sources":["../src/auth.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGtE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.guard.js","sourceRoot":"","sources":["../src/auth.guard.ts"],"names":[],"mappings":"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"}
|
package/dist/auth.module.js
CHANGED
|
@@ -39,7 +39,6 @@ import { UserResolver } from "./resolvers/user.resolver.js";
|
|
|
39
39
|
import { UserApiKeyResolver } from "./resolvers/user-api-key.resolver.js";
|
|
40
40
|
import { WorkspaceResolver } from "./resolvers/workspace.resolver.js";
|
|
41
41
|
import { WorkspaceApiKeyResolver } from "./resolvers/workspace-api-key.resolver.js";
|
|
42
|
-
import { AccessControlService } from "./services/access-control.service.js";
|
|
43
42
|
import { AccountService } from "./services/account.service.js";
|
|
44
43
|
import { AuthService } from "./services/auth.service.js";
|
|
45
44
|
import { InvitationService } from "./services/invitation.service.js";
|
|
@@ -149,7 +148,6 @@ AuthModule = __decorate([
|
|
|
149
148
|
AccountService,
|
|
150
149
|
ApiKeyUsageInterceptor,
|
|
151
150
|
AuthService,
|
|
152
|
-
AccessControlService,
|
|
153
151
|
UserDeletionService,
|
|
154
152
|
AuthGuard,
|
|
155
153
|
AuthHandlerMiddleware,
|
|
@@ -184,9 +182,6 @@ AuthModule = __decorate([
|
|
|
184
182
|
assertAuthPermissionList(allowed, catalog, `apiKey.${scope}.allowedPermissions`);
|
|
185
183
|
assertAuthPermissionList(defaults, catalog, `apiKey.${scope}.defaultPermissions`);
|
|
186
184
|
assertAuthPermissionSubset(defaults, allowed, `apiKey.${scope}.defaultPermissions`, `apiKey.${scope}.allowedPermissions`);
|
|
187
|
-
if (scope === "workspace" && defaults.includes("invitation:create")) {
|
|
188
|
-
throw new Error("apiKey.workspace.defaultPermissions cannot include invitation:create: workspace API keys require a user identity to send invitations");
|
|
189
|
-
}
|
|
190
185
|
}
|
|
191
186
|
assertAuthRolesExist(userRoles, [options.user?.defaultRole ?? DEFAULT_USER_ROLE], "user.defaultRole");
|
|
192
187
|
assertAuthRolesExist(userRoles, options.user?.adminRoles ?? DEFAULT_USER_ADMIN_ROLES, "user.adminRoles");
|
|
@@ -246,7 +241,6 @@ AuthModule = __decorate([
|
|
|
246
241
|
WorkspaceApiKeyService,
|
|
247
242
|
AuthGuard,
|
|
248
243
|
AuthService,
|
|
249
|
-
AccessControlService,
|
|
250
244
|
SessionService,
|
|
251
245
|
WorkspaceService,
|
|
252
246
|
MemberService,
|
package/dist/auth.module.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../src/auth.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAEL,iBAAiB,EACjB,gBAAgB,GACjB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,cAAc,EACd,wBAAwB,EACxB,oBAAoB,GACrB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAGL,MAAM,EACN,MAAM,EACN,MAAM,GAEP,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,UAAU,EAA0B,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EACL,uBAAuB,EACvB,oBAAoB,GACrB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAErE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2CAA2C,CAAC;AACpF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../src/auth.module.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,6 @@
|
|
|
1
1
|
import type { Subject } from "@casl/ability";
|
|
2
2
|
import type { CustomDecorator } from "@nestjs/common";
|
|
3
|
-
import
|
|
4
|
-
import { USER_CAN_METADATA, WORKSPACE_CAN_METADATA } from "../permission.constants.js";
|
|
3
|
+
import { CAN_METADATA } from "../permission.constants.js";
|
|
5
4
|
import type { CanSubject } from "../types/can-subject.type.js";
|
|
6
|
-
/**
|
|
7
|
-
|
|
8
|
-
*
|
|
9
|
-
* @param action - Permission action that must be allowed.
|
|
10
|
-
* @param subject - Permission subject type or subject resolver factory to check.
|
|
11
|
-
* @param options - Optional authorization-domain settings.
|
|
12
|
-
* @returns Nest custom metadata decorator.
|
|
13
|
-
*/
|
|
14
|
-
export declare function Can<T extends Subject = Subject>(action: string, subject: CanSubject<T>, options?: CanOptions): CustomDecorator<typeof USER_CAN_METADATA | typeof WORKSPACE_CAN_METADATA>;
|
|
5
|
+
/** Requires an action on a subject; repeated declarations must all be allowed. */
|
|
6
|
+
export declare function Can<T extends Subject = Subject>(action: string, subject: CanSubject<T>): CustomDecorator<typeof CAN_METADATA>;
|
|
@@ -1,16 +1,10 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
/**
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
* @returns Nest custom metadata decorator.
|
|
10
|
-
*/
|
|
11
|
-
export function Can(action, subject, options = {}) {
|
|
12
|
-
return options.scope === "user"
|
|
13
|
-
? UserCan(action, subject)
|
|
14
|
-
: WorkspaceCan(action, subject);
|
|
1
|
+
import { CAN_METADATA } from "../permission.constants.js";
|
|
2
|
+
import { appendMetadata } from "../utils/append-metadata.util.js";
|
|
3
|
+
/** Requires an action on a subject; repeated declarations must all be allowed. */
|
|
4
|
+
export function Can(action, subject) {
|
|
5
|
+
if (!subject)
|
|
6
|
+
throw new TypeError("Permission subject is required.");
|
|
7
|
+
const metadata = { action, subject };
|
|
8
|
+
return appendMetadata(CAN_METADATA, metadata);
|
|
15
9
|
}
|
|
16
10
|
//# sourceMappingURL=can.decorator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"can.decorator.js","sourceRoot":"","sources":["../../src/decorators/can.decorator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"can.decorator.js","sourceRoot":"","sources":["../../src/decorators/can.decorator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAElE,kFAAkF;AAClF,MAAM,UAAU,GAAG,CACjB,MAAc,EACd,OAAsB;IAEtB,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,SAAS,CAAC,iCAAiC,CAAC,CAAC;IACrE,MAAM,QAAQ,GAAmB,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;IACrD,OAAO,cAAc,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;AAChD,CAAC"}
|
|
@@ -5,5 +5,3 @@ export * from "./current-session.decorator.js";
|
|
|
5
5
|
export * from "./current-user.decorator.js";
|
|
6
6
|
export * from "./current-workspace.decorator.js";
|
|
7
7
|
export * from "./public.decorator.js";
|
|
8
|
-
export * from "./user-can.decorator.js";
|
|
9
|
-
export * from "./workspace-can.decorator.js";
|
package/dist/decorators/index.js
CHANGED
|
@@ -5,6 +5,4 @@ export * from "./current-session.decorator.js";
|
|
|
5
5
|
export * from "./current-user.decorator.js";
|
|
6
6
|
export * from "./current-workspace.decorator.js";
|
|
7
7
|
export * from "./public.decorator.js";
|
|
8
|
-
export * from "./user-can.decorator.js";
|
|
9
|
-
export * from "./workspace-can.decorator.js";
|
|
10
8
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/decorators/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kCAAkC,CAAC;AACjD,cAAc,uBAAuB,CAAC
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/decorators/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kCAAkC,CAAC;AACjD,cAAc,uBAAuB,CAAC"}
|
|
@@ -126,7 +126,7 @@ __decorate([
|
|
|
126
126
|
], Account.prototype, "updatedAt", void 0);
|
|
127
127
|
__decorate([
|
|
128
128
|
Field(() => [String]),
|
|
129
|
-
__metadata("design:type",
|
|
129
|
+
__metadata("design:type", Object),
|
|
130
130
|
__metadata("design:paramtypes", [])
|
|
131
131
|
], Account.prototype, "scopes", null);
|
|
132
132
|
Account = __decorate([
|
|
@@ -21,4 +21,6 @@ export declare class Invitation extends BaseEntity {
|
|
|
21
21
|
inviter: Ref<User>;
|
|
22
22
|
/** Workspace to which the recipient was invited. */
|
|
23
23
|
workspace: Ref<Workspace>;
|
|
24
|
+
/** Workspace identifier available to serialized authorization conditions. */
|
|
25
|
+
get workspaceId(): Opt<string>;
|
|
24
26
|
}
|
|
@@ -35,6 +35,10 @@ let Invitation = class Invitation extends BaseEntity {
|
|
|
35
35
|
inviter;
|
|
36
36
|
/** Workspace to which the recipient was invited. */
|
|
37
37
|
workspace;
|
|
38
|
+
/** Workspace identifier available to serialized authorization conditions. */
|
|
39
|
+
get workspaceId() {
|
|
40
|
+
return this.workspace.id;
|
|
41
|
+
}
|
|
38
42
|
};
|
|
39
43
|
__decorate([
|
|
40
44
|
PrimaryKey({ type: t.uuid }),
|
|
@@ -90,6 +94,11 @@ __decorate([
|
|
|
90
94
|
}),
|
|
91
95
|
__metadata("design:type", Object)
|
|
92
96
|
], Invitation.prototype, "workspace", void 0);
|
|
97
|
+
__decorate([
|
|
98
|
+
Field(() => ID),
|
|
99
|
+
__metadata("design:type", Object),
|
|
100
|
+
__metadata("design:paramtypes", [])
|
|
101
|
+
], Invitation.prototype, "workspaceId", null);
|
|
93
102
|
Invitation = __decorate([
|
|
94
103
|
ObjectType(),
|
|
95
104
|
Entity({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invitation.entity.js","sourceRoot":"","sources":["../../src/entities/invitation.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,8HAA8H;AAC9H,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,UAAU,EAAsB,CAAC,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EACL,MAAM,EACN,IAAI,EACJ,KAAK,EACL,SAAS,EACT,UAAU,EACV,QAAQ,EACR,MAAM,GACP,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAE3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AASlD,sFAAsF;AAuB/E,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,UAAU;IACxC,6CAA6C;IAG7C,EAAE,GAAgB,UAAU,EAAE,CAAC;IAE/B,sDAAsD;IAKtD,KAAK,CAAU;IAEf,oDAAoD;IAGpD,KAAK,GAAkB,CAAC,QAAQ,CAAC,CAAC;IAElC,mCAAmC;IAMnC,MAAM,GAA8B,gBAAgB,CAAC,OAAO,CAAC;IAE7D,iEAAiE;IAKjE,SAAS,CAAQ;IAEjB,iDAAiD;IAMjD,SAAS,GAAc,IAAI,IAAI,EAAE,CAAC;IAElC,wCAAwC;IAKxC,OAAO,CAAa;IAEpB,oDAAoD;IAKpD,SAAS,CAAkB;
|
|
1
|
+
{"version":3,"file":"invitation.entity.js","sourceRoot":"","sources":["../../src/entities/invitation.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,8HAA8H;AAC9H,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,UAAU,EAAsB,CAAC,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EACL,MAAM,EACN,IAAI,EACJ,KAAK,EACL,SAAS,EACT,UAAU,EACV,QAAQ,EACR,MAAM,GACP,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAE3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AASlD,sFAAsF;AAuB/E,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,UAAU;IACxC,6CAA6C;IAG7C,EAAE,GAAgB,UAAU,EAAE,CAAC;IAE/B,sDAAsD;IAKtD,KAAK,CAAU;IAEf,oDAAoD;IAGpD,KAAK,GAAkB,CAAC,QAAQ,CAAC,CAAC;IAElC,mCAAmC;IAMnC,MAAM,GAA8B,gBAAgB,CAAC,OAAO,CAAC;IAE7D,iEAAiE;IAKjE,SAAS,CAAQ;IAEjB,iDAAiD;IAMjD,SAAS,GAAc,IAAI,IAAI,EAAE,CAAC;IAElC,wCAAwC;IAKxC,OAAO,CAAa;IAEpB,oDAAoD;IAKpD,SAAS,CAAkB;IAE3B,6EAA6E;IAC7E,IACI,WAAW;QACb,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;IAC3B,CAAC;CACF,CAAA;AAxDC;IAFC,UAAU,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC5B,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;;sCACe;AAO/B;IAJC,QAAQ,CAAC;QACR,IAAI,EAAE,CAAC,CAAC,MAAM;KACf,CAAC;IACD,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;yCACL;AAKf;IAFC,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC;IACrD,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC;;yCACK;AAQlC;IALC,KAAK,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAC;IAC7B,IAAI,CAAC;QACJ,KAAK,EAAE,GAAG,EAAE,CAAC,gBAAgB;QAC7B,OAAO,EAAE,gBAAgB,CAAC,OAAO;KAClC,CAAC;;0CAC2D;AAO7D;IAJC,QAAQ,CAAC;QACR,IAAI,EAAE,CAAC,CAAC,QAAQ;KACjB,CAAC;IACD,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;8BACN,IAAI;6CAAC;AAQjB;IALC,QAAQ,CAAC;QACR,IAAI,EAAE,CAAC,CAAC,QAAQ;QAChB,UAAU,EAAE,OAAO;KACpB,CAAC;IACD,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;;6CACgB;AAOlC;IAJC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE;QACrB,UAAU,EAAE,SAAS;QACrB,UAAU,EAAE,SAAS;KACtB,CAAC;;2CACkB;AAOpB;IAJC,SAAS,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE;QAC1B,UAAU,EAAE,SAAS;QACrB,UAAU,EAAE,SAAS;KACtB,CAAC;;6CACyB;AAG3B;IAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;;;6CAGf;AA3DU,UAAU;IAtBtB,UAAU,EAAE;IACZ,MAAM,CAAC;QACN,QAAQ,EAAE;YACR,oBAAoB,EAAE;YACtB;gBACE,IAAI,EAAE,oCAAoC;gBAC1C,OAAO,EAAE,QAAQ;gBACjB,KAAK,EAAE,CAAC,eAAe,CAAC;gBACxB,uFAAuF;gBACvF,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CACnB,IAAI,KAAK,sJAAsJ;aAClK;SACF;KACF,CAAC;IACD,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC;IACpC,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;IAChC,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;IACjC,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC;IACpC,MAAM,CAAC;QACN,UAAU,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC;QAClC,KAAK,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE;KAC7B,CAAC;GACW,UAAU,CA4DtB"}
|