@nest-boot/auth 8.0.5-beta.3 → 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.
Files changed (150) hide show
  1. package/README.md +13 -7
  2. package/dist/abilities/auth.ability.d.ts +6 -0
  3. package/dist/abilities/{user.ability.js → auth.ability.js} +4 -4
  4. package/dist/abilities/auth.ability.js.map +1 -0
  5. package/dist/abilities/index.d.ts +1 -2
  6. package/dist/abilities/index.js +1 -2
  7. package/dist/abilities/index.js.map +1 -1
  8. package/dist/auth-module-options.interface.d.ts +3 -0
  9. package/dist/auth.guard.d.ts +3 -9
  10. package/dist/auth.guard.js +13 -38
  11. package/dist/auth.guard.js.map +1 -1
  12. package/dist/auth.module.js +0 -3
  13. package/dist/auth.module.js.map +1 -1
  14. package/dist/decorators/can.decorator.d.ts +3 -11
  15. package/dist/decorators/can.decorator.js +8 -14
  16. package/dist/decorators/can.decorator.js.map +1 -1
  17. package/dist/decorators/index.d.ts +0 -2
  18. package/dist/decorators/index.js +0 -2
  19. package/dist/decorators/index.js.map +1 -1
  20. package/dist/entities/account.entity.d.ts +1 -1
  21. package/dist/entities/account.entity.js +1 -1
  22. package/dist/entities/invitation.entity.d.ts +2 -0
  23. package/dist/entities/invitation.entity.js +9 -0
  24. package/dist/entities/invitation.entity.js.map +1 -1
  25. package/dist/entities/member.entity.d.ts +2 -0
  26. package/dist/entities/member.entity.js +9 -0
  27. package/dist/entities/member.entity.js.map +1 -1
  28. package/dist/entities/workspace-api-key.entity.d.ts +2 -0
  29. package/dist/entities/workspace-api-key.entity.js +9 -0
  30. package/dist/entities/workspace-api-key.entity.js.map +1 -1
  31. package/dist/index.d.ts +4 -8
  32. package/dist/index.js +4 -8
  33. package/dist/index.js.map +1 -1
  34. package/dist/infrastructure/api-key-lifecycle.d.ts +14 -0
  35. package/dist/infrastructure/api-key-lifecycle.js +19 -0
  36. package/dist/infrastructure/api-key-lifecycle.js.map +1 -1
  37. package/dist/infrastructure/auth-ability.factory.d.ts +4 -9
  38. package/dist/infrastructure/auth-ability.factory.js +23 -21
  39. package/dist/infrastructure/auth-ability.factory.js.map +1 -1
  40. package/dist/infrastructure/auth-service.providers.js +9 -11
  41. package/dist/infrastructure/auth-service.providers.js.map +1 -1
  42. package/dist/infrastructure/request-identity.d.ts +16 -4
  43. package/dist/infrastructure/request-identity.js +61 -40
  44. package/dist/infrastructure/request-identity.js.map +1 -1
  45. package/dist/interfaces/ability-context.interface.d.ts +16 -0
  46. package/dist/interfaces/ability-context.interface.js +2 -0
  47. package/dist/interfaces/ability-context.interface.js.map +1 -0
  48. package/dist/interfaces/ability-rules.interface.d.ts +8 -2
  49. package/dist/interfaces/auth-module-user-options.interface.d.ts +0 -3
  50. package/dist/interfaces/auth-module-workspace-options.interface.d.ts +0 -3
  51. package/dist/interfaces/{user-can-metadata.interface.d.ts → can-metadata.interface.d.ts} +2 -2
  52. package/dist/interfaces/can-metadata.interface.js +2 -0
  53. package/dist/interfaces/can-metadata.interface.js.map +1 -0
  54. package/dist/permission.constants.d.ts +2 -4
  55. package/dist/permission.constants.js +2 -4
  56. package/dist/permission.constants.js.map +1 -1
  57. package/dist/resolvers/auth.resolver.d.ts +2 -4
  58. package/dist/resolvers/auth.resolver.js +5 -16
  59. package/dist/resolvers/auth.resolver.js.map +1 -1
  60. package/dist/services/account.service.d.ts +1 -3
  61. package/dist/services/account.service.js +4 -7
  62. package/dist/services/account.service.js.map +1 -1
  63. package/dist/services/invitation.service.d.ts +1 -3
  64. package/dist/services/invitation.service.js +32 -32
  65. package/dist/services/invitation.service.js.map +1 -1
  66. package/dist/services/member.service.d.ts +1 -3
  67. package/dist/services/member.service.js +50 -51
  68. package/dist/services/member.service.js.map +1 -1
  69. package/dist/services/session.service.d.ts +1 -4
  70. package/dist/services/session.service.js +11 -15
  71. package/dist/services/session.service.js.map +1 -1
  72. package/dist/services/user-api-key.service.d.ts +3 -7
  73. package/dist/services/user-api-key.service.js +52 -73
  74. package/dist/services/user-api-key.service.js.map +1 -1
  75. package/dist/services/user-deletion.service.js.map +1 -1
  76. package/dist/services/user.service.d.ts +1 -3
  77. package/dist/services/user.service.js +38 -42
  78. package/dist/services/user.service.js.map +1 -1
  79. package/dist/services/workspace-api-key.service.d.ts +3 -7
  80. package/dist/services/workspace-api-key.service.js +50 -71
  81. package/dist/services/workspace-api-key.service.js.map +1 -1
  82. package/dist/services/workspace.service.d.ts +1 -3
  83. package/dist/services/workspace.service.js +22 -24
  84. package/dist/services/workspace.service.js.map +1 -1
  85. package/dist/tsconfig.tsbuildinfo +1 -1
  86. package/dist/types/build-ability-callback.type.d.ts +4 -0
  87. package/dist/types/build-ability-callback.type.js +2 -0
  88. package/dist/types/build-ability-callback.type.js.map +1 -0
  89. package/dist/utils/api-key-permissions.util.d.ts +2 -0
  90. package/dist/utils/api-key-permissions.util.js +9 -0
  91. package/dist/utils/api-key-permissions.util.js.map +1 -1
  92. package/dist/utils/assert-can.util.d.ts +3 -0
  93. package/dist/utils/assert-can.util.js +8 -0
  94. package/dist/utils/assert-can.util.js.map +1 -0
  95. package/dist/utils/build-request-ability.util.d.ts +3 -6
  96. package/dist/utils/build-request-ability.util.js +25 -15
  97. package/dist/utils/build-request-ability.util.js.map +1 -1
  98. package/dist/utils/can.util.d.ts +2 -3
  99. package/dist/utils/can.util.js +9 -7
  100. package/dist/utils/can.util.js.map +1 -1
  101. package/dist/utils/extend-ability.util.d.ts +5 -1
  102. package/dist/utils/extend-ability.util.js +13 -6
  103. package/dist/utils/extend-ability.util.js.map +1 -1
  104. package/dist/utils/get-ability.util.d.ts +5 -0
  105. package/dist/utils/get-ability.util.js +20 -0
  106. package/dist/utils/get-ability.util.js.map +1 -0
  107. package/dist/utils/permission-grants.util.d.ts +9 -0
  108. package/dist/utils/permission-grants.util.js +25 -0
  109. package/dist/utils/permission-grants.util.js.map +1 -0
  110. package/package.json +9 -9
  111. package/dist/abilities/user.ability.d.ts +0 -8
  112. package/dist/abilities/user.ability.js.map +0 -1
  113. package/dist/abilities/workspace.ability.d.ts +0 -8
  114. package/dist/abilities/workspace.ability.js +0 -13
  115. package/dist/abilities/workspace.ability.js.map +0 -1
  116. package/dist/decorators/user-can.decorator.d.ts +0 -13
  117. package/dist/decorators/user-can.decorator.js +0 -21
  118. package/dist/decorators/user-can.decorator.js.map +0 -1
  119. package/dist/decorators/workspace-can.decorator.d.ts +0 -13
  120. package/dist/decorators/workspace-can.decorator.js +0 -21
  121. package/dist/decorators/workspace-can.decorator.js.map +0 -1
  122. package/dist/interfaces/can-options.interface.d.ts +0 -5
  123. package/dist/interfaces/can-options.interface.js +0 -2
  124. package/dist/interfaces/can-options.interface.js.map +0 -1
  125. package/dist/interfaces/user-can-metadata.interface.js +0 -2
  126. package/dist/interfaces/user-can-metadata.interface.js.map +0 -1
  127. package/dist/interfaces/workspace-can-metadata.interface.d.ts +0 -9
  128. package/dist/interfaces/workspace-can-metadata.interface.js +0 -2
  129. package/dist/interfaces/workspace-can-metadata.interface.js.map +0 -1
  130. package/dist/services/access-control.service.d.ts +0 -54
  131. package/dist/services/access-control.service.js +0 -208
  132. package/dist/services/access-control.service.js.map +0 -1
  133. package/dist/types/build-user-ability-callback.type.d.ts +0 -10
  134. package/dist/types/build-user-ability-callback.type.js +0 -2
  135. package/dist/types/build-user-ability-callback.type.js.map +0 -1
  136. package/dist/types/build-workspace-ability-callback.type.d.ts +0 -10
  137. package/dist/types/build-workspace-ability-callback.type.js +0 -2
  138. package/dist/types/build-workspace-ability-callback.type.js.map +0 -1
  139. package/dist/utils/get-user-ability.util.d.ts +0 -3
  140. package/dist/utils/get-user-ability.util.js +0 -14
  141. package/dist/utils/get-user-ability.util.js.map +0 -1
  142. package/dist/utils/get-workspace-ability.util.d.ts +0 -3
  143. package/dist/utils/get-workspace-ability.util.js +0 -14
  144. package/dist/utils/get-workspace-ability.util.js.map +0 -1
  145. package/dist/utils/user-can.util.d.ts +0 -3
  146. package/dist/utils/user-can.util.js +0 -9
  147. package/dist/utils/user-can.util.js.map +0 -1
  148. package/dist/utils/workspace-can.util.d.ts +0 -3
  149. package/dist/utils/workspace-can.util.js +0 -10
  150. package/dist/utils/workspace-can.util.js.map +0 -1
