@nest-boot/auth 8.0.9-beta.0 → 8.0.9-beta.1

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 (136) hide show
  1. package/README.md +74 -34
  2. package/dist/auth.middleware.d.ts +0 -4
  3. package/dist/auth.middleware.js +17 -21
  4. package/dist/auth.middleware.js.map +1 -1
  5. package/dist/auth.module.js +5 -5
  6. package/dist/auth.module.js.map +1 -1
  7. package/dist/connections/index.d.ts +1 -1
  8. package/dist/connections/index.js +1 -1
  9. package/dist/connections/index.js.map +1 -1
  10. package/dist/connections/member-api-key.connection-definition.d.ts +13 -0
  11. package/dist/connections/{workspace-api-key.connection-definition.js → member-api-key.connection-definition.js} +11 -11
  12. package/dist/connections/member-api-key.connection-definition.js.map +1 -0
  13. package/dist/connections/member.connection-definition.js +1 -0
  14. package/dist/connections/member.connection-definition.js.map +1 -1
  15. package/dist/entities/auth-entity-map.d.ts +2 -2
  16. package/dist/entities/auth-entity-map.js +2 -2
  17. package/dist/entities/auth-entity-map.js.map +1 -1
  18. package/dist/entities/index.d.ts +3 -3
  19. package/dist/entities/index.js +3 -3
  20. package/dist/entities/index.js.map +1 -1
  21. package/dist/entities/{workspace-api-key.entity.d.ts → member-api-key.entity.d.ts} +7 -5
  22. package/dist/entities/{workspace-api-key.entity.js → member-api-key.entity.js} +37 -28
  23. package/dist/entities/member-api-key.entity.js.map +1 -0
  24. package/dist/entities/member.entity.d.ts +6 -2
  25. package/dist/entities/member.entity.js +15 -2
  26. package/dist/entities/member.entity.js.map +1 -1
  27. package/dist/enums/index.d.ts +2 -1
  28. package/dist/enums/index.js +2 -1
  29. package/dist/enums/index.js.map +1 -1
  30. package/dist/enums/{workspace-api-key-permission.enum.d.ts → member-api-key-permission.enum.d.ts} +2 -2
  31. package/dist/enums/{workspace-api-key-permission.enum.js → member-api-key-permission.enum.js} +4 -4
  32. package/dist/enums/member-api-key-permission.enum.js.map +1 -0
  33. package/dist/enums/member-type.enum.d.ts +7 -0
  34. package/dist/enums/member-type.enum.js +11 -0
  35. package/dist/enums/member-type.enum.js.map +1 -0
  36. package/dist/index.d.ts +8 -7
  37. package/dist/index.js +8 -7
  38. package/dist/index.js.map +1 -1
  39. package/dist/infrastructure/api-key-authentication.service.js +25 -8
  40. package/dist/infrastructure/api-key-authentication.service.js.map +1 -1
  41. package/dist/infrastructure/auth-ability.factory.js +17 -2
  42. package/dist/infrastructure/auth-ability.factory.js.map +1 -1
  43. package/dist/infrastructure/auth-enum-registry.js +3 -3
  44. package/dist/infrastructure/auth-enum-registry.js.map +1 -1
  45. package/dist/infrastructure/create-auth-instance.js +2 -2
  46. package/dist/infrastructure/create-auth-instance.js.map +1 -1
  47. package/dist/infrastructure/request-identity.d.ts +2 -0
  48. package/dist/infrastructure/request-identity.js +26 -10
  49. package/dist/infrastructure/request-identity.js.map +1 -1
  50. package/dist/inputs/add-member.input.d.ts +13 -2
  51. package/dist/inputs/add-member.input.js +34 -3
  52. package/dist/inputs/add-member.input.js.map +1 -1
  53. package/dist/inputs/{create-workspace-api-key.input.d.ts → create-member-api-key.input.d.ts} +6 -4
  54. package/dist/inputs/{create-workspace-api-key.input.js → create-member-api-key.input.js} +20 -13
  55. package/dist/inputs/create-member-api-key.input.js.map +1 -0
  56. package/dist/inputs/create-user-api-key.input.d.ts +1 -1
  57. package/dist/inputs/create-user-api-key.input.js +1 -1
  58. package/dist/inputs/create-user-api-key.input.js.map +1 -1
  59. package/dist/inputs/{update-workspace-api-key.input.d.ts → update-member-api-key.input.d.ts} +3 -3
  60. package/dist/inputs/{update-workspace-api-key.input.js → update-member-api-key.input.js} +11 -11
  61. package/dist/inputs/update-member-api-key.input.js.map +1 -0
  62. package/dist/interfaces/ability-context.interface.d.ts +3 -3
  63. package/dist/interfaces/add-member-options.interface.d.ts +1 -1
  64. package/dist/interfaces/auth-module-api-key-options.interface.d.ts +2 -2
  65. package/dist/interfaces/auth-module-api-key-scope-options.interface.d.ts +2 -2
  66. package/dist/interfaces/create-api-key-options.interface.d.ts +1 -1
  67. package/dist/interfaces/create-member-api-key-options.interface.d.ts +7 -0
  68. package/dist/interfaces/create-member-api-key-options.interface.js +2 -0
  69. package/dist/interfaces/create-member-api-key-options.interface.js.map +1 -0
  70. package/dist/interfaces/member-api-key-validation.interface.d.ts +17 -0
  71. package/dist/interfaces/member-api-key-validation.interface.js +2 -0
  72. package/dist/interfaces/member-api-key-validation.interface.js.map +1 -0
  73. package/dist/interfaces/request-permissions.interface.d.ts +1 -1
  74. package/dist/objects/{create-workspace-api-key-result.object.d.ts → create-member-api-key-result.object.d.ts} +3 -3
  75. package/dist/objects/{create-workspace-api-key-result.object.js → create-member-api-key-result.object.js} +10 -10
  76. package/dist/objects/create-member-api-key-result.object.js.map +1 -0
  77. package/dist/objects/member-api-key-permission-option.object.d.ts +10 -0
  78. package/dist/objects/{workspace-api-key-permission-option.object.js → member-api-key-permission-option.object.js} +12 -12
  79. package/dist/objects/member-api-key-permission-option.object.js.map +1 -0
  80. package/dist/resolvers/member-api-key.resolver.d.ts +25 -0
  81. package/dist/resolvers/{workspace-api-key.resolver.js → member-api-key.resolver.js} +38 -34
  82. package/dist/resolvers/member-api-key.resolver.js.map +1 -0
  83. package/dist/resolvers/member.resolver.js +11 -1
  84. package/dist/resolvers/member.resolver.js.map +1 -1
  85. package/dist/resolvers/workspace.resolver.d.ts +6 -6
  86. package/dist/resolvers/workspace.resolver.js +9 -9
  87. package/dist/resolvers/workspace.resolver.js.map +1 -1
  88. package/dist/services/member-api-key.service.d.ts +43 -0
  89. package/dist/services/{workspace-api-key.service.js → member-api-key.service.js} +82 -52
  90. package/dist/services/member-api-key.service.js.map +1 -0
  91. package/dist/services/member.service.d.ts +4 -2
  92. package/dist/services/member.service.js +46 -17
  93. package/dist/services/member.service.js.map +1 -1
  94. package/dist/services/user-api-key.service.js +3 -1
  95. package/dist/services/user-api-key.service.js.map +1 -1
  96. package/dist/services/workspace.service.d.ts +0 -2
  97. package/dist/services/workspace.service.js +1 -11
  98. package/dist/services/workspace.service.js.map +1 -1
  99. package/dist/tsconfig.tsbuildinfo +1 -1
  100. package/dist/types/api-key-validation.type.d.ts +2 -2
  101. package/dist/types/api-key.type.d.ts +3 -3
  102. package/dist/utils/api-key-permissions.util.d.ts +2 -2
  103. package/dist/utils/api-key-permissions.util.js +1 -1
  104. package/dist/utils/api-key-permissions.util.js.map +1 -1
  105. package/dist/utils/build-request-ability.util.js +6 -16
  106. package/dist/utils/build-request-ability.util.js.map +1 -1
  107. package/dist/utils/permission-grants.util.js +2 -0
  108. package/dist/utils/permission-grants.util.js.map +1 -1
  109. package/dist/utils/resolve-effective-permissions.util.d.ts +1 -1
  110. package/dist/utils/resolve-effective-permissions.util.js +1 -1
  111. package/dist/utils/resolve-effective-permissions.util.js.map +1 -1
  112. package/dist/utils/resolve-request-member.util.d.ts +3 -0
  113. package/dist/utils/resolve-request-member.util.js +23 -0
  114. package/dist/utils/resolve-request-member.util.js.map +1 -0
  115. package/dist/utils/resolve-request-permissions.util.js +11 -16
  116. package/dist/utils/resolve-request-permissions.util.js.map +1 -1
  117. package/dist/workspace.constants.d.ts +3 -3
  118. package/dist/workspace.constants.js +6 -2
  119. package/dist/workspace.constants.js.map +1 -1
  120. package/package.json +4 -4
  121. package/dist/connections/workspace-api-key.connection-definition.d.ts +0 -13
  122. package/dist/connections/workspace-api-key.connection-definition.js.map +0 -1
  123. package/dist/entities/workspace-api-key.entity.js.map +0 -1
  124. package/dist/enums/workspace-api-key-permission.enum.js.map +0 -1
  125. package/dist/inputs/create-workspace-api-key.input.js.map +0 -1
  126. package/dist/inputs/update-workspace-api-key.input.js.map +0 -1
  127. package/dist/interfaces/workspace-api-key-validation.interface.d.ts +0 -11
  128. package/dist/interfaces/workspace-api-key-validation.interface.js +0 -2
  129. package/dist/interfaces/workspace-api-key-validation.interface.js.map +0 -1
  130. package/dist/objects/create-workspace-api-key-result.object.js.map +0 -1
  131. package/dist/objects/workspace-api-key-permission-option.object.d.ts +0 -10
  132. package/dist/objects/workspace-api-key-permission-option.object.js.map +0 -1
  133. package/dist/resolvers/workspace-api-key.resolver.d.ts +0 -25
  134. package/dist/resolvers/workspace-api-key.resolver.js.map +0 -1
  135. package/dist/services/workspace-api-key.service.d.ts +0 -41
  136. package/dist/services/workspace-api-key.service.js.map +0 -1
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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"}
@@ -10,8 +10,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
10
10
  var ApiKeyAuthenticationService_1;
