@nest-boot/auth 8.0.5-beta.3 → 8.0.5-beta.5
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 +27 -7
- 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 +3 -100
- 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 +23 -21
- 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/better-auth-adapter.d.ts +13 -0
- package/dist/infrastructure/better-auth-adapter.js +9 -0
- package/dist/infrastructure/better-auth-adapter.js.map +1 -0
- package/dist/infrastructure/create-auth-instance.d.ts +10 -0
- package/dist/infrastructure/create-auth-instance.js +105 -0
- package/dist/infrastructure/create-auth-instance.js.map +1 -0
- 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-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/auth.service.js +2 -1
- package/dist/services/auth.service.js.map +1 -1
- package/dist/services/invitation.service.d.ts +1 -3
- package/dist/services/invitation.service.js +32 -32
- package/dist/services/invitation.service.js.map +1 -1
- package/dist/services/member.service.d.ts +1 -3
- package/dist/services/member.service.js +50 -51
- package/dist/services/member.service.js.map +1 -1
- package/dist/services/session.service.d.ts +1 -4
- package/dist/services/session.service.js +13 -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 +38 -42
- 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 +50 -71
- package/dist/services/workspace-api-key.service.js.map +1 -1
- package/dist/services/workspace.service.d.ts +1 -3
- package/dist/services/workspace.service.js +22 -24
- 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/utils/api-key-permissions.util.d.ts +2 -0
- package/dist/utils/api-key-permissions.util.js +9 -0
- 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/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 -54
- package/dist/services/access-control.service.js +0 -208
- 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
|
@@ -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
|
|
@@ -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.
|
|
@@ -412,11 +413,16 @@ 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.
|
|
@@ -601,3 +607,17 @@ Authentication and successful-use tracking are internal infrastructure responsib
|
|
|
601
607
|
`getUserConnection`, `getSessionConnectionByUser`, and the member/invitation
|
|
602
608
|
connection methods instead. `listCurrentUserSessions` remains an internal
|
|
603
609
|
credential-hydration helper for session revocation, not a GraphQL listing API.
|
|
610
|
+
|
|
611
|
+
## Internal BetterAuth integration
|
|
612
|
+
|
|
613
|
+
`AuthModule` owns Nest provider registration and HTTP middleware wiring.
|
|
614
|
+
`infrastructure/create-auth-instance.ts` validates options, resolves environment/default
|
|
615
|
+
precedence with the existing config helpers, and constructs the BetterAuth instance.
|
|
616
|
+
`infrastructure/better-auth-adapter.ts` derives the auth/session API surface from that
|
|
617
|
+
factory's upstream type and owns the untyped injection boundary. Update this boundary
|
|
618
|
+
when changing the BetterAuth integration instead of adding service-local API declarations.
|
|
619
|
+
|
|
620
|
+
Application services retain their public options/results, identity and transaction rules.
|
|
621
|
+
They normalize upstream results and use `applyAuthResponseCookies` to forward response
|
|
622
|
+
cookies; session cookie creation remains in `SessionService`. Contextual service providers
|
|
623
|
+
continue to own request execution and transaction boundaries.
|
|
@@ -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
|
@@ -14,23 +14,18 @@ import { MikroORM } from "@mikro-orm/core";
|
|
|
14
14
|
import { HashService } from "@nest-boot/hash";
|
|
15
15
|
import { Mailer } from "@nest-boot/mailer";
|
|
16
16
|
import { MiddlewareManager, MiddlewareModule, } from "@nest-boot/middleware";
|
|
17
|
-
import {
|
|
17
|
+
import { RequestContextMiddleware, RequestContextModule, } from "@nest-boot/request-context";
|
|
18
18
|
import { Global, Inject, Module, } from "@nestjs/common";
|
|
19
19
|
import { APP_INTERCEPTOR } from "@nestjs/core";
|
|
20
|
-
import { betterAuth } from "better-auth";
|
|
21
|
-
import { genericOAuth } from "better-auth/plugins";
|
|
22
|
-
import { mikroOrmAdapter } from "./adapters/mikro-orm-adapter.js";
|
|
23
20
|
import { ApiKeyUsageInterceptor } from "./api-key-usage.interceptor.js";
|
|
24
21
|
import { AUTH_TOKEN } from "./auth.constants.js";
|
|
25
22
|
import { AuthGuard } from "./auth.guard.js";
|
|
26
23
|
import { AuthMiddleware } from "./auth.middleware.js";
|
|
27
24
|
import { ConfigurableModuleClass, MODULE_OPTIONS_TOKEN, } from "./auth.module-definition.js";
|
|
28
25
|
import { AuthHandlerMiddleware } from "./auth-handler.middleware.js";
|
|
29
|
-
import { authEntityMap } from "./entities/auth-entity-map.js";
|
|
30
|
-
import { User } from "./entities/user.entity.js";
|
|
31
26
|
import { AuthEnumRegistry } from "./infrastructure/auth-enum-registry.js";
|
|
32
27
|
import { authServiceProviders } from "./infrastructure/auth-service.providers.js";
|
|
33
|
-
import {
|
|
28
|
+
import { createAuthInstance } from "./infrastructure/create-auth-instance.js";
|
|
34
29
|
import { AuthResolver } from "./resolvers/auth.resolver.js";
|
|
35
30
|
import { InvitationResolver } from "./resolvers/invitation.resolver.js";
|
|
36
31
|
import { MemberResolver } from "./resolvers/member.resolver.js";
|
|
@@ -39,7 +34,6 @@ import { UserResolver } from "./resolvers/user.resolver.js";
|
|
|
39
34
|
import { UserApiKeyResolver } from "./resolvers/user-api-key.resolver.js";
|
|
40
35
|
import { WorkspaceResolver } from "./resolvers/workspace.resolver.js";
|
|
41
36
|
import { WorkspaceApiKeyResolver } from "./resolvers/workspace-api-key.resolver.js";
|
|
42
|
-
import { AccessControlService } from "./services/access-control.service.js";
|
|
43
37
|
import { AccountService } from "./services/account.service.js";
|
|
44
38
|
import { AuthService } from "./services/auth.service.js";
|
|
45
39
|
import { InvitationService } from "./services/invitation.service.js";
|
|
@@ -50,21 +44,6 @@ import { UserApiKeyService } from "./services/user-api-key.service.js";
|
|
|
50
44
|
import { UserDeletionService } from "./services/user-deletion.service.js";
|
|
51
45
|
import { WorkspaceService } from "./services/workspace.service.js";
|
|
52
46
|
import { WorkspaceApiKeyService } from "./services/workspace-api-key.service.js";
|
|
53
|
-
import { DEFAULT_USER_ADMIN_ROLES, DEFAULT_USER_ROLE, } from "./user.constants.js";
|
|
54
|
-
import { resolveApiKeyPermissionCatalog } from "./utils/api-key-permissions.util.js";
|
|
55
|
-
import { assertAuthPermissionList, assertAuthPermissionSubset, assertAuthRolePermissions, assertAuthRolesExist, } from "./utils/auth-role.util.js";
|
|
56
|
-
import { createEmailAndPasswordConfig } from "./utils/create-email-and-password-config.js";
|
|
57
|
-
import { createEmailVerificationConfig } from "./utils/create-email-verification-config.js";
|
|
58
|
-
import { createGenericOAuthConfig } from "./utils/create-generic-oauth-config.js";
|
|
59
|
-
import { createOidcConfig } from "./utils/create-oidc-config.js";
|
|
60
|
-
import { createSocialProvidersConfig } from "./utils/create-social-providers-config.js";
|
|
61
|
-
import { createUserConfig } from "./utils/create-user-config.js";
|
|
62
|
-
import { isEnvTrue } from "./utils/is-env-true.js";
|
|
63
|
-
import { resolveAuthCatalog } from "./utils/resolve-auth-catalog.util.js";
|
|
64
|
-
import { resolveSecret } from "./utils/resolve-secret.js";
|
|
65
|
-
import { runAuthQuery } from "./utils/run-auth-query.js";
|
|
66
|
-
import { splitAuthProviders } from "./utils/split-auth-providers.js";
|
|
67
|
-
import { DEFAULT_WORKSPACE_CREATOR_ROLE, DEFAULT_WORKSPACE_ROLE, } from "./workspace.constants.js";
|
|
68
47
|
/**
|
|
69
48
|
* Authentication module based on better-auth.
|
|
70
49
|
*
|
|
@@ -149,7 +128,6 @@ AuthModule = __decorate([
|
|
|
149
128
|
AccountService,
|
|
150
129
|
ApiKeyUsageInterceptor,
|
|
151
130
|
AuthService,
|
|
152
|
-
AccessControlService,
|
|
153
131
|
UserDeletionService,
|
|
154
132
|
AuthGuard,
|
|
155
133
|
AuthHandlerMiddleware,
|
|
@@ -167,72 +145,7 @@ AuthModule = __decorate([
|
|
|
167
145
|
HashService,
|
|
168
146
|
UserDeletionService,
|
|
169
147
|
],
|
|
170
|
-
useFactory:
|
|
171
|
-
const { roles: userRoles, permissions: userPermissions } = resolveAuthCatalog(options, "user");
|
|
172
|
-
const { roles: workspaceRoles, permissions: workspacePermissions } = resolveAuthCatalog(options, "workspace");
|
|
173
|
-
assertAuthRolePermissions(userRoles, userPermissions, "user");
|
|
174
|
-
assertAuthRolePermissions(workspaceRoles, workspacePermissions, "workspace");
|
|
175
|
-
if (options.apiKey &&
|
|
176
|
-
("defaultPermissions" in options.apiKey ||
|
|
177
|
-
"allowedPermissions" in options.apiKey)) {
|
|
178
|
-
throw new Error("Configure API key permissions under apiKey.user or apiKey.workspace");
|
|
179
|
-
}
|
|
180
|
-
for (const scope of ["user", "workspace"]) {
|
|
181
|
-
const { permissions: catalog, defaults } = resolveApiKeyPermissionCatalog(options, scope);
|
|
182
|
-
const configured = options.apiKey?.[scope];
|
|
183
|
-
const allowed = configured?.allowedPermissions ?? catalog;
|
|
184
|
-
assertAuthPermissionList(allowed, catalog, `apiKey.${scope}.allowedPermissions`);
|
|
185
|
-
assertAuthPermissionList(defaults, catalog, `apiKey.${scope}.defaultPermissions`);
|
|
186
|
-
assertAuthPermissionSubset(defaults, allowed, `apiKey.${scope}.defaultPermissions`, `apiKey.${scope}.allowedPermissions`);
|
|
187
|
-
}
|
|
188
|
-
assertAuthRolesExist(userRoles, [options.user?.defaultRole ?? DEFAULT_USER_ROLE], "user.defaultRole");
|
|
189
|
-
assertAuthRolesExist(userRoles, options.user?.adminRoles ?? DEFAULT_USER_ADMIN_ROLES, "user.adminRoles");
|
|
190
|
-
assertAuthRolesExist(workspaceRoles, [options.workspace?.defaultRole ?? DEFAULT_WORKSPACE_ROLE], "workspace.defaultRole");
|
|
191
|
-
assertAuthRolesExist(workspaceRoles, [options.workspace?.creatorRole ?? DEFAULT_WORKSPACE_CREATOR_ROLE], "workspace.creatorRole");
|
|
192
|
-
const secret = resolveSecret(options);
|
|
193
|
-
const disableSignUp = isEnvTrue("AUTH_DISABLE_SIGN_UP");
|
|
194
|
-
const providers = splitAuthProviders(options.providers);
|
|
195
|
-
const oidcConfig = createOidcConfig(disableSignUp);
|
|
196
|
-
const genericOAuthConfig = createGenericOAuthConfig(disableSignUp, providers.genericOAuthProviders, oidcConfig);
|
|
197
|
-
const emailAndPasswordConfig = createEmailAndPasswordConfig(disableSignUp, mailer, hashService, options.emailAndPassword);
|
|
198
|
-
const emailVerificationConfig = createEmailVerificationConfig(mailer, options.emailVerification);
|
|
199
|
-
const socialProvidersConfig = createSocialProvidersConfig(disableSignUp, providers.socialProviders);
|
|
200
|
-
const userConfig = createUserConfig(mailer, options.user, async (userId, beforeDelete) => {
|
|
201
|
-
await runAuthQuery(orm.em, () => userDeletionService.deleteUser(userId, beforeDelete));
|
|
202
|
-
// Publish the committed deletion before Better Auth runs afterDelete.
|
|
203
|
-
if (RequestContext.isActive() &&
|
|
204
|
-
RequestContext.get(User)?.id === userId)
|
|
205
|
-
RequestIdentity.clear(orm.em);
|
|
206
|
-
});
|
|
207
|
-
const betterAuthOptions = {
|
|
208
|
-
appName: options.appName ?? process.env.APP_NAME,
|
|
209
|
-
baseURL: options.baseURL ?? process.env.AUTH_URL ?? process.env.APP_URL,
|
|
210
|
-
...(options.account ? { account: options.account } : {}),
|
|
211
|
-
secret,
|
|
212
|
-
emailAndPassword: emailAndPasswordConfig,
|
|
213
|
-
emailVerification: emailVerificationConfig,
|
|
214
|
-
...(userConfig ? { user: userConfig } : {}),
|
|
215
|
-
...(socialProvidersConfig
|
|
216
|
-
? { socialProviders: socialProvidersConfig }
|
|
217
|
-
: {}),
|
|
218
|
-
plugins: [
|
|
219
|
-
...(genericOAuthConfig.length > 0
|
|
220
|
-
? [
|
|
221
|
-
genericOAuth({
|
|
222
|
-
config: genericOAuthConfig,
|
|
223
|
-
}),
|
|
224
|
-
]
|
|
225
|
-
: []),
|
|
226
|
-
],
|
|
227
|
-
database: mikroOrmAdapter({
|
|
228
|
-
defaultUserRole: options.user?.defaultRole ?? DEFAULT_USER_ROLE,
|
|
229
|
-
orm,
|
|
230
|
-
entities: authEntityMap,
|
|
231
|
-
}),
|
|
232
|
-
};
|
|
233
|
-
copyBetterAuthOptions(betterAuthOptions, options);
|
|
234
|
-
return betterAuth(betterAuthOptions);
|
|
235
|
-
},
|
|
148
|
+
useFactory: createAuthInstance,
|
|
236
149
|
},
|
|
237
150
|
],
|
|
238
151
|
exports: [
|
|
@@ -243,7 +156,6 @@ AuthModule = __decorate([
|
|
|
243
156
|
WorkspaceApiKeyService,
|
|
244
157
|
AuthGuard,
|
|
245
158
|
AuthService,
|
|
246
|
-
AccessControlService,
|
|
247
159
|
SessionService,
|
|
248
160
|
WorkspaceService,
|
|
249
161
|
MemberService,
|
|
@@ -255,13 +167,4 @@ AuthModule = __decorate([
|
|
|
255
167
|
__metadata("design:paramtypes", [Object, MiddlewareManager, Object, AuthMiddleware])
|
|
256
168
|
], AuthModule);
|
|
257
169
|
export { AuthModule };
|
|
258
|
-
function copyBetterAuthOptions(target, source) {
|
|
259
|
-
if (source.basePath !== undefined)
|
|
260
|
-
target.basePath = source.basePath;
|
|
261
|
-
if (source.session !== undefined)
|
|
262
|
-
target.session = source.session;
|
|
263
|
-
if (source.trustedOrigins !== undefined) {
|
|
264
|
-
target.trustedOrigins = source.trustedOrigins;
|
|
265
|
-
}
|
|
266
|
-
}
|
|
267
170
|
//# sourceMappingURL=auth.module.js.map
|
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,
|
|
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({
|