package/dist/index.d.ts CHANGED
@@ -38,6 +38,7 @@ export * from "./inputs/update-user-api-key.input.js";
38
38
  export * from "./inputs/update-workspace.input.js";
39
39
  export * from "./inputs/update-workspace-api-key.input.js";
40
40
  export * from "./inputs/user-id.input.js";
41
+ export * from "./interfaces/ability-context.interface.js";
41
42
  export * from "./interfaces/ability-rules.interface.js";
42
43
  export * from "./interfaces/accept-invitation-result.interface.js";
43
44
  export * from "./interfaces/add-member-options.interface.js";
@@ -86,7 +87,6 @@ export * from "./interfaces/auth-social-provider-user-info.interface.js";
86
87
  export * from "./interfaces/auth-user.interface.js";
87
88
  export * from "./interfaces/authenticated-session.interface.js";
88
89
  export * from "./interfaces/ban-user-options.interface.js";
89
- export * from "./interfaces/can-options.interface.js";
90
90
  export * from "./interfaces/change-auth-email-options.interface.js";
91
91
  export * from "./interfaces/change-auth-password-options.interface.js";
92
92
  export * from "./interfaces/change-auth-password-result.interface.js";
@@ -172,7 +172,6 @@ export * from "./resolvers/user.resolver.js";
172
172
  export * from "./resolvers/user-api-key.resolver.js";