11
11
  import { EntityManager, Reference } from "@mikro-orm/core";
12
12
  import { Injectable, UnauthorizedException } from "@nestjs/common";
13
+ import { MemberApiKey } from "../entities/member-api-key.entity.js";
13
14
  import { UserApiKey } from "../entities/user-api-key.entity.js";
14
- import { WorkspaceApiKey } from "../entities/workspace-api-key.entity.js";
15
15
  import { hashApiKey } from "../utils/api-key-credential.util.js";
16
16
  /** Authenticates both credential kinds; management stays in their domain services. @internal */
17
17
  let ApiKeyAuthenticationService = ApiKeyAuthenticationService_1 = class ApiKeyAuthenticationService {
@@ -25,11 +25,11 @@ let ApiKeyAuthenticationService = ApiKeyAuthenticationService_1 = class ApiKeyAu
25
25
  throw new UnauthorizedException("Missing API key");
26
26
  const key = hashApiKey(plaintext);
27
27
  const userKey = await this.em.findOne(UserApiKey, { key }, { populate: ["user"] });
28
- const workspaceKey = await this.em.findOne(WorkspaceApiKey, { key }, { populate: ["workspace"] });
29
- if ((!userKey && !workspaceKey) || (userKey && workspaceKey)) {
28
+ const memberKey = await this.em.findOne(MemberApiKey, { key }, { populate: ["member.workspace", "member.user"] });
29
+ if ((!userKey && !memberKey) || (userKey && memberKey)) {
30
30
  throw new UnauthorizedException("Invalid API key");
31
31
  }
32
- const apiKey = userKey ?? workspaceKey;
32
+ const apiKey = userKey ?? memberKey;
33
33
  if (!apiKey)
34
34
  throw new UnauthorizedException("Invalid API key");
35
35
  if (!apiKey.enabled)
@@ -44,10 +44,27 @@ let ApiKeyAuthenticationService = ApiKeyAuthenticationService_1 = class ApiKeyAu
44
44
  }
45
45
  return { apiKey: userKey, ownerType: "user", user };
46
46
  }
