@nest-boot/auth 8.0.5-beta.2 → 8.0.5-beta.3
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 +20 -15
- package/dist/auth.module.js +0 -3
- package/dist/auth.module.js.map +1 -1
- package/dist/infrastructure/auth-ability.factory.js +13 -12
- package/dist/infrastructure/auth-ability.factory.js.map +1 -1
- package/dist/interfaces/auth-module-api-key-options.interface.d.ts +1 -1
- package/dist/services/access-control.service.d.ts +2 -0
- package/dist/services/access-control.service.js +7 -0
- package/dist/services/access-control.service.js.map +1 -1
- package/dist/services/invitation.service.js +16 -23
- package/dist/services/invitation.service.js.map +1 -1
- package/dist/services/member.service.d.ts +1 -1
- package/dist/services/member.service.js +30 -26
- package/dist/services/member.service.js.map +1 -1
- package/dist/services/session.service.js +2 -2
- package/dist/services/session.service.js.map +1 -1
- package/dist/services/user-api-key.service.js +6 -6
- package/dist/services/user-api-key.service.js.map +1 -1
- package/dist/services/user.service.js +23 -17
- package/dist/services/user.service.js.map +1 -1
- package/dist/services/workspace-api-key.service.js +7 -11
- package/dist/services/workspace-api-key.service.js.map +1 -1
- package/dist/services/workspace.service.d.ts +1 -1
- package/dist/services/workspace.service.js +20 -12
- package/dist/services/workspace.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- 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.js +1 -2
- package/dist/utils/api-key-permissions.util.js.map +1 -1
- 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 +7 -7
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.
|
|
@@ -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`;
|
|
@@ -264,10 +264,10 @@ in depth, not a substitute for these checks or for correctly configured policies
|
|
|
264
264
|
Workspace deletion and member profile edits use the target's `delete` and
|
|
265
265
|
`update` abilities, respectively, rather than requiring the caller's creator
|
|
266
266
|
role. Editing the creator's shared contact fields follows the same rule;
|
|
267
|
-
disabling/removing a creator checks the same
|
|
267
|
+
disabling/removing a creator checks the same member write ability as other members.
|
|
268
268
|
Any current member may leave, including the last creator; the workspace is retained.
|
|
269
269
|
Creator roles can be assigned or replaced through `setMemberRoles`, subject to
|
|
270
|
-
|
|
270
|
+
`member:set-roles` ability and permission-grant checks. Multiple owners are allowed; no
|
|
271
271
|
dedicated ownership-transfer operation is provided. API-key update/delete checks both the entity
|
|
272
272
|
type and the loaded instance so conditional abilities remain enforced.
|
|
273
273
|
|
|
@@ -300,7 +300,7 @@ direct ORM/SQL access does not enforce those application authorization rules.
|
|
|
300
300
|
Permission identifiers use lowercase `resource:action` names. Catalog membership,
|
|
301
301
|
grant ceilings and API-key intersections use exact string equality; invalid
|
|
302
302
|
names are rejected rather than case-converted. Auth owns the mappings for
|
|
303
|
-
`user:*`, `session:*`, `workspace:*`, `member:*`,
|
|
303
|
+
`user:*`, `session:*`, `workspace:*`, `member:*`, and scoped API-key
|
|
304
304
|
permissions. Custom permission names only grant business abilities through
|
|
305
305
|
explicit permission-bound rules; they cannot redefine built-in auth operations.
|
|
306
306
|
|
|
@@ -421,7 +421,9 @@ They cannot grant operations on built-in auth entities or `all`, access the raw
|
|
|
421
421
|
builder, or replace the resulting ability. Restrictions take precedence over
|
|
422
422
|
business grants. The frontend consumes the final serialized rules.
|
|
423
423
|
|
|
424
|
-
`api-key:read/
|
|
424
|
+
Personal keys use `user-api-key:read/write`; workspace keys use
|
|
425
|
+
`workspace-api-key:read/write`. Write covers creation, updates, enabling/disabling,
|
|
426
|
+
and deletion without granting reads.
|
|
425
427
|
User administrators and workspace owners inherit them; ordinary users and
|
|
426
428
|
workspace administrators require explicit role or direct grants. Existing
|
|
427
429
|
ownership checks and self-service operations remain enforced by Services.
|
|
@@ -431,8 +433,10 @@ The `userRoles` and `workspaceRoles` queries return `{ role, grantable }` object
|
|
|
431
433
|
`userApiKeyPermissions` and `workspaceApiKeyPermissions` also return
|
|
432
434
|
`{ permission, grantable, default }` entries. `grantable` includes the API-key
|
|
433
435
|
allowlist and issuer's grant ceiling; `default` reflects configured defaults.
|
|
434
|
-
Editors preselect only `default && grantable`.
|
|
435
|
-
|
|
436
|
+
Editors preselect only `default && grantable`. `member:invite` allows querying,
|
|
437
|
+
creating, and canceling workspace invitations; it does not grant member writes.
|
|
438
|
+
Accepting or rejecting one's own invitation requires the recipient's user session,
|
|
439
|
+
not invitation management permission.
|
|
436
440
|
|
|
437
441
|
Configure these independently with `apiKey.user` and `apiKey.workspace`, each
|
|
438
442
|
containing `defaultPermissions` and `allowedPermissions`. Defaults are empty;
|
|
@@ -581,8 +585,9 @@ API-key entities, services, resolvers, connections, inputs, and creation results
|
|
|
581
585
|
|
|
582
586
|
API-key enums cover the full scope catalogs, independently of the current grant
|
|
583
587
|
allowlist, so existing keys remain readable after the allowlist is tightened.
|
|
584
|
-
Workspace keys
|
|
585
|
-
as sender
|
|
588
|
+
Workspace keys may carry `member:invite` to read and cancel invitations.
|
|
589
|
+
Creating an invitation also requires a user as sender; use a personal API key
|
|
590
|
+
for invitation creation.
|
|
586
591
|
|
|
587
592
|
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
593
|
|
package/dist/auth.module.js
CHANGED
|
@@ -184,9 +184,6 @@ AuthModule = __decorate([
|
|
|
184
184
|
assertAuthPermissionList(allowed, catalog, `apiKey.${scope}.allowedPermissions`);
|
|
185
185
|
assertAuthPermissionList(defaults, catalog, `apiKey.${scope}.defaultPermissions`);
|
|
186
186
|
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
187
|
}
|
|
191
188
|
assertAuthRolesExist(userRoles, [options.user?.defaultRole ?? DEFAULT_USER_ROLE], "user.defaultRole");
|
|
192
189
|
assertAuthRolesExist(userRoles, options.user?.adminRoles ?? DEFAULT_USER_ADMIN_ROLES, "user.adminRoles");
|
package/dist/auth.module.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../src/auth.module.ts"],"names":[],"mappings":"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
|
|
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,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EACL,wBAAwB,EAExB,iBAAiB,GAElB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AACrF,OAAO,EACL,wBAAwB,EACxB,0BAA0B,EAC1B,yBAAyB,EACzB,oBAAoB,GACrB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAC3F,OAAO,EAAE,6BAA6B,EAAE,MAAM,6CAA6C,CAAC;AAC5F,OAAO,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,2BAA2B,EAAE,MAAM,2CAA2C,CAAC;AACxF,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EACL,8BAA8B,EAE9B,sBAAsB,GAEvB,MAAM,0BAA0B,CAAC;AAElC;;;;;;GAMG;AAuMI,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,uBAAuB;IA4DlC;IACA;IAEA;IACA;IA/DnB;;;;OAIG;IACH,MAAM,CAAU,OAAO,CAQrB,OAKC;QAED,OAAO,KAAK,CAAC,OAAO,CAAC,OAAuC,CAAC,CAAC;IAChE,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAU,YAAY,CAQ1B,OAOC;QAED,OAAO,KAAK,CAAC,YAAY,CACvB,OAAuE,CACxE,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACH,YAEmB,OAA0B,EAC1B,iBAAoC,EAEpC,qBAAqC,EACrC,cAA8B;QAE/C,KAAK,EAAE,CAAC;QANS,YAAO,GAAP,OAAO,CAAmB;QAC1B,sBAAiB,GAAjB,iBAAiB,CAAmB;QAEpC,0BAAqB,GAArB,qBAAqB,CAAgB;QACrC,mBAAc,GAAd,cAAc,CAAgB;QAI/C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,YAAY,CAAC;QAEvD,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAE/C,IAAI,CAAC,iBAAiB;aACnB,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC;aACjC,0BAA0B,EAAE;aAC5B,SAAS,CAAC,QAAQ,CAAC,CAAC;QAEvB,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,KAAK,KAAK,EAAE,CAAC;YAChD,IAAI,CAAC,0BAA0B,CAC7B,IAAI,CAAC,iBAAiB;iBACnB,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC;iBAC1B,YAAY,CAAC,wBAAwB,CAAC,CAC1C,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,0BAA0B,CAAC,KAA6B;QAC9D,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,aAAa,EAAE,CAAC;YAC3C,KAAK,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;QAC1D,CAAC;QAED,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,aAAa,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACxE,CAAC;CACF,CAAA;AA7FY,UAAU;IAtMtB,MAAM,EAAE;IACR,MAAM,CAAC;QACN,OAAO,EAAE,CAAC,oBAAoB,EAAE,gBAAgB,CAAC;QACjD,SAAS,EAAE;YACT;gBACE,OAAO,EAAE,gBAAgB;gBACzB,MAAM,EAAE,CAAC,oBAAoB,EAAE,UAAU,CAAC;gBAC1C,UAAU,EAAE,CAAC,OAA0B,EAAE,EAAE,CAAC,IAAI,gBAAgB,CAAC,OAAO,CAAC;aAC1E;YACD,YAAY;YACZ,YAAY;YACZ,eAAe;YACf,kBAAkB;YAClB,uBAAuB;YACvB,iBAAiB;YACjB,cAAc;YACd,kBAAkB;YAClB,GAAG,oBAAoB;YACvB,iBAAiB;YACjB,sBAAsB;YACtB,cAAc;YACd,sBAAsB;YACtB,WAAW;YACX,oBAAoB;YACpB,mBAAmB;YACnB,SAAS;YACT,qBAAqB;YACrB,cAAc;YACd;gBACE,OAAO,EAAE,eAAe;gBACxB,WAAW,EAAE,sBAAsB;aACpC;YACD;gBACE,OAAO,EAAE,UAAU;gBACnB,MAAM,EAAE;oBACN,oBAAoB;oBACpB,QAAQ;oBACR,MAAM;oBACN,WAAW;oBACX,mBAAmB;iBACpB;gBACD,UAAU,EAAE,CACV,OAA0B,EAC1B,GAAa,EACb,MAAc,EACd,WAAwB,EACxB,mBAAwC,EACxC,EAAE;oBACF,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,eAAe,EAAE,GACtD,kBAAkB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;oBACtC,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,oBAAoB,EAAE,GAChE,kBAAkB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;oBAE3C,yBAAyB,CAAC,SAAS,EAAE,eAAe,EAAE,MAAM,CAAC,CAAC;oBAC9D,yBAAyB,CACvB,cAAc,EACd,oBAAoB,EACpB,WAAW,CACZ,CAAC;oBACF,IACE,OAAO,CAAC,MAAM;wBACd,CAAC,oBAAoB,IAAI,OAAO,CAAC,MAAM;4BACrC,oBAAoB,IAAI,OAAO,CAAC,MAAM,CAAC,EACzC,CAAC;wBACD,MAAM,IAAI,KAAK,CACb,qEAAqE,CACtE,CAAC;oBACJ,CAAC;oBACD,KAAK,MAAM,KAAK,IAAI,CAAC,MAAM,EAAE,WAAW,CAAU,EAAE,CAAC;wBACnD,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,GACtC,8BAA8B,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;wBACjD,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC;wBAC3C,MAAM,OAAO,GAAG,UAAU,EAAE,kBAAkB,IAAI,OAAO,CAAC;wBAC1D,wBAAwB,CACtB,OAAO,EACP,OAAO,EACP,UAAU,KAAK,qBAAqB,CACrC,CAAC;wBACF,wBAAwB,CACtB,QAAQ,EACR,OAAO,EACP,UAAU,KAAK,qBAAqB,CACrC,CAAC;wBACF,0BAA0B,CACxB,QAAQ,EACR,OAAO,EACP,UAAU,KAAK,qBAAqB,EACpC,UAAU,KAAK,qBAAqB,CACrC,CAAC;oBACJ,CAAC;oBACD,oBAAoB,CAClB,SAAS,EACT,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,IAAI,iBAAiB,CAAC,EAChD,kBAAkB,CACnB,CAAC;oBACF,oBAAoB,CAClB,SAAS,EACT,OAAO,CAAC,IAAI,EAAE,UAAU,IAAI,wBAAwB,EACpD,iBAAiB,CAClB,CAAC;oBACF,oBAAoB,CAClB,cAAc,EACd,CAAC,OAAO,CAAC,SAAS,EAAE,WAAW,IAAI,sBAAsB,CAAC,EAC1D,uBAAuB,CACxB,CAAC;oBACF,oBAAoB,CAClB,cAAc,EACd,CAAC,OAAO,CAAC,SAAS,EAAE,WAAW,IAAI,8BAA8B,CAAC,EAClE,uBAAuB,CACxB,CAAC;oBAEF,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;oBACtC,MAAM,aAAa,GAAG,SAAS,CAAC,sBAAsB,CAAC,CAAC;oBACxD,MAAM,SAAS,GAAG,kBAAkB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;oBACxD,MAAM,UAAU,GAAG,gBAAgB,CAAC,aAAa,CAAC,CAAC;oBACnD,MAAM,kBAAkB,GAAG,wBAAwB,CACjD,aAAa,EACb,SAAS,CAAC,qBAAqB,EAC/B,UAAU,CACX,CAAC;oBACF,MAAM,sBAAsB,GAAG,4BAA4B,CACzD,aAAa,EACb,MAAM,EACN,WAAW,EACX,OAAO,CAAC,gBAAgB,CACzB,CAAC;oBACF,MAAM,uBAAuB,GAAG,6BAA6B,CAC3D,MAAM,EACN,OAAO,CAAC,iBAAiB,CAC1B,CAAC;oBACF,MAAM,qBAAqB,GAAG,2BAA2B,CACvD,aAAa,EACb,SAAS,CAAC,eAAe,CAC1B,CAAC;oBACF,MAAM,UAAU,GAAG,gBAAgB,CACjC,MAAM,EACN,OAAO,CAAC,IAAI,EACZ,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE;wBAC7B,MAAM,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,CAC9B,mBAAmB,CAAC,UAAU,CAAC,MAAM,EAAE,YAAY,CAAC,CACrD,CAAC;wBACF,sEAAsE;wBACtE,IACE,cAAc,CAAC,QAAQ,EAAE;4BACzB,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,MAAM;4BAEvC,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oBAClC,CAAC,CACF,CAAC;oBAEF,MAAM,iBAAiB,GAAsB;wBAC3C,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ;wBAChD,OAAO,EACL,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO;wBAChE,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;wBACxD,MAAM;wBACN,gBAAgB,EAAE,sBAAsB;wBACxC,iBAAiB,EAAE,uBAAuB;wBAC1C,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;wBAC3C,GAAG,CAAC,qBAAqB;4BACvB,CAAC,CAAC,EAAE,eAAe,EAAE,qBAAqB,EAAE;4BAC5C,CAAC,CAAC,EAAE,CAAC;wBACP,OAAO,EAAE;4BACP,GAAG,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC;gCAC/B,CAAC,CAAC;oCACE,YAAY,CAAC;wCACX,MAAM,EAAE,kBAAkB;qCAC3B,CAAC;iCACH;gCACH,CAAC,CAAC,EAAE,CAAC;yBACR;wBACD,QAAQ,EAAE,eAAe,CAAC;4BACxB,eAAe,EAAE,OAAO,CAAC,IAAI,EAAE,WAAW,IAAI,iBAAiB;4BAC/D,GAAG;4BACH,QAAQ,EAAE,aAAa;yBACxB,CAAC;qBACH,CAAC;oBAEF,qBAAqB,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;oBAClD,OAAO,UAAU,CAAC,iBAAiB,CAAC,CAAC;gBACvC,CAAC;aACF;SACF;QACD,OAAO,EAAE;YACP,cAAc;YACd,oBAAoB;YACpB,WAAW;YACX,iBAAiB;YACjB,sBAAsB;YACtB,SAAS;YACT,WAAW;YACX,oBAAoB;YACpB,cAAc;YACd,gBAAgB;YAChB,aAAa;YACb,iBAAiB;SAClB;KACF,CAAC;IA4DG,WAAA,MAAM,CAAC,oBAAoB,CAAC,CAAA;IAG5B,WAAA,MAAM,CAAC,qBAAqB,CAAC,CAAA;6CADM,iBAAiB,UAGpB,cAAc;GAhEtC,UAAU,CA6FtB;;AAED,SAAS,qBAAqB,CAC5B,MAAyB,EACzB,MAAyB;IAEzB,IAAI,MAAM,CAAC,QAAQ,KAAK,SAAS;QAAE,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;IACrE,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS;QAAE,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;IAClE,IAAI,MAAM,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;QACxC,MAAM,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC;IAChD,CAAC;AACH,CAAC"}
|
|
@@ -18,18 +18,18 @@ export class AuthAbilityFactory {
|
|
|
18
18
|
static createUserAbility(permissions, user, options = {}) {
|
|
19
19
|
const grants = Object.freeze([...permissions]);
|
|
20
20
|
const builder = new AbilityBuilder(UserAbility);
|
|
21
|
-
//
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
21
|
+
// Self-service operations are authorized explicitly by their Services.
|
|
22
|
+
const subjects = {
|
|
23
|
+
user: User,
|
|
24
|
+
session: Session,
|
|
25
|
+
"user-api-key": UserApiKey,
|
|
26
|
+
workspace: Workspace,
|
|
27
|
+
};
|
|
26
28
|
for (const permission of DEFAULT_USER_PERMISSIONS) {
|
|
27
29
|
if (!grants.includes(permission))
|
|
28
30
|
continue;
|
|
29
31
|
const [resource, action] = permission.split(":");
|
|
30
32
|
builder.can(action, subjects[resource]);
|
|
31
|
-
if (permission === "user:get" || permission === "user:list")
|
|
32
|
-
builder.can("read", User);
|
|
33
33
|
}
|
|
34
34
|
const configure = options.buildAbility;
|
|
35
35
|
if (configure)
|
|
@@ -41,18 +41,19 @@ export class AuthAbilityFactory {
|
|
|
41
41
|
static createWorkspaceAbility(permissions, workspace, options = {}) {
|
|
42
42
|
const grants = Object.freeze([...permissions]);
|
|
43
43
|
const builder = new AbilityBuilder(WorkspaceAbility);
|
|
44
|
-
builder.can("read", Workspace);
|
|
45
|
-
builder.can("read", Invitation);
|
|
46
|
-
builder.can("read", Member);
|
|
47
44
|
const subjects = {
|
|
48
45
|
workspace: Workspace,
|
|
49
46
|
member: Member,
|
|
50
|
-
|
|
51
|
-
"api-key": WorkspaceApiKey,
|
|
47
|
+
"workspace-api-key": WorkspaceApiKey,
|
|
52
48
|
};
|
|
53
49
|
for (const permission of DEFAULT_WORKSPACE_PERMISSIONS) {
|
|
54
50
|
if (!grants.includes(permission))
|
|
55
51
|
continue;
|
|
52
|
+
// Invitation management is one member permission; keep entity checks for CASL conditions.
|
|
53
|
+
if (permission === "member:invite") {
|
|
54
|
+
builder.can(["read", "write"], Invitation);
|
|
55
|
+
continue;
|
|
56
|
+
}
|
|
56
57
|
const [resource, action] = permission.split(":");
|
|
57
58
|
builder.can(action, subjects[resource]);
|
|
58
59
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-ability.factory.js","sourceRoot":"","sources":["../../src/infrastructure/auth-ability.factory.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,GAKf,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAG1E,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AAE1E,qFAAqF;AACrF,MAAM,OAAO,kBAAkB;IAC7B,+FAA+F;IAC/F,MAAM,CAAC,iBAAiB,CACtB,WAA8B,EAC9B,IAAU,EACV,UAAiC,EAAE;QAEnC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAG,IAAI,cAAc,CAAC,WAAW,CAAC,CAAC;QAChD,
|
|
1
|
+
{"version":3,"file":"auth-ability.factory.js","sourceRoot":"","sources":["../../src/infrastructure/auth-ability.factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,6 @@ import type { AuthModuleApiKeyScopeOptions } from "./auth-module-api-key-scope-o
|
|
|
3
3
|
export interface AuthModuleApiKeyOptions<UserPermission extends string = string, WorkspacePermission extends string = string> {
|
|
4
4
|
/** User keys may carry both user and workspace permissions, limited again by their owner's grants at use time. */
|
|
5
5
|
user?: AuthModuleApiKeyScopeOptions<UserPermission | WorkspacePermission>;
|
|
6
|
-
/** Workspace keys only carry workspace permissions; invitation
|
|
6
|
+
/** Workspace keys only carry workspace permissions; creating an invitation additionally requires a user identity. */
|
|
7
7
|
workspace?: AuthModuleApiKeyScopeOptions<WorkspacePermission>;
|
|
8
8
|
}
|
|
@@ -26,6 +26,8 @@ export declare class AccessControlService {
|
|
|
26
26
|
assertWorkspaceCan(action: string, subject: Subject): void;
|
|
27
27
|
/** Throws unless the supplied user is the authenticated user. */
|
|
28
28
|
assertCurrentUser(user: User): void;
|
|
29
|
+
/** Authorizes an explicit self-service path without granting a general resource ability. */
|
|
30
|
+
assertUserSession(user: User): void;
|
|
29
31
|
/** Throws unless the supplied session is the authenticated session. */
|
|
30
32
|
assertCurrentSession(session: Session): void;
|
|
31
33
|
/** Throws unless the supplied workspace is selected for the current request. */
|
|
@@ -81,6 +81,13 @@ let AccessControlService = class AccessControlService {
|
|
|
81
81
|
throw new ForbiddenException("The operation belongs to another user");
|
|
82
82
|
}
|
|
83
83
|
}
|
|
84
|
+
/** Authorizes an explicit self-service path without granting a general resource ability. */
|
|
85
|
+
assertUserSession(user) {
|
|
86
|
+
this.assertCurrentUser(user);
|
|
87
|
+
if (getCurrentApiKey()) {
|
|
88
|
+
throw new ForbiddenException("This self-service operation requires a user session");
|
|
89
|
+
}
|
|
90
|
+
}
|
|
84
91
|
/** Throws unless the supplied session is the authenticated session. */
|
|
85
92
|
assertCurrentSession(session) {
|
|
86
93
|
const currentSession = RequestContext.isActive()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access-control.service.js","sourceRoot":"","sources":["../../src/services/access-control.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"access-control.service.js","sourceRoot":"","sources":["../../src/services/access-control.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,7 @@ import { Member } from "../entities/member.entity.js";
|
|
|
21
21
|
import { User } from "../entities/user.entity.js";
|
|
22
22
|
import { Workspace } from "../entities/workspace.entity.js";
|
|
23
23
|
import { normalizeAuthRoles, resolveAuthPermissions, } from "../utils/auth-role.util.js";
|
|
24
|
+
import { getCurrentApiKey } from "../utils/get-current-api-key.util.js";
|
|
24
25
|
import { resolveAuthCatalog } from "../utils/resolve-auth-catalog.util.js";
|
|
25
26
|
import { DEFAULT_WORKSPACE_ROLE } from "../workspace.constants.js";
|
|
26
27
|
import { AccessControlService } from "./access-control.service.js";
|
|
@@ -41,7 +42,7 @@ let InvitationService = class InvitationService {
|
|
|
41
42
|
async createInvitation(workspace, inviter, input, request) {
|
|
42
43
|
this.accessControlService.assertCurrentWorkspace(workspace);
|
|
43
44
|
this.accessControlService.assertCurrentUser(inviter);
|
|
44
|
-
this.accessControlService.assertWorkspaceCan("
|
|
45
|
+
this.accessControlService.assertWorkspaceCan("write", Invitation);
|
|
45
46
|
const email = input.email.trim().toLowerCase();
|
|
46
47
|
const roles = this.normalizeGrantedRoles(input.roles ?? [this.defaultRole]);
|
|
47
48
|
const expiresIn = input.expiresIn ?? 60 * 60 * 48;
|
|
@@ -96,7 +97,7 @@ let InvitationService = class InvitationService {
|
|
|
96
97
|
status: "pending",
|
|
97
98
|
workspace,
|
|
98
99
|
});
|
|
99
|
-
this.accessControlService.assertWorkspaceCan("
|
|
100
|
+
this.accessControlService.assertWorkspaceCan("write", created);
|
|
100
101
|
await em.persist(created).flush();
|
|
101
102
|
return { created, inviterMember };
|
|
102
103
|
}, { clear: true });
|
|
@@ -139,13 +140,16 @@ let InvitationService = class InvitationService {
|
|
|
139
140
|
async getUserIdForInvitation(workspace, inviter, email) {
|
|
140
141
|
this.accessControlService.assertCurrentWorkspace(workspace);
|
|
141
142
|
this.accessControlService.assertCurrentUser(inviter);
|
|
142
|
-
this.accessControlService.assertWorkspaceCan("
|
|
143
|
+
this.accessControlService.assertWorkspaceCan("write", Invitation);
|
|
143
144
|
const user = await this.em.findOne(User, { email: email.trim().toLowerCase() }, { fields: ["id"], filters: false });
|
|
144
145
|
return user ? String(user.id) : null;
|
|
145
146
|
}
|
|
146
147
|
/** Finds an invitation after recipient or workspace authorization, preserving RLS. */
|
|
147
148
|
async getInvitation(id) {
|
|
148
|
-
|
|
149
|
+
const recipientSession = RequestContext.isActive() &&
|
|
150
|
+
RequestContext.get(User) &&
|
|
151
|
+
!getCurrentApiKey();
|
|
152
|
+
if (!recipientSession &&
|
|
149
153
|
!this.accessControlService.workspaceCan("read", Invitation)) {
|
|
150
154
|
throw new ForbiddenException("Invitation read access denied");
|
|
151
155
|
}
|
|
@@ -158,7 +162,7 @@ let InvitationService = class InvitationService {
|
|
|
158
162
|
async getInvitationInviter(invitation) {
|
|
159
163
|
const current = await this.getInvitationForRelation(invitation);
|
|
160
164
|
const actor = RequestContext.isActive() ? RequestContext.get(User) : null;
|
|
161
|
-
const self = actor?.id === current.inviter.id;
|
|
165
|
+
const self = !getCurrentApiKey() && actor?.id === current.inviter.id;
|
|
162
166
|
if (!self)
|
|
163
167
|
this.accessControlService.assertUserCan("read", User);
|
|
164
168
|
const user = await this.em.findOne(User, { id: current.inviter.id }, { refresh: true });
|
|
@@ -189,7 +193,7 @@ let InvitationService = class InvitationService {
|
|
|
189
193
|
assertInvitationReadAccess(invitation) {
|
|
190
194
|
const user = RequestContext.isActive() ? RequestContext.get(User) : null;
|
|
191
195
|
if (invitation.email.toLowerCase() === user?.email?.toLowerCase() &&
|
|
192
|
-
|
|
196
|
+
!getCurrentApiKey()) {
|
|
193
197
|
return;
|
|
194
198
|
}
|
|
195
199
|
this.accessControlService.assertCurrentWorkspace(this.unwrapInvitationWorkspace(invitation));
|
|
@@ -197,14 +201,11 @@ let InvitationService = class InvitationService {
|
|
|
197
201
|
}
|
|
198
202
|
/** Finds an invitation when it is addressed to the supplied user. */
|
|
199
203
|
async getInvitationByUser(id, user) {
|
|
200
|
-
this.accessControlService.
|
|
201
|
-
this.accessControlService.assertUserCan("read", Invitation);
|
|
204
|
+
this.accessControlService.assertUserSession(user);
|
|
202
205
|
const invitation = await this.em.findOne(Invitation, {
|
|
203
206
|
id,
|
|
204
207
|
email: user.email.toLowerCase(),
|
|
205
208
|
});
|
|
206
|
-
if (invitation)
|
|
207
|
-
this.accessControlService.assertUserCan("read", invitation);
|
|
208
209
|
return invitation;
|
|
209
210
|
}
|
|
210
211
|
/** Finds an invitation owned by the supplied workspace. */
|
|
@@ -233,8 +234,7 @@ let InvitationService = class InvitationService {
|
|
|
233
234
|
}
|
|
234
235
|
/** Paginates unexpired pending invitations addressed to the current user. */
|
|
235
236
|
async getInvitationConnectionByUser(user, args) {
|
|
236
|
-
this.accessControlService.
|
|
237
|
-
this.accessControlService.assertUserCan("read", Invitation);
|
|
237
|
+
this.accessControlService.assertUserSession(user);
|
|
238
238
|
const now = new Date();
|
|
239
239
|
const connection = await new ConnectionManager(this.em).find(InvitationConnection, args, {
|
|
240
240
|
where: {
|
|
@@ -243,15 +243,11 @@ let InvitationService = class InvitationService {
|
|
|
243
243
|
status: "pending",
|
|
244
244
|
},
|
|
245
245
|
});
|
|
246
|
-
for (const { node } of connection.edges) {
|
|
247
|
-
this.accessControlService.assertUserCan("read", node);
|
|
248
|
-
}
|
|
249
246
|
return connection;
|
|
250
247
|
}
|
|
251
248
|
/** Accepts a pending invitation and creates an active membership. */
|
|
252
249
|
async acceptInvitation(user, invitationId) {
|
|
253
|
-
this.accessControlService.
|
|
254
|
-
this.accessControlService.assertUserCan("update", Invitation);
|
|
250
|
+
this.accessControlService.assertUserSession(user);
|
|
255
251
|
return await this.em.transactional(async (em) => {
|
|
256
252
|
const invitation = await em.findOne(Invitation, { id: invitationId }, {
|
|
257
253
|
filters: false,
|
|
@@ -272,7 +268,6 @@ let InvitationService = class InvitationService {
|
|
|
272
268
|
lockMode: LockMode.PESSIMISTIC_WRITE,
|
|
273
269
|
populate: [],
|
|
274
270
|
});
|
|
275
|
-
this.accessControlService.assertUserCan("update", invitation);
|
|
276
271
|
if (invitation.status !== "pending") {
|
|
277
272
|
throw new BadRequestException("Workspace invitation is not pending");
|
|
278
273
|
}
|
|
@@ -301,11 +296,11 @@ let InvitationService = class InvitationService {
|
|
|
301
296
|
}
|
|
302
297
|
/** Cancels a pending invitation. */
|
|
303
298
|
async cancelInvitation(invitation) {
|
|
304
|
-
this.accessControlService.assertWorkspaceCan("
|
|
299
|
+
this.accessControlService.assertWorkspaceCan("write", Invitation);
|
|
305
300
|
invitation = await this.resolveInvitationForAction(invitation);
|
|
306
301
|
const workspace = this.unwrapInvitationWorkspace(invitation);
|
|
307
302
|
this.accessControlService.assertCurrentWorkspace(workspace);
|
|
308
|
-
this.accessControlService.assertWorkspaceCan("
|
|
303
|
+
this.accessControlService.assertWorkspaceCan("write", invitation);
|
|
309
304
|
if (invitation.status !== "pending") {
|
|
310
305
|
throw new BadRequestException("Workspace invitation is not pending");
|
|
311
306
|
}
|
|
@@ -322,10 +317,8 @@ let InvitationService = class InvitationService {
|
|
|
322
317
|
}
|
|
323
318
|
/** Rejects an invitation after verifying the invited user's email. */
|
|
324
319
|
async rejectInvitation(user, invitation) {
|
|
325
|
-
this.accessControlService.
|
|
326
|
-
this.accessControlService.assertUserCan("update", Invitation);
|
|
320
|
+
this.accessControlService.assertUserSession(user);
|
|
327
321
|
invitation = await this.resolveInvitationForAction(invitation);
|
|
328
|
-
this.accessControlService.assertUserCan("update", invitation);
|
|
329
322
|
if (invitation.status !== "pending") {
|
|
330
323
|
throw new BadRequestException("Workspace invitation is not pending");
|
|
331
324
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invitation.service.js","sourceRoot":"","sources":["../../src/services/invitation.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"invitation.service.js","sourceRoot":"","sources":["../../src/services/invitation.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,7 +51,7 @@ export declare class MemberService {
|
|
|
51
51
|
setMemberPermissions(member: Member | string, permissions: readonly string[]): Promise<Member>;
|
|
52
52
|
private assertAuthorizationCanCommit;
|
|
53
53
|
private isCurrentMember;
|
|
54
|
-
/** Removes a member after checking
|
|
54
|
+
/** Removes a member after checking write ability; self-removal uses leaveWorkspace. */
|
|
55
55
|
removeMember(member: Member | string): Promise<Member>;
|
|
56
56
|
/** Lets the current member leave its workspace regardless of role. */
|
|
57
57
|
leaveWorkspace(member: Member): Promise<Member>;
|