173
173
  export * from "./resolvers/workspace.resolver.js";
174
174
  export * from "./resolvers/workspace-api-key.resolver.js";
175
- export * from "./services/access-control.service.js";
176
175
  export * from "./services/account.service.js";
177
176
  export * from "./services/auth.service.js";
178
177
  export * from "./services/invitation.service.js";
@@ -194,19 +193,16 @@ export * from "./types/auth-oauth-token-endpoint-auth.type.js";
194
193
  export * from "./types/auth-send-invitation-email.type.js";
195
194
  export * from "./types/auth-send-reset-password.type.js";
196
195
  export * from "./types/auth-send-verification-email.type.js";
197
- export * from "./types/build-user-ability-callback.type.js";
198
- export * from "./types/build-workspace-ability-callback.type.js";
196
+ export * from "./types/build-ability-callback.type.js";
199
197
  export * from "./types/can-subject.type.js";
200
198
  export * from "./types/can-subject-factory.type.js";
201
199
  export * from "./types/permission-name.type.js";
202
200
  export * from "./types/role-name.type.js";
203
201
  export * from "./types/route-argument-metadata.type.js";
204
202
  export * from "./user.constants.js";
203
+ export { assertCan } from "./utils/assert-can.util.js";
205
204
  export * from "./utils/can.util.js";
206
205
  export * from "./utils/extract-api-key.util.js";
207
- export * from "./utils/get-user-ability.util.js";
208
- export * from "./utils/get-workspace-ability.util.js";
206
+ export { getAbility } from "./utils/get-ability.util.js";
209
207
  export * from "./utils/serialize-ability-rules.util.js";
210
- export * from "./utils/user-can.util.js";
211
- export * from "./utils/workspace-can.util.js";
212
208
  export * from "./workspace.constants.js";
package/dist/index.js CHANGED
@@ -38,6 +38,7 @@ export * from "./inputs/update-user-api-key.input.js";
38
38
  export * from "./inputs/update-workspace.input.js";
39
39
  export * from "./inputs/update-workspace-api-key.input.js";
40
40
  export * from "./inputs/user-id.input.js";
41
+ export * from "./interfaces/ability-context.interface.js";
41
42
  export * from "./interfaces/ability-rules.interface.js";
42
43
  export * from "./interfaces/accept-invitation-result.interface.js";
43
44
  export * from "./interfaces/add-member-options.interface.js";
@@ -86,7 +87,6 @@ export * from "./interfaces/auth-social-provider-user-info.interface.js";
86
87
  export * from "./interfaces/auth-user.interface.js";
87
88
  export * from "./interfaces/authenticated-session.interface.js";
88
89
  export * from "./interfaces/ban-user-options.interface.js";
89
- export * from "./interfaces/can-options.interface.js";
90
90
  export * from "./interfaces/change-auth-email-options.interface.js";
91
91
  export * from "./interfaces/change-auth-password-options.interface.js";
92
92
  export * from "./interfaces/change-auth-password-result.interface.js";
@@ -172,7 +172,6 @@ export * from "./resolvers/user.resolver.js";
172
172
  export * from "./resolvers/user-api-key.resolver.js";
173
173
  export * from "./resolvers/workspace.resolver.js";
174
174
  export * from "./resolvers/workspace-api-key.resolver.js";
175
- export * from "./services/access-control.service.js";
176
175
  export * from "./services/account.service.js";
177
176
  export * from "./services/auth.service.js";
178
177
  export * from "./services/invitation.service.js";
@@ -193,20 +192,17 @@ export * from "./types/auth-oauth-token-endpoint-auth.type.js";
193
192
  export * from "./types/auth-send-invitation-email.type.js";
194
193
  export * from "./types/auth-send-reset-password.type.js";
195
194
  export * from "./types/auth-send-verification-email.type.js";
196
- export * from "./types/build-user-ability-callback.type.js";
197
- export * from "./types/build-workspace-ability-callback.type.js";
195
+ export * from "./types/build-ability-callback.type.js";
198
196
  export * from "./types/can-subject.type.js";
199
197
  export * from "./types/can-subject-factory.type.js";
200
198
  export * from "./types/permission-name.type.js";
201
199
  export * from "./types/role-name.type.js";
202
200
  export * from "./types/route-argument-metadata.type.js";
203
201
  export * from "./user.constants.js";
202
+ export { assertCan } from "./utils/assert-can.util.js";
204
203
  export * from "./utils/can.util.js";
205
204
  export * from "./utils/extract-api-key.util.js";