47
- if (!workspaceKey)
47
+ if (!memberKey)
48
48
  throw new UnauthorizedException("Invalid API key");
49
- const workspace = Reference.unwrapReference(workspaceKey.workspace);
50
- return { apiKey: workspaceKey, ownerType: "workspace", workspace };
49
+ if (!memberKey.member)
50
+ throw new UnauthorizedException("Invalid API key");
51
+ const member = Reference.unwrapReference(memberKey.member);
52
+ const user = member.user ? Reference.unwrapReference(member.user) : null;
53
+ if (member.status !== "ACTIVE" ||
54
+ !member.workspace ||
55
+ (member.type === "USER" && !user) ||
56
+ (member.type === "SERVICE_ACCOUNT" && user) ||
57
+ (user?.banned && (!user.banExpiresAt || user.banExpiresAt > new Date()))) {
58
+ throw new UnauthorizedException("Invalid API key");
59
+ }
60
+ const workspace = Reference.unwrapReference(member.workspace);
61
+ return {
62
+ apiKey: memberKey,
63
+ ownerType: "member",
64
+ workspace,
65
+ member,
66
+ user,
67
+ };
51
68
  }
52
69
  /** Captures the authenticating key's RLS scope before a handler can replace it. */
53
70
  captureUsage(apiKey) {
@@ -65,7 +82,7 @@ let ApiKeyAuthenticationService = ApiKeyAuthenticationService_1 = class ApiKeyAu
65
82
  await this.em.nativeUpdate(UserApiKey, { id: apiKey.id }, { lastUsedAt: now, updatedAt: now });
66
83
  }
67
84
  else {
68
- await this.em.nativeUpdate(WorkspaceApiKey, { id: apiKey.id }, { lastUsedAt: now, updatedAt: now });
85
+ await this.em.nativeUpdate(MemberApiKey, { id: apiKey.id }, { lastUsedAt: now, updatedAt: now });
69
86
  }
70
87
  return apiKey;
71
88
  }