206
- export * from "./utils/get-user-ability.util.js";
207
- export * from "./utils/get-workspace-ability.util.js";
205
+ export { getAbility } from "./utils/get-ability.util.js";
208
206
  export * from "./utils/serialize-ability-rules.util.js";
209
- export * from "./utils/user-can.util.js";
210
- export * from "./utils/workspace-can.util.js";
211
207
  export * from "./workspace.constants.js";
212
208
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,23 @@
1
1
  import type { EntityManager } from "@mikro-orm/core";
2
2
  import type { AuthModuleOptions } from "../auth-module-options.interface.js";
3
+ import type { CreateApiKeyOptions } from "../interfaces/create-api-key-options.interface.js";
3
4
  import type { UpdateApiKeyOptions } from "../interfaces/update-api-key-options.interface.js";
4
5
  import type { ApiKey } from "../types/api-key.type.js";
5
6
  /** Persists already-authorized key changes and publishes their committed identity effects. @internal */
6
7
  export declare class ApiKeyLifecycle {
8
+ /** Prepares shared credential fields without choosing an owner or authorizing persistence. */
9
+ static prepareCreation(options: CreateApiKeyOptions, permissions: string[]): {
10
+ apiKey: string;
11
+ data: {
12
+ enabled: boolean;
13
+ expiresAt: Date | null;
14
+ key: string;
15
+ name: string;
16
+ permissions: string[];
17
+ prefix: string;
18
+ start: string;
19
+ };
20
+ };
7
21
  /** Validates expiration for both key creation and updates. */
8
22
  static assertExpiration(expiresAt: Date | null | undefined): void;
9
23
  /** Restores managed fields on persistence failure; never publishes an uncommitted credential. */
@@ -1,7 +1,26 @@
1
1
  import { BadRequestException } from "@nestjs/common";
2
+ import { generateApiKey, hashApiKey, } from "../utils/api-key-credential.util.js";
2
3
  import { RequestIdentity } from "./request-identity.js";
3
4
  /** Persists already-authorized key changes and publishes their committed identity effects. @internal */
4
5
  export class ApiKeyLifecycle {
6
+ /** Prepares shared credential fields without choosing an owner or authorizing persistence. */
7
+ static prepareCreation(options, permissions) {
8
+ this.assertExpiration(options.expiresAt);
9
+ const prefix = options.prefix ?? process.env.API_KEY_PREFIX ?? "sk";
10
+ const apiKey = generateApiKey(prefix);
11
+ return {
12
+ apiKey,
13
+ data: {
14
+ enabled: true,
15
+ expiresAt: options.expiresAt ?? null,
16
+ key: hashApiKey(apiKey),
17
+ name: options.name,
18
+ permissions,
19
+ prefix,
20
+ start: apiKey.slice(0, 8),
21
+ },
22
+ };
23
+ }
5
24
  /** Validates expiration for both key creation and updates. */
6
25
  static assertExpiration(expiresAt) {
7
26
  if (expiresAt && expiresAt <= new Date()) {
@@ -1 +1 @@
1
- {"version":3,"file":"api-key-lifecycle.js","sourceRoot":"","sources":["../../src/infrastructure/api-key-lifecycle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAKrD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,wGAAwG;AACxG,MAAM,OAAO,eAAe;IAC1B,8DAA8D;IAC9D,MAAM,CAAC,gBAAgB,CAAC,SAAkC;QACxD,IAAI,SAAS,IAAI,SAAS,IAAI,IAAI,IAAI,EAAE,EAAE,CAAC;YACzC,MAAM,IAAI,mBAAmB,CAAC,0CAA0C,CAAC,CAAC;QAC5E,CAAC;IACH,CAAC;IAED,iGAAiG;IACjG,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,EAAiB,EACjB,OAA0B,EAC1B,MAAW,EACX,KAA0B,EAC1B,WAAiC;QAEjC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACvC,eAAe,CAAC,qBAAqB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAClD,MAAM,QAAQ,GAAG;YACf,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,UAAU,EAAE,MAAM,CAAC,UAAU;SAC9B,CAAC;QACF,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS;YAAE,MAAM,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACvD,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS;YAAE,MAAM,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAChE,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS;YAAE,MAAM,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;QACtE,IAAI,WAAW,KAAK,SAAS;YAAE,MAAM,CAAC,WAAW,GAAG,WAAW,CAAC;QAChE,6EAA6E;QAC7E,IAAI,KAAK,CAAC,OAAO,KAAK,KAAK,IAAI,eAAe,CAAC,eAAe,CAAC,MAAM,CAAC;YACpE,MAAM,CAAC,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC;QACjC,IAAI,CAAC;YACH,MAAM,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC;QACnC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAChC,MAAM,KAAK,CAAC;QACd,CAAC;QACD,eAAe,CAAC,YAAY,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAClD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,iEAAiE;IACjE,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,EAAiB,EACjB,OAA0B,EAC1B,MAAW;QAEX,eAAe,CAAC,qBAAqB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAClD,MAAM,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC;QAChC,eAAe,CAAC,YAAY,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QACxD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}
1
+ {"version":3,"file":"api-key-lifecycle.js","sourceRoot":"","sources":["../../src/infrastructure/api-key-lifecycle.ts"],"names":[],"mappings":"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"}
@@ -1,15 +1,10 @@
1
- import { UserAbility } from "../abilities/user.ability.js";
2
- import { WorkspaceAbility } from "../abilities/workspace.ability.js";
3
- import { User } from "../entities/user.entity.js";
4
- import { Workspace } from "../entities/workspace.entity.js";
5
- import type { AuthModuleUserOptions } from "../interfaces/auth-module-user-options.interface.js";
6
- import type { AuthModuleWorkspaceOptions } from "../interfaces/auth-module-workspace-options.interface.js";
1
+ import { AuthAbility } from "../abilities/auth.ability.js";
2
+ import type { AuthModuleOptions } from "../auth-module-options.interface.js";
3
+ import type { AbilityContext } from "../interfaces/ability-context.interface.js";
7
4
  /** Owns built-in permission mappings and validates business extensions. @internal */
8
5
  export declare class AuthAbilityFactory {
9
6
  /** Builds auth rules and restricted extensions from already credential-limited permissions. */
10
- static createUserAbility(permissions: readonly string[], user: User, options?: AuthModuleUserOptions): UserAbility;
11
- /** Builds auth rules and restricted extensions from already credential-limited permissions. */
12
- static createWorkspaceAbility(permissions: readonly string[], workspace: Workspace, options?: AuthModuleWorkspaceOptions): WorkspaceAbility;
7
+ static createAbility(context: AbilityContext, options?: AuthModuleOptions): AuthAbility;
13
8
  /** Keeps class checks, tagged objects, and serialized frontend names equivalent. */
14
9
  private static addSubjectAliases;
15
10
  }
@@ -1,6 +1,5 @@
1
1
  import { AbilityBuilder, } from "@casl/ability";
2
- import { UserAbility } from "../abilities/user.ability.js";
3
- import { WorkspaceAbility } from "../abilities/workspace.ability.js";
2
+ import { AuthAbility } from "../abilities/auth.ability.js";
4
3
  import { Invitation } from "../entities/invitation.entity.js";
5
4
  import { Member } from "../entities/member.entity.js";
6
5
  import { Session } from "../entities/session.entity.js";
@@ -15,9 +14,13 @@ import { DEFAULT_WORKSPACE_PERMISSIONS } from "../workspace.constants.js";
15
14
  /** Owns built-in permission mappings and validates business extensions. @internal */
16
15
  export class AuthAbilityFactory {
17
16
  /** Builds auth rules and restricted extensions from already credential-limited permissions. */
18
- static createUserAbility(permissions, user, options = {}) {
19
- const grants = Object.freeze([...permissions]);
20
- const builder = new AbilityBuilder(UserAbility);
17
+ static createAbility(context, options = {}) {
18
+ const snapshot = Object.freeze({
19
+ ...context,
20
+ userPermissions: Object.freeze(context.user ? [...context.userPermissions] : []),
21
+ workspacePermissions: Object.freeze(context.workspace ? [...context.workspacePermissions] : []),
22
+ });
23
+ const builder = new AbilityBuilder(AuthAbility);
21
24
  // Self-service operations are authorized explicitly by their Services.
22
25
  const subjects = {
23
26
  user: User,
@@ -26,40 +29,39 @@ export class AuthAbilityFactory {
26
29
  workspace: Workspace,
27
30
  };
28
31
  for (const permission of DEFAULT_USER_PERMISSIONS) {
29
- if (!grants.includes(permission))
32
+ if (!snapshot.userPermissions.includes(permission))
30
33
  continue;
31
34
  const [resource, action] = permission.split(":");
32
35
  builder.can(action, subjects[resource]);
33
36
  }
34
- const configure = options.buildAbility;
35
- if (configure)
36
- extendAbility(builder, grants, resolveAuthCatalog({ user: options }, "user").permissions, (rules) => configure(rules, grants, user));
37
- this.addSubjectAliases(builder.rules);
38
- return builder.build();
39
- }
40
- /** Builds auth rules and restricted extensions from already credential-limited permissions. */
41
- static createWorkspaceAbility(permissions, workspace, options = {}) {
42
- const grants = Object.freeze([...permissions]);
43
- const builder = new AbilityBuilder(WorkspaceAbility);
44
- const subjects = {
37
+ const workspaceSubjects = {
45
38
  workspace: Workspace,
46
39
  member: Member,
47
40
  "workspace-api-key": WorkspaceApiKey,
48
41
  };
49
42
  for (const permission of DEFAULT_WORKSPACE_PERMISSIONS) {
50
- if (!grants.includes(permission))
43
+ if (!snapshot.workspace ||
44
+ !snapshot.workspacePermissions.includes(permission))
51
45
  continue;
52
46
  // Invitation management is one member permission; keep entity checks for CASL conditions.
53
47
  if (permission === "member:invite") {
54
- builder.can(["read", "write"], Invitation);
48
+ builder.can(["read", "write"], Invitation, {
49
+ workspaceId: snapshot.workspace.id,
50
+ });
55
51
  continue;
56
52
  }
57
53
  const [resource, action] = permission.split(":");
58
- builder.can(action, subjects[resource]);
54
+ const conditions = resource === "workspace"
55
+ ? { id: snapshot.workspace.id }
56
+ : { workspaceId: snapshot.workspace.id };
57
+ builder.can(action, workspaceSubjects[resource], conditions);
59
58
  }
60
59
  const configure = options.buildAbility;
61
60
  if (configure)
62
- extendAbility(builder, grants, resolveAuthCatalog({ workspace: options }, "workspace").permissions, (rules) => configure(rules, grants, workspace));
61
+ extendAbility(builder, snapshot, {
62
+ user: resolveAuthCatalog(options, "user").permissions,
63
+ workspace: resolveAuthCatalog(options, "workspace").permissions,
64
+ }, (rules) => configure(rules, snapshot));
63
65
  this.addSubjectAliases(builder.rules);
64
66
  return builder.build();
65
67
  }
@@ -1 +1 @@
1
- {"version":3,"file":"auth-ability.factory.js","sourceRoot":"","sources":["../../src/infrastructure/auth-ability.factory.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"auth-ability.factory.js","sourceRoot":"","sources":["../../src/infrastructure/auth-ability.factory.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,6 @@ import { EntityManager } from "@mikro-orm/core";
2
2
  import { HashService } from "@nest-boot/hash";
3
3
  import { AUTH_TOKEN } from "../auth.constants.js";
4
4
  import { MODULE_OPTIONS_TOKEN } from "../auth.module-definition.js";
5
- import { AccessControlService } from "../services/access-control.service.js";
6
5
  import { InvitationService } from "../services/invitation.service.js";
7
6
  import { MemberService } from "../services/member.service.js";
8
7
  import { SessionService } from "../services/session.service.js";
@@ -15,20 +14,20 @@ import { createContextualAuthService } from "./create-contextual-auth-service.js
15
14
  export const authServiceProviders = [
16
15
  {
17
16
  provide: WorkspaceService,
18
- inject: [EntityManager, MODULE_OPTIONS_TOKEN, AccessControlService],
19
- useFactory: (em, options, access) => createContextualAuthService(em, (manager) => new WorkspaceService(manager, options, access), {
17
+ inject: [EntityManager, MODULE_OPTIONS_TOKEN],
18
+ useFactory: (em, options) => createContextualAuthService(em, (manager) => new WorkspaceService(manager, options), {
20
19
  createWorkspace: "authentication",
21
20
  }),
22
21
  },
23
22
  {
24
23
  provide: MemberService,
25
- inject: [EntityManager, MODULE_OPTIONS_TOKEN, AccessControlService],
26
- useFactory: (em, options, access) => createContextualAuthService(em, (manager) => new MemberService(manager, options, access), { getUserForMembership: "authentication" }),
24
+ inject: [EntityManager, MODULE_OPTIONS_TOKEN],
25
+ useFactory: (em, options) => createContextualAuthService(em, (manager) => new MemberService(manager, options), { getUserForMembership: "authentication" }),
27
26
  },
28
27
  {
29
28
  provide: InvitationService,
30
- inject: [EntityManager, MODULE_OPTIONS_TOKEN, AccessControlService],
31
- useFactory: (em, options, access) => createContextualAuthService(em, (manager) => new InvitationService(manager, options, access), {
29
+ inject: [EntityManager, MODULE_OPTIONS_TOKEN],
30
+ useFactory: (em, options) => createContextualAuthService(em, (manager) => new InvitationService(manager, options), {
32
31
  getUserIdForInvitation: "invitation-identity",
33
32
  acceptInvitation: "authentication",
34
33
  rejectInvitation: "authentication",
@@ -40,10 +39,9 @@ export const authServiceProviders = [
40
39
  EntityManager,
41
40
  MODULE_OPTIONS_TOKEN,
42
41
  HashService,
43
- AccessControlService,
44
42
  UserDeletionService,
45
43
  ],
46
- useFactory: (em, options, hash, access, deletion) => createContextualAuthService(em, (manager) => new UserService(manager, options, hash, access, deletion), {
44
+ useFactory: (em, options, hash, deletion) => createContextualAuthService(em, (manager) => new UserService(manager, options, hash, deletion), {
47
45
  createUser: "authentication",
48
46
  banUser: "authentication",
49
47
  setUserPassword: "authentication",
@@ -60,8 +58,8 @@ export const authServiceProviders = [
60
58
  },
61
59
  {
62
60
  provide: SessionService,
63
- inject: [AUTH_TOKEN, EntityManager, AccessControlService],
64
- useFactory: (auth, em, access) => createContextualAuthService(em, (manager) => new SessionService(auth, manager, access), {
61
+ inject: [AUTH_TOKEN, EntityManager],
62
+ useFactory: (auth, em) => createContextualAuthService(em, (manager) => new SessionService(auth, manager), {
65
63
  getCurrentAuthenticatedSession: "authentication",
66
64
  listCurrentUserSessions: "authentication",
67
65
  revokeSession: "authentication",
@@ -1 +1 @@
1
- {"version":3,"file":"auth-service.providers.js","sourceRoot":"","sources":["../../src/infrastructure/auth-service.providers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"auth-service.providers.js","sourceRoot":"","sources":["../../src/infrastructure/auth-service.providers.ts"],"names":[],"mappings":"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"}
@@ -1,11 +1,23 @@
1
1
  import type { EntityManager } from "@mikro-orm/core";
2
2
  import type { AuthModuleOptions } from "../auth-module-options.interface.js";
3
3
  import { Member } from "../entities/member.entity.js";
4
+ import { Session } from "../entities/session.entity.js";
4
5
  import { User } from "../entities/user.entity.js";
6
+ import { Workspace } from "../entities/workspace.entity.js";
5
7
  import type { RequestIdentityPatch } from "../interfaces/request-identity-patch.interface.js";
6
8
  import type { ApiKey } from "../types/api-key.type.js";
7
9
  /** Owns request identity publication, authorization invalidation, and database scope. @internal */
8
10
  export declare class RequestIdentity {
11
+ /** Throws unless the supplied user is the authenticated user. */
12
+ static assertCurrentUser(user: User): void;
13
+ /** Authorizes an explicit self-service path without granting a general resource ability. */
14
+ static assertUserSession(user: User): void;
15
+ /** Throws unless the supplied session is the authenticated session. */
16
+ static assertCurrentSession(session: Session): void;
17
+ /** Throws unless the supplied workspace is selected for the current request. */
18
+ static assertCurrentWorkspace(workspace: Workspace): void;
19
+ /** Throws unless the supplied member is the current workspace member. */
20
+ static assertCurrentMember(member: Member | null | undefined): void;
9
21
  /** Matches credentials by both table and ID. */
10
22
  static isCurrentApiKey(apiKey: ApiKey): boolean;
11
23
  /** Rejects publishing an authenticating credential before its outer transaction commits. */
@@ -16,18 +28,18 @@ export declare class RequestIdentity {
16
28
  static updateMember(em: EntityManager, options: AuthModuleOptions, member: Member): void;
17
29
  /** Publishes committed credential changes or revokes the entire request. */
18
30
  static updateApiKey(em: EntityManager, options: AuthModuleOptions, apiKey: ApiKey, deleted?: boolean): void;
19
- /** Prepares missing abilities for a guard without rebuilding the current identity. */
31
+ /** Prepares the request ability once, failing closed when configuration rejects. */
20
32
  static prepare(options: AuthModuleOptions): void;
21
33
  /** Stages identity while authentication is being resolved, before a guard can run. */
22
34
  static stage(patch: RequestIdentityPatch): void;
23
- /** Builds both abilities against one permission snapshot, never retaining old grants on failure. */
35
+ /** Rebuilds one ability, never retaining old grants on failure. */
24
36
  static refresh(options: AuthModuleOptions): void;
25
37
  /** Publishes a committed identity change; failures revoke the request instead of retaining stale grants. */
26
38
  static update(em: EntityManager, options: AuthModuleOptions, patch: RequestIdentityPatch): void;
27
39
  /** Removes all credentials without falling back to another authentication method. */
28
40
  static clear(em: EntityManager): void;
29
- /** Clears workspace scope while retaining the user credential and its prepared ability. */
30
- static clearWorkspace(em: EntityManager): void;
41
+ /** Revokes workspace rules and rebuilds the remaining user ability after a committed change. */
42
+ static clearWorkspace(em: EntityManager, options: AuthModuleOptions): void;
31
43
  /** Synchronizes only identity values; database policies never receive application permissions. */
32
44
  static syncDatabase(em: EntityManager): void;
33
45
  private static databaseScope;
@@ -1,18 +1,63 @@
1
1
  import { RequestContext } from "@nest-boot/request-context";
2
- import { BadRequestException } from "@nestjs/common";
3
- import { UserAbility } from "../abilities/user.ability.js";
4
- import { WorkspaceAbility } from "../abilities/workspace.ability.js";
2
+ import { BadRequestException, ForbiddenException } from "@nestjs/common";
3
+ import { AuthAbility } from "../abilities/auth.ability.js";
5
4
  import { API_KEY } from "../auth.constants.js";
6
5
  import { Member } from "../entities/member.entity.js";
7
6
  import { Session } from "../entities/session.entity.js";
8
7
  import { User } from "../entities/user.entity.js";
9
8
  import { Workspace } from "../entities/workspace.entity.js";
10
9
  import { WorkspaceApiKey } from "../entities/workspace-api-key.entity.js";
11
- import { buildRequestUserAbility, buildRequestWorkspaceAbility, } from "../utils/build-request-ability.util.js";
10
+ import { buildRequestAbility } from "../utils/build-request-ability.util.js";
12
11
  import { getCurrentApiKey } from "../utils/get-current-api-key.util.js";
13
12
  import { invalidateRequestPermissions } from "../utils/resolve-request-permissions.util.js";
14
13
  /** Owns request identity publication, authorization invalidation, and database scope. @internal */
15
14
  export class RequestIdentity {
15
+ /** Throws unless the supplied user is the authenticated user. */
16
+ static assertCurrentUser(user) {
17
+ const currentUser = RequestContext.isActive()
18
+ ? RequestContext.get(User)
19
+ : undefined;
20
+ if (!currentUser || String(currentUser.id) !== String(user.id)) {
21
+ throw new ForbiddenException("The operation belongs to another user");
22
+ }
23
+ }
24
+ /** Authorizes an explicit self-service path without granting a general resource ability. */
25
+ static assertUserSession(user) {
26
+ this.assertCurrentUser(user);
27
+ if (getCurrentApiKey()) {
28
+ throw new ForbiddenException("This self-service operation requires a user session");
29
+ }
30
+ }
31
+ /** Throws unless the supplied session is the authenticated session. */
32
+ static assertCurrentSession(session) {
33
+ const currentSession = RequestContext.isActive()
34
+ ? RequestContext.get(Session)
35
+ : undefined;
36
+ if (currentSession?.token !== session.token) {
37
+ throw new ForbiddenException("The operation belongs to another session");
38
+ }
39
+ }
40
+ /** Throws unless the supplied workspace is selected for the current request. */
41
+ static assertCurrentWorkspace(workspace) {
42
+ const currentWorkspace = RequestContext.isActive()
43
+ ? RequestContext.get(Workspace)
44
+ : undefined;
45
+ if (!currentWorkspace ||
46
+ String(currentWorkspace.id) !== String(workspace.id)) {
47
+ throw new ForbiddenException("The operation belongs to another workspace");
48
+ }
49
+ }
50
+ /** Throws unless the supplied member is the current workspace member. */
51
+ static assertCurrentMember(member) {
52
+ const currentMember = RequestContext.isActive()
53
+ ? RequestContext.get(Member)
54
+ : undefined;
55
+ if (!member ||
56
+ !currentMember ||
57
+ String(currentMember.id) !== String(member.id)) {
58
+ throw new ForbiddenException("The operation belongs to another workspace member");
59
+ }
60
+ }
16
61
  /** Matches credentials by both table and ID. */
17
62
  static isCurrentApiKey(apiKey) {
18
63
  const current = getCurrentApiKey();
@@ -38,7 +83,7 @@ export class RequestIdentity {
38
83
  RequestContext.get(Member)?.id !== member.id)
39
84
  return;
40
85
  if (member.status !== "ACTIVE")
41
- this.clearWorkspace(em);
86
+ this.clearWorkspace(em, options);
42
87
  else
43
88
  this.update(em, options, { member });
44
89
  }
@@ -53,22 +98,11 @@ export class RequestIdentity {
53
98
  else
54
99
  this.update(em, options, { apiKey });
55
100
  }
56
- /** Prepares missing abilities for a guard without rebuilding the current identity. */
101
+ /** Prepares the request ability once, failing closed when configuration rejects. */
57
102
  static prepare(options) {
58
- if (!RequestContext.isActive())
103
+ if (!RequestContext.isActive() || RequestContext.get(AuthAbility))
59
104
  return;
60
- try {
61
- const user = RequestContext.get(UserAbility) ?? buildRequestUserAbility(options);
62
- const workspace = RequestContext.get(WorkspaceAbility) ??
63
- buildRequestWorkspaceAbility(options);
64
- RequestContext.set(UserAbility, user);
65
- RequestContext.set(WorkspaceAbility, workspace);
66
- }
67
- catch (error) {
68
- RequestContext.set(UserAbility, new UserAbility());
69
- RequestContext.set(WorkspaceAbility, new WorkspaceAbility());
70
- throw error;
71
- }
105
+ this.refresh(options);
72
106
  }
73
107
  /** Stages identity while authentication is being resolved, before a guard can run. */
74
108
  static stage(patch) {
@@ -85,20 +119,15 @@ export class RequestIdentity {
85
119
  if ("apiKey" in patch)
86
120
  RequestContext.set(API_KEY, patch.apiKey ?? null);
87
121
  invalidateRequestPermissions();
88
- RequestContext.set(UserAbility, null);
89
- RequestContext.set(WorkspaceAbility, null);
122
+ RequestContext.set(AuthAbility, null);
90
123
  }
91
- /** Builds both abilities against one permission snapshot, never retaining old grants on failure. */
124
+ /** Rebuilds one ability, never retaining old grants on failure. */
92
125
  static refresh(options) {
93
126
  if (!RequestContext.isActive())
94
127
  return;
95
128
  invalidateRequestPermissions();
96
- RequestContext.set(UserAbility, new UserAbility());
97
- RequestContext.set(WorkspaceAbility, new WorkspaceAbility());
98
- const user = buildRequestUserAbility(options);
99
- const workspace = buildRequestWorkspaceAbility(options);
100
- RequestContext.set(UserAbility, user);
101
- RequestContext.set(WorkspaceAbility, workspace);
129
+ RequestContext.set(AuthAbility, new AuthAbility());
130
+ RequestContext.set(AuthAbility, buildRequestAbility(options));
102
131
  }
103
132
  /** Publishes a committed identity change; failures revoke the request instead of retaining stale grants. */
104
133
  static update(em, options, patch) {
@@ -127,8 +156,7 @@ export class RequestIdentity {
127
156
  apiKey: null,
128
157
  });
129
158
  if (RequestContext.isActive()) {
130
- RequestContext.set(UserAbility, new UserAbility());
131
- RequestContext.set(WorkspaceAbility, new WorkspaceAbility());
159
+ RequestContext.set(AuthAbility, new AuthAbility());
132
160
  }
133
161
  if (em.getSessionContext())
134
162
  em.setSessionContext({
@@ -136,20 +164,13 @@ export class RequestIdentity {
136
164
  variables: { "app.user.id": "", "app.workspace.id": "" },
137
165
  });
138
166
  }
139
- /** Clears workspace scope while retaining the user credential and its prepared ability. */
140
- static clearWorkspace(em) {
167
+ /** Revokes workspace rules and rebuilds the remaining user ability after a committed change. */
168
+ static clearWorkspace(em, options) {
141
169
  if (getCurrentApiKey() instanceof WorkspaceApiKey) {
142
170
  this.clear(em);
143
171
  return;
144
172
  }
145
- if (RequestContext.isActive()) {
146
- RequestContext.set(Member, null);
147
- RequestContext.set(Workspace, null);
148
- invalidateRequestPermissions();
149
- RequestContext.set(WorkspaceAbility, new WorkspaceAbility());
150
- }
151
- if (em.getSessionContext())
152
- em.setSessionContext({ variables: { "app.workspace.id": "" } });
173
+ this.update(em, options, { member: null, workspace: null });
153
174
  }
154
175
  /** Synchronizes only identity values; database policies never receive application permissions. */
155
176
  static syncDatabase(em) {