@@ -1 +1 @@
1
- {"version":3,"file":"api-key-authentication.service.js","sourceRoot":"","sources":["../../src/infrastructure/api-key-authentication.service.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAEnE,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAG1E,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAEjE,gGAAgG;AAEzF,IAAM,2BAA2B,mCAAjC,MAAM,2BAA2B;IACT;IAA7B,YAA6B,EAAiB;QAAjB,OAAE,GAAF,EAAE,CAAe;IAAG,CAAC;IAElD,iEAAiE;IACjE,KAAK,CAAC,QAAQ,CAAC,SAAiB;QAC9B,IAAI,CAAC,SAAS;YAAE,MAAM,IAAI,qBAAqB,CAAC,iBAAiB,CAAC,CAAC;QACnE,MAAM,GAAG,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC;QAClC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,OAAO,CACnC,UAAU,EACV,EAAE,GAAG,EAAE,EACP,EAAE,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE,CACvB,CAAC;QACF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,OAAO,CACxC,eAAe,EACf,EAAE,GAAG,EAAE,EACP,EAAE,QAAQ,EAAE,CAAC,WAAW,CAAC,EAAE,CAC5B,CAAC;QACF,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,IAAI,YAAY,CAAC,EAAE,CAAC;YAC7D,MAAM,IAAI,qBAAqB,CAAC,iBAAiB,CAAC,CAAC;QACrD,CAAC;QACD,MAAM,MAAM,GAAG,OAAO,IAAI,YAAY,CAAC;QACvC,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,qBAAqB,CAAC,iBAAiB,CAAC,CAAC;QAChE,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,MAAM,IAAI,qBAAqB,CAAC,qBAAqB,CAAC,CAAC;QAC5E,IAAI,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,SAAS,IAAI,IAAI,IAAI,EAAE;YACpD,MAAM,IAAI,qBAAqB,CAAC,qBAAqB,CAAC,CAAC;QACzD,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,IAAI,GAAG,SAAS,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACrD,IACE,IAAI,CAAC,MAAM;gBACX,CAAC,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,GAAG,IAAI,IAAI,EAAE,CAAC,EACtD,CAAC;gBACD,MAAM,IAAI,qBAAqB,CAAC,iBAAiB,CAAC,CAAC;YACrD,CAAC;YACD,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QACtD,CAAC;QACD,IAAI,CAAC,YAAY;YAAE,MAAM,IAAI,qBAAqB,CAAC,iBAAiB,CAAC,CAAC;QACtE,MAAM,SAAS,GAAG,SAAS,CAAC,eAAe,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QACpE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC;IACrE,CAAC;IAED,mFAAmF;IACnF,YAAY,CAAC,MAAsB;QACjC,4EAA4E;QAC5E,6EAA6E;QAC7E,MAAM,QAAQ,GAAG,IAAI,6BAA2B,CAC9C,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,sBAAsB,EAAE,IAAI,EAAE,CAAC,CAClE,CAAC;QACF,OAAO,GAAG,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IAED,yFAAyF;IACzF,KAAK,CAAC,WAAW,CAAC,MAAsB;QACtC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,CAAC,UAAU,GAAG,GAAG,CAAC;QACxB,MAAM,CAAC,SAAS,GAAG,GAAG,CAAC;QACvB,IAAI,MAAM,YAAY,UAAU,EAAE,CAAC;YACjC,MAAM,IAAI,CAAC,EAAE,CAAC,YAAY,CACxB,UAAU,EACV,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EACjB,EAAE,UAAU,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,CACpC,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,CAAC,EAAE,CAAC,YAAY,CACxB,eAAe,EACf,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EACjB,EAAE,UAAU,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,CACpC,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAA;AAtEY,2BAA2B;IADvC,UAAU,EAAE;qCAEsB,aAAa;GADnC,2BAA2B,CAsEvC"}
1
+ {"version":3,"file":"api-key-authentication.service.js","sourceRoot":"","sources":["../../src/infrastructure/api-key-authentication.service.ts"],"names":[],"mappings":"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"}
@@ -2,11 +2,12 @@ import { AbilityBuilder, } from "@casl/ability";
2
2
  import { AuthAbility } from "../auth.ability.js";
3
3
  import { Invitation } from "../entities/invitation.entity.js";
4
4
  import { Member } from "../entities/member.entity.js";
5
+ import { MemberApiKey } from "../entities/member-api-key.entity.js";
5
6
  import { Session } from "../entities/session.entity.js";
6
7
  import { User } from "../entities/user.entity.js";
7
8
  import { UserApiKey } from "../entities/user-api-key.entity.js";
8
9
  import { Workspace } from "../entities/workspace.entity.js";
9
- import { WorkspaceApiKey } from "../entities/workspace-api-key.entity.js";
10
+ import { MemberType } from "../enums/member-type.enum.js";
10
11
  import { DEFAULT_USER_PERMISSIONS } from "../user.constants.js";
11
12
  import { extendAbility } from "../utils/extend-ability.util.js";
12
13
  import { resolveAuthCatalog } from "../utils/resolve-auth-catalog.util.js";
@@ -37,7 +38,8 @@ export class AuthAbilityFactory {
37
38
  const workspaceSubjects = {
38
39
  workspace: Workspace,
39
40
  member: Member,
40
- "workspace-api-key": WorkspaceApiKey,
41
+ "service-account": Member,
42
+ "member-api-key": MemberApiKey,
41
43
  };
42
44
  for (const permission of DEFAULT_WORKSPACE_PERMISSIONS) {
43
45
  if (!snapshot.workspace ||
@@ -54,6 +56,19 @@ export class AuthAbilityFactory {
54
56
  const conditions = resource === "workspace"
55
57
  ? { id: snapshot.workspace.id }
56
58
  : { workspaceId: snapshot.workspace.id };
59
+ if (resource === "member") {
60
+ conditions.type = MemberType.USER;
61
+ if (["set-roles", "set-permissions"].includes(action) &&
62
+ snapshot.workspacePermissions.includes("service-account:write")) {
63
+ builder.can(action, Member, {
64
+ workspaceId: snapshot.workspace.id,
65
+ type: MemberType.SERVICE_ACCOUNT,
66
+ });
67
+ }
68
+ }
69
+ else if (resource === "service-account") {
70
+ conditions.type = MemberType.SERVICE_ACCOUNT;
71
+ }
57
72
  builder.can(action, workspaceSubjects[resource], conditions);
58
73
  }
59
74
  const configure = options.buildAbility;
@@ -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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"}
@@ -1,4 +1,4 @@
1
- import { UserApiKeyPermission, UserPermission, UserRole, WorkspaceApiKeyPermission, WorkspacePermission, WorkspaceRole, } from "../enums/index.js";
1
+ import { MemberApiKeyPermission, UserApiKeyPermission, UserPermission, UserRole, WorkspacePermission, WorkspaceRole, } from "../enums/index.js";
2
2
  import { resolveApiKeyPermissionCatalog } from "../utils/api-key-permissions.util.js";
3
3
  import { createPermissionEnum } from "../utils/create-permission-enum.util.js";
4
4
  import { resolveAuthCatalog } from "../utils/resolve-auth-catalog.util.js";
@@ -29,8 +29,8 @@ export class AuthEnumRegistry {
29
29
  createPermissionEnum(resolveApiKeyPermissionCatalog(options, "user").permissions),
30
30
  ],
31
31
  [
32
- WorkspaceApiKeyPermission,
33
- createPermissionEnum(resolveApiKeyPermissionCatalog(options, "workspace").permissions),
32
+ MemberApiKeyPermission,
33
+ createPermissionEnum(resolveApiKeyPermissionCatalog(options, "member").permissions),
34
34
  ],
35
35
  ];
36
36
  const signature = JSON.stringify(enums.map(([, values]) => Object.entries(values).sort(([a], [b]) => a.localeCompare(b))));
@@ -1 +1 @@
1
- {"version":3,"file":"auth-enum-registry.js","sourceRoot":"","sources":["../../src/infrastructure/auth-enum-registry.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"auth-enum-registry.js","sourceRoot":"","sources":["../../src/infrastructure/auth-enum-registry.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EACpB,cAAc,EACd,QAAQ,EACR,mBAAmB,EACnB,aAAa,GACd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AACtF,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAE3E,IAAI,eAAmC,CAAC;AACxC,IAAI,kBAAkB,GAAG,CAAC,CAAC;AAE3B,wFAAwF;AACxF,MAAM,OAAO,gBAAgB;IACnB,QAAQ,GAAG,KAAK,CAAC;IAEzB,YAAY,OAA0B;QACpC,MAAM,KAAK,GAAG,kBAAkB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,WAAW,CAAC;QAC9D,MAAM,UAAU,GAAG,kBAAkB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,WAAW,CAAC;QACxE,MAAM,UAAU,GAAG,CAAC,KAAa,EAAE,EAAE,CACnC,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;YAC/B,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE;YACvC,IAAI;SACL,CAAC,CACH,CAAC;QACJ,MAAM,KAAK,GAAG;YACZ,CAAC,QAAQ,EAAE,UAAU,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC;YACjE;gBACE,aAAa;gBACb,UAAU,CAAC,kBAAkB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,KAAK,CAAC;aAC3D;YACD,CAAC,cAAc,EAAE,oBAAoB,CAAC,KAAK,CAAC,CAAC;YAC7C,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,UAAU,CAAC,CAAC;YACvD,6EAA6E;YAC7E,0EAA0E;YAC1E;gBACE,oBAAoB;gBACpB,oBAAoB,CAClB,8BAA8B,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,WAAW,CAC5D;aACF;YACD;gBACE,sBAAsB;gBACtB,oBAAoB,CAClB,8BAA8B,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,WAAW,CAC9D;aACF;SACO,CAAC;QACX,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAC9B,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,EAAE,CACvB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAC9D,CACF,CAAC;QACF,IAAI,kBAAkB,GAAG,CAAC,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;YAC5D,MAAM,IAAI,KAAK,CACb,gFAAgF,CACjF,CAAC;QACJ,CAAC;QACD,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;YACrC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;gBACnC,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YACtC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAChC,CAAC;QACD,eAAe,GAAG,SAAS,CAAC;QAC5B,kBAAkB,EAAE,CAAC;IACvB,CAAC;IAED,eAAe;QACb,IAAI,IAAI,CAAC,QAAQ;YAAE,OAAO;QAC1B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,kBAAkB,EAAE,CAAC;IACvB,CAAC;CACF"}
@@ -78,9 +78,9 @@ function validateAuthOptions(options) {
78
78
  if (options.apiKey &&
79
79
  ("defaultPermissions" in options.apiKey ||
80
80
  "allowedPermissions" in options.apiKey)) {
81
- throw new Error("Configure API key permissions under apiKey.user or apiKey.workspace");
81
+ throw new Error("Configure API key permissions under apiKey.user or apiKey.member");
82
82
  }
83
- for (const scope of ["user", "workspace"]) {
83
+ for (const scope of ["user", "member"]) {
84
84
  const { permissions: catalog, defaults } = resolveApiKeyPermissionCatalog(options, scope);
85
85
  const configured = options.apiKey?.[scope];
86
86
  const allowed = configured?.allowedPermissions ?? catalog;
@@ -1 +1 @@
1
- {"version":3,"file":"create-auth-instance.js","sourceRoot":"","sources":["../../src/infrastructure/create-auth-instance.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"create-auth-instance.js","sourceRoot":"","sources":["../../src/infrastructure/create-auth-instance.ts"],"names":[],"mappings":"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"}
@@ -8,6 +8,8 @@ import type { RequestIdentityPatch } from "../interfaces/request-identity-patch.
8
8
  import type { ApiKeyMetadata } from "../types/api-key-metadata.type.js";
9
9
  /** Owns request identity publication, authorization invalidation, and database scope. @internal */
10
10
  export declare class RequestIdentity {
11
+ /** Returns the active request member, rejecting user API keys outside their membership. */
12
+ static getCurrentMember(): Member | null;
11
13
  /** Throws unless the supplied user is the authenticated user. */
12
14
  static assertCurrentUser(user: User): void;
13
15
  /** Authorizes an explicit self-service path without granting a general resource ability. */
@@ -3,15 +3,24 @@ import { BadRequestException, ForbiddenException } from "@nestjs/common";
3
3
  import { AuthAbility } from "../auth.ability.js";
4
4
  import { API_KEY } from "../auth.constants.js";
5
5
  import { Member } from "../entities/member.entity.js";
6
+ import { MemberApiKey } from "../entities/member-api-key.entity.js";
6
7
  import { Session } from "../entities/session.entity.js";
7
8
  import { User } from "../entities/user.entity.js";
8
9
  import { Workspace } from "../entities/workspace.entity.js";
9
- import { WorkspaceApiKey } from "../entities/workspace-api-key.entity.js";
10
10
  import { buildRequestAbility } from "../utils/build-request-ability.util.js";
11
11
  import { getCurrentApiKey } from "../utils/get-current-api-key.util.js";
12
+ import { resolveRequestMember } from "../utils/resolve-request-member.util.js";
12
13
  import { invalidateRequestPermissions } from "../utils/resolve-request-permissions.util.js";
13
14
  /** Owns request identity publication, authorization invalidation, and database scope. @internal */
14
15
  export class RequestIdentity {
16
+ /** Returns the active request member, rejecting user API keys outside their membership. */
17
+ static getCurrentMember() {
18
+ const member = resolveRequestMember();
19
+ if (getCurrentApiKey() && RequestContext.get(User) && !member) {
20
+ throw new ForbiddenException("The API key owner is not a member of this workspace");
21
+ }
22
+ return member;
23
+ }
15
24
  /** Throws unless the supplied user is the authenticated user. */
16
25
  static assertCurrentUser(user) {
17
26
  const currentUser = RequestContext.isActive()
@@ -133,12 +142,15 @@ export class RequestIdentity {
133
142
  static update(em, options, patch) {
134
143
  if (!RequestContext.isActive())
135
144
  return;
136
- const previousScope = JSON.stringify(this.databaseScope());
137
145
  this.stage(patch);
138
146
  try {
139
- if (em.getSessionContext() &&
140
- previousScope !== JSON.stringify(this.databaseScope()))
141
- this.syncDatabase(em);
147
+ const currentScope = em.getSessionContext();
148
+ const scope = this.databaseScope();
149
+ // Compare with the published scope: ORM entities may already be mutated.
150
+ if (currentScope &&
151
+ (currentScope.role !== scope.role ||
152
+ Object.entries(scope.variables).some(([key, value]) => currentScope.variables?.[key] !== value)))
153
+ em.setSessionContext(scope);
142
154
  this.refresh(options);
143
155
  }
144
156
  catch (error) {
@@ -161,12 +173,16 @@ export class RequestIdentity {
161
173
  if (em.getSessionContext())
162
174
  em.setSessionContext({
163
175
  role: "anonymous",
164
- variables: { "app.user.id": "", "app.workspace.id": "" },
176
+ variables: {
177
+ "app.user.id": "",
178
+ "app.workspace.id": "",
179
+ "app.member.id": "",
180
+ },
165
181
  });
166
182
  }
167
183
  /** Revokes workspace rules and rebuilds the remaining user ability after a committed change. */
168
184
  static clearWorkspace(em, options) {
169
- if (getCurrentApiKey() instanceof WorkspaceApiKey) {
185
+ if (getCurrentApiKey() instanceof MemberApiKey) {
170
186
  this.clear(em);
171
187
  return;
172
188
  }
@@ -180,14 +196,14 @@ export class RequestIdentity {
180
196
  const user = RequestContext.get(User);
181
197
  const apiKey = getCurrentApiKey();
182
198
  const workspace = RequestContext.get(Workspace);
183
- const member = RequestContext.get(Member);
199
+ const member = resolveRequestMember();
184
200
  const authenticated = Boolean(user ?? apiKey);
185
- const canUseWorkspace = Boolean(member ?? (apiKey && !user));
186
201
  return {
187
202
  role: authenticated ? "authenticated" : "anonymous",
188
203
  variables: {
189
204
  "app.user.id": user?.id ?? "",
190
- "app.workspace.id": !authenticated || canUseWorkspace ? (workspace?.id ?? "") : "",
205
+ "app.workspace.id": !authenticated || member ? (workspace?.id ?? "") : "",
206
+ "app.member.id": member?.id ?? "",
191
207
  },
192
208
  };
193
209
  }
@@ -1 +1 @@
1
- {"version":3,"file":"request-identity.js","sourceRoot":"","sources":["../../src/infrastructure/request-identity.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"request-identity.js","sourceRoot":"","sources":["../../src/infrastructure/request-identity.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,16 @@
1
+ import { MemberType } from "../enums/member-type.enum.js";
2
+ import { WorkspacePermission } from "../enums/workspace-permission.enum.js";
3
+ import { WorkspaceRole } from "../enums/workspace-role.enum.js";
1
4
  /** Input for directly adding a workspace member. */
2
5
  export declare class AddMemberInput {
3
- /** Email address of the user to add. */
4
- email: string;
6
+ /** Identity type; omitted means a user membership. */
7
+ type?: MemberType;
8
+ /** Service account display name; required for SERVICE_ACCOUNT. */
9
+ name?: string;
10
+ /** Initial roles; omitted uses the default role. Service accounts may use an empty list. */
11
+ roles?: WorkspaceRole[];
12
+ /** Initial direct permissions, limited to the issuer's workspace grants. */
13
+ permissions?: WorkspacePermission[];
14
+ /** Email address of the existing login user; required for USER. */
15
+ email?: string;
5
16
  }
@@ -9,14 +9,45 @@ var __metadata = (this && this.__metadata) || function (k, v) {
9
9
  };
10
10
  import { Field, InputType } from "@nest-boot/graphql";
11
11
  import { ZodField } from "@nest-boot/validator";
12
+ import { MemberType } from "../enums/member-type.enum.js";
13
+ import { WorkspacePermission } from "../enums/workspace-permission.enum.js";
14
+ import { WorkspaceRole } from "../enums/workspace-role.enum.js";
12
15
  /** Input for directly adding a workspace member. */
13
16
  let AddMemberInput = class AddMemberInput {
14
- /** Email address of the user to add. */
17
+ /** Identity type; omitted means a user membership. */
18
+ type;
19
+ /** Service account display name; required for SERVICE_ACCOUNT. */
20
+ name;
21
+ /** Initial roles; omitted uses the default role. Service accounts may use an empty list. */
22
+ roles;
23
+ /** Initial direct permissions, limited to the issuer's workspace grants. */
24
+ permissions;
25
+ /** Email address of the existing login user; required for USER. */
15
26
  email;
16
27
  };
17
28
  __decorate([
18
- ZodField((z) => z.email().max(255)),
19
- Field(() => String),
29
+ ZodField((z) => z.enum(MemberType).optional()),
30
+ Field(() => MemberType, { nullable: true }),
31
+ __metadata("design:type", String)
32
+ ], AddMemberInput.prototype, "type", void 0);
33
+ __decorate([
34
+ ZodField((z) => z.string().trim().min(1).max(255).optional()),
35
+ Field(() => String, { nullable: true }),
36
+ __metadata("design:type", String)
37
+ ], AddMemberInput.prototype, "name", void 0);
38
+ __decorate([
39
+ ZodField((z) => z.array(z.string()).optional()),
40
+ Field(() => [WorkspaceRole], { nullable: true }),
41
+ __metadata("design:type", Array)
42
+ ], AddMemberInput.prototype, "roles", void 0);
43
+ __decorate([
44
+ ZodField((z) => z.array(z.string()).optional()),
45
+ Field(() => [WorkspacePermission], { nullable: true }),
46
+ __metadata("design:type", Array)
47
+ ], AddMemberInput.prototype, "permissions", void 0);
48
+ __decorate([
49
+ ZodField((z) => z.email().max(255).optional()),
50
+ Field(() => String, { nullable: true }),
20
51
  __metadata("design:type", String)
21
52
  ], AddMemberInput.prototype, "email", void 0);
22
53
  AddMemberInput = __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"add-member.input.js","sourceRoot":"","sources":["../../src/inputs/add-member.input.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,oDAAoD;AAE7C,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,wCAAwC;IAGxC,KAAK,CAAU;CAChB,CAAA;AADC;IAFC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACnC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;6CACL;AAJJ,cAAc;IAD1B,SAAS,EAAE;GACC,cAAc,CAK1B"}
1
+ {"version":3,"file":"add-member.input.js","sourceRoot":"","sources":["../../src/inputs/add-member.input.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAEhE,oDAAoD;AAE7C,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,sDAAsD;IAGtD,IAAI,CAAc;IAElB,kEAAkE;IAGlE,IAAI,CAAU;IAEd,4FAA4F;IAG5F,KAAK,CAAmB;IAExB,4EAA4E;IAG5E,WAAW,CAAyB;IAEpC,mEAAmE;IAGnE,KAAK,CAAU;CAChB,CAAA;AArBC;IAFC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC9C,KAAK,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CAC1B;AAKlB;IAFC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC7D,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CAC1B;AAKd;IAFC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC/C,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,aAAa,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACzB;AAKxB;IAFC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC/C,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,mBAAmB,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACnB;AAKpC;IAFC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC9C,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACzB;AAxBJ,cAAc;IAD1B,SAAS,EAAE;GACC,cAAc,CAyB1B"}
@@ -1,14 +1,16 @@
1
- import { WorkspaceApiKeyPermission } from "../enums/workspace-api-key-permission.enum.js";
1
+ import { MemberApiKeyPermission } from "../enums/member-api-key-permission.enum.js";
2
2
  /**
3
3
  * Input for creating an API key.
4
4
  */
5
- export declare class CreateWorkspaceApiKeyInput {
5
+ export declare class CreateMemberApiKeyInput {
6
+ /** Owning member; omission uses the current member. */
7
+ memberId?: string;
6
8
  /** API key display name. */
7
9
  name: string;
8
10
  /** API key expiration time; omitted or null means no expiration. */
9
11
  expiresAt?: Date | null;
10
12
  /** Plaintext prefix: 1–32 lowercase letters, digits, underscores, or hyphens, starting with a letter. Defaults to ws_ unless configured. */
11
13
  prefix?: string;
12
- /** API key permissions; null creates a key without permissions. */
13
- permissions?: WorkspaceApiKeyPermission[] | null;
14
+ /** API key permissions; null inherits all owner permissions. */
15
+ permissions?: MemberApiKeyPermission[] | null;
14
16
  }
@@ -7,32 +7,39 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
7
7
  var __metadata = (this && this.__metadata) || function (k, v) {
8
8
  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
9
9
  };
10
- import { Field, InputType } from "@nest-boot/graphql";
10
+ import { Field, ID, InputType } from "@nest-boot/graphql";
11
11
  import { ZodField } from "@nest-boot/validator";
12
- import { WorkspaceApiKeyPermission } from "../enums/workspace-api-key-permission.enum.js";
12
+ import { MemberApiKeyPermission } from "../enums/member-api-key-permission.enum.js";
13
13
  /**
14
14
  * Input for creating an API key.
15
15
  */
16
- let CreateWorkspaceApiKeyInput = class CreateWorkspaceApiKeyInput {
16
+ let CreateMemberApiKeyInput = class CreateMemberApiKeyInput {
17
+ /** Owning member; omission uses the current member. */
18
+ memberId;
17
19
  /** API key display name. */
18
20
  name;
19
21
  /** API key expiration time; omitted or null means no expiration. */
20
22
  expiresAt;
21
23
  /** Plaintext prefix: 1–32 lowercase letters, digits, underscores, or hyphens, starting with a letter. Defaults to ws_ unless configured. */
22
24
  prefix;
23
- /** API key permissions; null creates a key without permissions. */
25
+ /** API key permissions; null inherits all owner permissions. */
24
26
  permissions;
25
27
  };
28
+ __decorate([
29
+ ZodField((z) => z.string().min(1).optional()),
30
+ Field(() => ID, { nullable: true }),
31
+ __metadata("design:type", String)
32
+ ], CreateMemberApiKeyInput.prototype, "memberId", void 0);
26
33
  __decorate([
27
34
  ZodField((z) => z.string().trim().min(1).max(255)),
28
35
  Field(() => String),
29
36
  __metadata("design:type", String)
30
- ], CreateWorkspaceApiKeyInput.prototype, "name", void 0);
37
+ ], CreateMemberApiKeyInput.prototype, "name", void 0);
31
38
  __decorate([
32
39
  ZodField((z) => z.date().nullish()),
33
40
  Field(() => Date, { nullable: true }),
34
41
  __metadata("design:type", Object)
35
- ], CreateWorkspaceApiKeyInput.prototype, "expiresAt", void 0);
42
+ ], CreateMemberApiKeyInput.prototype, "expiresAt", void 0);
36
43
  __decorate([
37
44
  ZodField((z) => z
38
45
  .string()
@@ -42,14 +49,14 @@ __decorate([
42
49
  .optional()),
43
50
  Field(() => String, { nullable: true }),
44
51
  __metadata("design:type", String)
45
- ], CreateWorkspaceApiKeyInput.prototype, "prefix", void 0);
52
+ ], CreateMemberApiKeyInput.prototype, "prefix", void 0);
46
53
  __decorate([
47
54
  ZodField((z) => z.array(z.string()).nullish()),
48
- Field(() => [WorkspaceApiKeyPermission], { nullable: true }),
55
+ Field(() => [MemberApiKeyPermission], { nullable: true }),
49
56
  __metadata("design:type", Object)
50
- ], CreateWorkspaceApiKeyInput.prototype, "permissions", void 0);
51
- CreateWorkspaceApiKeyInput = __decorate([
57
+ ], CreateMemberApiKeyInput.prototype, "permissions", void 0);
58
+ CreateMemberApiKeyInput = __decorate([
52
59
  InputType()
53
- ], CreateWorkspaceApiKeyInput);
54
- export { CreateWorkspaceApiKeyInput };
55
- //# sourceMappingURL=create-workspace-api-key.input.js.map
60
+ ], CreateMemberApiKeyInput);
61
+ export { CreateMemberApiKeyInput };
62
+ //# sourceMappingURL=create-member-api-key.input.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"create-member-api-key.input.js","sourceRoot":"","sources":["../../src/inputs/create-member-api-key.input.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAC;AAEpF;;GAEG;AAEI,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAClC,uDAAuD;IAGvD,QAAQ,CAAU;IAElB,4BAA4B;IAG5B,IAAI,CAAU;IAEd,oEAAoE;IAGpE,SAAS,CAAe;IAExB,4IAA4I;IAU5I,MAAM,CAAU;IAEhB,gEAAgE;IAGhE,WAAW,CAAmC;CAC/C,CAAA;AA5BC;IAFC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC7C,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yDAClB;AAKlB;IAFC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAClD,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;qDACN;AAKd;IAFC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;IACnC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0DACd;AAYxB;IATC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CACd,CAAC;SACE,MAAM,EAAE;SACR,GAAG,CAAC,CAAC,CAAC;SACN,GAAG,CAAC,EAAE,CAAC;SACP,KAAK,CAAC,qBAAqB,CAAC;SAC5B,QAAQ,EAAE,CACd;IACA,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACxB;AAKhB;IAFC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;IAC9C,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,sBAAsB,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4DACZ;AA/BnC,uBAAuB;IADnC,SAAS,EAAE;GACC,uBAAuB,CAgCnC"}
@@ -9,6 +9,6 @@ export declare class CreateUserApiKeyInput {
9
9
  expiresAt?: Date | null;
10
10
  /** Plaintext prefix: 1–32 lowercase letters, digits, underscores, or hyphens, starting with a letter. Defaults to user_ unless configured. */
11
11
  prefix?: string;
12
- /** API key permissions; null creates a key without permissions. */
12
+ /** API key permissions; null inherits all owner permissions. */
13
13
  permissions?: UserApiKeyPermission[] | null;
14
14
  }
@@ -20,7 +20,7 @@ let CreateUserApiKeyInput = class CreateUserApiKeyInput {
20
20
  expiresAt;
21
21
  /** Plaintext prefix: 1–32 lowercase letters, digits, underscores, or hyphens, starting with a letter. Defaults to user_ unless configured. */
22
22
  prefix;
23
- /** API key permissions; null creates a key without permissions. */
23
+ /** API key permissions; null inherits all owner permissions. */
24
24
  permissions;
25
25
  };
26
26
  __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"create-user-api-key.input.js","sourceRoot":"","sources":["../../src/inputs/create-user-api-key.input.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAEhF;;GAEG;AAEI,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAChC,4BAA4B;IAG5B,IAAI,CAAU;IAEd,oEAAoE;IAGpE,SAAS,CAAe;IAExB,8IAA8I;IAU9I,MAAM,CAAU;IAEhB,mEAAmE;IAGnE,WAAW,CAAiC;CAC7C,CAAA;AAvBC;IAFC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAClD,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;mDACN;AAKd;IAFC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;IACnC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wDACd;AAYxB;IATC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CACd,CAAC;SACE,MAAM,EAAE;SACR,GAAG,CAAC,CAAC,CAAC;SACN,GAAG,CAAC,EAAE,CAAC;SACP,KAAK,CAAC,qBAAqB,CAAC;SAC5B,QAAQ,EAAE,CACd;IACA,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACxB;AAKhB;IAFC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;IAC9C,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,oBAAoB,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0DACZ;AA1BjC,qBAAqB;IADjC,SAAS,EAAE;GACC,qBAAqB,CA2BjC"}
1
+ {"version":3,"file":"create-user-api-key.input.js","sourceRoot":"","sources":["../../src/inputs/create-user-api-key.input.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAEhF;;GAEG;AAEI,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAChC,4BAA4B;IAG5B,IAAI,CAAU;IAEd,oEAAoE;IAGpE,SAAS,CAAe;IAExB,8IAA8I;IAU9I,MAAM,CAAU;IAEhB,gEAAgE;IAGhE,WAAW,CAAiC;CAC7C,CAAA;AAvBC;IAFC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAClD,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;mDACN;AAKd;IAFC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;IACnC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wDACd;AAYxB;IATC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CACd,CAAC;SACE,MAAM,EAAE;SACR,GAAG,CAAC,CAAC,CAAC;SACN,GAAG,CAAC,EAAE,CAAC;SACP,KAAK,CAAC,qBAAqB,CAAC;SAC5B,QAAQ,EAAE,CACd;IACA,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACxB;AAKhB;IAFC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;IAC9C,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,oBAAoB,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0DACZ;AA1BjC,qBAAqB;IADjC,SAAS,EAAE;GACC,qBAAqB,CA2BjC"}
@@ -1,8 +1,8 @@
1
- import { WorkspaceApiKeyPermission } from "../enums/workspace-api-key-permission.enum.js";
1
+ import { MemberApiKeyPermission } from "../enums/member-api-key-permission.enum.js";
2
2
  /**
3
3
  * Input for updating an API key.
4
4
  */
5
- export declare class UpdateWorkspaceApiKeyInput {
5
+ export declare class UpdateMemberApiKeyInput {
6
6
  /** New API key display name. */
7
7
  name?: string;
8
8
  /** Whether the API key can authenticate requests. */
@@ -10,5 +10,5 @@ export declare class UpdateWorkspaceApiKeyInput {
10
10
  /** API key expiration time; null removes the expiration. */
11
11
  expiresAt?: Date | null;
12
12
  /** API key permissions. */
13
- permissions?: WorkspaceApiKeyPermission[] | null;
13
+ permissions?: MemberApiKeyPermission[] | null;
14
14
  }