@simple-auth-kit/cli 1.4.2 → 1.5.0

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 (133) hide show
  1. package/package.json +1 -1
  2. package/registry/combos/express-drizzle/shared/src/{auth-core-error.middleware.ts → middleware/auth-core-error.middleware.ts} +17 -4
  3. package/registry/combos/express-drizzle/shared/src/{auth.middleware.ts → middleware/auth.middleware.ts} +23 -7
  4. package/registry/combos/{express-prisma/shared/src → express-drizzle/shared/src/middleware}/response-envelope.middleware.ts +15 -3
  5. package/registry/combos/express-drizzle/shared/src/{oauth.repository.ts → repositories/oauth.repository.ts} +32 -9
  6. package/registry/combos/express-drizzle/shared/src/repositories/password-reset.repository.ts +59 -0
  7. package/registry/combos/express-drizzle/shared/src/{session.repository.ts → repositories/session.repository.ts} +52 -14
  8. package/registry/combos/express-drizzle/shared/src/{two-factor.repository.ts → repositories/two-factor.repository.ts} +20 -6
  9. package/registry/combos/express-drizzle/shared/src/request-context.ts +1 -1
  10. package/registry/combos/express-drizzle/shared/src/routers/auth.router.ts +395 -0
  11. package/registry/combos/express-drizzle/variants/base/src/create-auth-app.ts +52 -19
  12. package/registry/combos/express-drizzle/variants/base/src/{authz.middleware.ts → middleware/authz.middleware.ts} +15 -7
  13. package/registry/combos/express-drizzle/variants/base/src/{audit-log.repository.ts → repositories/audit-log.repository.ts} +28 -10
  14. package/registry/combos/express-drizzle/variants/base/src/{rbac.repository.ts → repositories/rbac.repository.ts} +239 -48
  15. package/registry/combos/express-drizzle/variants/base/src/routers/admin.router.ts +497 -0
  16. package/registry/combos/express-drizzle/variants/base/src/{auth.service.ts → services/auth.service.ts} +480 -109
  17. package/registry/combos/express-drizzle/variants/workspaces/src/create-auth-app.ts +69 -23
  18. package/registry/combos/express-drizzle/variants/workspaces/src/{authz.middleware.ts → middleware/authz.middleware.ts} +32 -12
  19. package/registry/combos/express-drizzle/variants/workspaces/src/openapi-workspace.ts +147 -28
  20. package/registry/combos/express-drizzle/variants/workspaces/src/{audit-log.repository.ts → repositories/audit-log.repository.ts} +30 -11
  21. package/registry/combos/express-drizzle/variants/workspaces/src/{rbac.repository.ts → repositories/rbac.repository.ts} +319 -70
  22. package/registry/combos/express-drizzle/variants/workspaces/src/{workspace.repository.ts → repositories/workspace.repository.ts} +127 -30
  23. package/registry/combos/express-drizzle/variants/workspaces/src/routers/admin.router.ts +534 -0
  24. package/registry/combos/express-drizzle/variants/workspaces/src/routers/workspace.router.ts +194 -0
  25. package/registry/combos/express-drizzle/variants/workspaces/src/{auth.service.ts → services/auth.service.ts} +544 -122
  26. package/registry/combos/express-prisma/shared/src/{auth-core-error.middleware.ts → middleware/auth-core-error.middleware.ts} +17 -4
  27. package/registry/combos/express-prisma/shared/src/{auth.middleware.ts → middleware/auth.middleware.ts} +19 -6
  28. package/registry/combos/{express-drizzle/shared/src → express-prisma/shared/src/middleware}/response-envelope.middleware.ts +15 -3
  29. package/registry/combos/express-prisma/shared/src/{oauth.repository.ts → repositories/oauth.repository.ts} +27 -9
  30. package/registry/combos/express-prisma/shared/src/repositories/password-reset.repository.ts +55 -0
  31. package/registry/combos/express-prisma/shared/src/{session.repository.ts → repositories/session.repository.ts} +30 -9
  32. package/registry/combos/express-prisma/shared/src/{two-factor.repository.ts → repositories/two-factor.repository.ts} +11 -4
  33. package/registry/combos/express-prisma/shared/src/request-context.ts +1 -1
  34. package/registry/combos/express-prisma/shared/src/routers/auth.router.ts +398 -0
  35. package/registry/combos/express-prisma/variants/base/src/create-auth-app.ts +57 -22
  36. package/registry/combos/express-prisma/variants/base/src/{authz.middleware.ts → middleware/authz.middleware.ts} +15 -7
  37. package/registry/combos/express-prisma/variants/base/src/rbac.defaults.ts +67 -19
  38. package/registry/combos/express-prisma/variants/base/src/{audit-log.repository.ts → repositories/audit-log.repository.ts} +16 -5
  39. package/registry/combos/express-prisma/variants/base/src/{rbac.repository.ts → repositories/rbac.repository.ts} +199 -48
  40. package/registry/combos/express-prisma/variants/base/src/routers/admin.router.ts +508 -0
  41. package/registry/combos/express-prisma/variants/base/src/seed.ts +78 -20
  42. package/registry/combos/express-prisma/variants/base/src/{auth.service.ts → services/auth.service.ts} +454 -105
  43. package/registry/combos/express-prisma/variants/workspaces/src/create-auth-app.ts +81 -26
  44. package/registry/combos/express-prisma/variants/workspaces/src/{authz.middleware.ts → middleware/authz.middleware.ts} +32 -12
  45. package/registry/combos/express-prisma/variants/workspaces/src/openapi-workspace.ts +147 -28
  46. package/registry/combos/express-prisma/variants/workspaces/src/rbac.defaults.ts +73 -21
  47. package/registry/combos/express-prisma/variants/workspaces/src/{audit-log.repository.ts → repositories/audit-log.repository.ts} +16 -5
  48. package/registry/combos/express-prisma/variants/workspaces/src/{rbac.repository.ts → repositories/rbac.repository.ts} +272 -64
  49. package/registry/combos/express-prisma/variants/workspaces/src/{workspace.repository.ts → repositories/workspace.repository.ts} +86 -23
  50. package/registry/combos/express-prisma/variants/workspaces/src/routers/admin.router.ts +545 -0
  51. package/registry/combos/express-prisma/variants/workspaces/src/routers/workspace.router.ts +194 -0
  52. package/registry/combos/express-prisma/variants/workspaces/src/seed.ts +109 -29
  53. package/registry/combos/express-prisma/variants/workspaces/src/{auth.service.ts → services/auth.service.ts} +518 -119
  54. package/registry/combos/nestjs-drizzle/shared/src/{auth.controller.ts → controllers/auth.controller.ts} +6 -6
  55. package/registry/combos/nestjs-drizzle/shared/src/{auth-core-error.filter.ts → filters/auth-core-error.filter.ts} +29 -5
  56. package/registry/combos/nestjs-drizzle/shared/src/{ability.guard.ts → guards/ability.guard.ts} +20 -7
  57. package/registry/combos/nestjs-drizzle/shared/src/{auth.guard.ts → guards/auth.guard.ts} +19 -7
  58. package/registry/combos/{nestjs-prisma/shared/src → nestjs-drizzle/shared/src/interceptors}/response.interceptor.ts +10 -2
  59. package/registry/combos/nestjs-drizzle/shared/src/repositories/oauth.repository.ts +63 -0
  60. package/registry/combos/nestjs-drizzle/shared/src/repositories/password-reset.repository.ts +59 -0
  61. package/registry/combos/nestjs-drizzle/shared/src/{session.repository.ts → repositories/session.repository.ts} +52 -14
  62. package/registry/combos/nestjs-drizzle/shared/src/{two-factor.repository.ts → repositories/two-factor.repository.ts} +21 -7
  63. package/registry/combos/nestjs-drizzle/shared/src/request-context.ts +1 -1
  64. package/registry/combos/nestjs-drizzle/test/prove-cycle.ts +1097 -307
  65. package/registry/combos/nestjs-drizzle/variants/base/src/auth.module.ts +44 -20
  66. package/registry/combos/nestjs-drizzle/variants/base/src/{admin.controller.ts → controllers/admin.controller.ts} +228 -62
  67. package/registry/combos/nestjs-drizzle/variants/base/src/{authz.guard.ts → guards/authz.guard.ts} +12 -5
  68. package/registry/combos/nestjs-drizzle/variants/base/src/{audit-log.repository.ts → repositories/audit-log.repository.ts} +27 -10
  69. package/registry/combos/nestjs-drizzle/variants/base/src/{rbac.repository.ts → repositories/rbac.repository.ts} +249 -51
  70. package/registry/combos/nestjs-drizzle/variants/base/src/{auth.service.ts → services/auth.service.ts} +499 -116
  71. package/registry/combos/nestjs-drizzle/variants/workspaces/src/auth.module.ts +48 -22
  72. package/registry/combos/nestjs-drizzle/variants/workspaces/src/{admin.controller.ts → controllers/admin.controller.ts} +269 -70
  73. package/registry/combos/nestjs-drizzle/variants/workspaces/src/{workspace.controller.ts → controllers/workspace.controller.ts} +93 -26
  74. package/registry/combos/nestjs-drizzle/variants/workspaces/src/{authz.guard.ts → guards/authz.guard.ts} +26 -8
  75. package/registry/combos/nestjs-drizzle/variants/workspaces/src/{audit-log.repository.ts → repositories/audit-log.repository.ts} +29 -11
  76. package/registry/combos/nestjs-drizzle/variants/workspaces/src/{rbac.repository.ts → repositories/rbac.repository.ts} +323 -71
  77. package/registry/combos/nestjs-drizzle/variants/workspaces/src/{workspace.repository.ts → repositories/workspace.repository.ts} +131 -30
  78. package/registry/combos/nestjs-drizzle/variants/workspaces/src/services/auth.service.ts +988 -0
  79. package/registry/combos/nestjs-prisma/shared/src/{auth.controller.ts → controllers/auth.controller.ts} +6 -6
  80. package/registry/combos/nestjs-prisma/shared/src/{auth-core-error.filter.ts → filters/auth-core-error.filter.ts} +29 -5
  81. package/registry/combos/nestjs-prisma/shared/src/{ability.guard.ts → guards/ability.guard.ts} +20 -7
  82. package/registry/combos/nestjs-prisma/shared/src/{auth.guard.ts → guards/auth.guard.ts} +19 -7
  83. package/registry/combos/{nestjs-drizzle/shared/src → nestjs-prisma/shared/src/interceptors}/response.interceptor.ts +10 -2
  84. package/registry/combos/nestjs-prisma/shared/src/{oauth.repository.ts → repositories/oauth.repository.ts} +25 -8
  85. package/registry/combos/nestjs-prisma/shared/src/repositories/password-reset.repository.ts +55 -0
  86. package/registry/combos/nestjs-prisma/shared/src/{session.repository.ts → repositories/session.repository.ts} +30 -9
  87. package/registry/combos/nestjs-prisma/shared/src/{two-factor.repository.ts → repositories/two-factor.repository.ts} +11 -4
  88. package/registry/combos/nestjs-prisma/shared/src/request-context.ts +1 -1
  89. package/registry/combos/nestjs-prisma/test/prove-cycle.ts +1097 -307
  90. package/registry/combos/nestjs-prisma/variants/base/src/auth.module.ts +59 -28
  91. package/registry/combos/nestjs-prisma/variants/base/src/{admin.controller.ts → controllers/admin.controller.ts} +469 -110
  92. package/registry/combos/nestjs-prisma/variants/base/src/{audit-log.gateway.ts → gateways/audit-log.gateway.ts} +22 -6
  93. package/registry/combos/nestjs-prisma/variants/base/src/{authz.guard.ts → guards/authz.guard.ts} +12 -5
  94. package/registry/combos/nestjs-prisma/variants/base/src/rbac.defaults.ts +98 -27
  95. package/registry/combos/nestjs-prisma/variants/base/src/{audit-log.repository.ts → repositories/audit-log.repository.ts} +16 -5
  96. package/registry/combos/nestjs-prisma/variants/base/src/{country.repository.ts → repositories/country.repository.ts} +98 -25
  97. package/registry/combos/nestjs-prisma/variants/base/src/{customer.repository.ts → repositories/customer.repository.ts} +106 -27
  98. package/registry/combos/nestjs-prisma/variants/base/src/{language.repository.ts → repositories/language.repository.ts} +93 -25
  99. package/registry/combos/nestjs-prisma/variants/base/src/{rbac.repository.ts → repositories/rbac.repository.ts} +229 -55
  100. package/registry/combos/nestjs-prisma/variants/base/src/seed.ts +78 -20
  101. package/registry/combos/nestjs-prisma/variants/base/src/services/auth.service.ts +1064 -0
  102. package/registry/combos/nestjs-prisma/variants/workspaces/src/auth.module.ts +55 -27
  103. package/registry/combos/nestjs-prisma/variants/workspaces/src/{admin.controller.ts → controllers/admin.controller.ts} +544 -128
  104. package/registry/combos/nestjs-prisma/variants/workspaces/src/{workspace.controller.ts → controllers/workspace.controller.ts} +93 -26
  105. package/registry/combos/nestjs-prisma/variants/workspaces/src/{authz.guard.ts → guards/authz.guard.ts} +26 -8
  106. package/registry/combos/nestjs-prisma/variants/workspaces/src/rbac.defaults.ts +104 -29
  107. package/registry/combos/nestjs-prisma/variants/workspaces/src/{audit-log.repository.ts → repositories/audit-log.repository.ts} +16 -5
  108. package/registry/combos/nestjs-prisma/variants/workspaces/src/{country.repository.ts → repositories/country.repository.ts} +127 -26
  109. package/registry/combos/nestjs-prisma/variants/workspaces/src/{customer.repository.ts → repositories/customer.repository.ts} +137 -28
  110. package/registry/combos/nestjs-prisma/variants/workspaces/src/repositories/language.repository.ts +243 -0
  111. package/registry/combos/nestjs-prisma/variants/workspaces/src/{rbac.repository.ts → repositories/rbac.repository.ts} +314 -74
  112. package/registry/combos/nestjs-prisma/variants/workspaces/src/{workspace.repository.ts → repositories/workspace.repository.ts} +94 -24
  113. package/registry/combos/nestjs-prisma/variants/workspaces/src/seed.ts +109 -29
  114. package/registry/combos/nestjs-prisma/variants/workspaces/src/services/auth.service.ts +961 -0
  115. package/registry.json +6 -4
  116. package/simple-auth-kit.ts +582 -124
  117. package/registry/combos/express-drizzle/shared/src/auth.router.ts +0 -266
  118. package/registry/combos/express-drizzle/shared/src/password-reset.repository.ts +0 -35
  119. package/registry/combos/express-drizzle/variants/base/src/admin.router.ts +0 -307
  120. package/registry/combos/express-drizzle/variants/workspaces/src/admin.router.ts +0 -323
  121. package/registry/combos/express-drizzle/variants/workspaces/src/workspace.router.ts +0 -123
  122. package/registry/combos/express-prisma/shared/src/auth.router.ts +0 -269
  123. package/registry/combos/express-prisma/shared/src/password-reset.repository.ts +0 -29
  124. package/registry/combos/express-prisma/variants/base/src/admin.router.ts +0 -314
  125. package/registry/combos/express-prisma/variants/workspaces/src/admin.router.ts +0 -330
  126. package/registry/combos/express-prisma/variants/workspaces/src/workspace.router.ts +0 -123
  127. package/registry/combos/nestjs-drizzle/shared/src/oauth.repository.ts +0 -36
  128. package/registry/combos/nestjs-drizzle/shared/src/password-reset.repository.ts +0 -29
  129. package/registry/combos/nestjs-drizzle/variants/workspaces/src/auth.service.ts +0 -553
  130. package/registry/combos/nestjs-prisma/shared/src/password-reset.repository.ts +0 -29
  131. package/registry/combos/nestjs-prisma/variants/base/src/auth.service.ts +0 -618
  132. package/registry/combos/nestjs-prisma/variants/workspaces/src/auth.service.ts +0 -509
  133. package/registry/combos/nestjs-prisma/variants/workspaces/src/language.repository.ts +0 -143
@@ -1,323 +0,0 @@
1
- import type { NextFunction, Request, RequestHandler, Response } from "express";
2
- import { hashPassword } from "@/lib/auth/core/crypto.js";
3
- import { AuthService } from "./auth.service.js";
4
- import { HttpError } from "./http-error.js";
5
- import { ability, createTieredRouter } from "./route-tiers.js";
6
- import { WorkspaceRepository } from "./workspace.repository.js";
7
- import "./request-context.js";
8
-
9
- function requireString(value: unknown, field: string): string {
10
- if (typeof value !== "string" || value.length === 0) throw new HttpError(400, `${field} is required`);
11
- return value;
12
- }
13
-
14
- const optionalString = (value: unknown): string | undefined => (typeof value === "string" ? value : undefined);
15
-
16
- export interface AdminRouterDeps {
17
- auth: AuthService;
18
- /** Creating a member directly writes through the repository, not `AuthService` — see the `POST /users` route below. */
19
- workspaces: WorkspaceRepository;
20
- authentication: RequestHandler;
21
- /** The mandatory workspace resolution — every route here acts inside one. See authz.middleware.ts. */
22
- workspaceScope: RequestHandler;
23
- }
24
-
25
- /**
26
- * Administration *of one workspace*, named by the `X-Workspace-Id` header. Authority is a
27
- * permission, never a role name: the workspace middleware resolves the caller's membership and the
28
- * roles and permissions it carries **in that workspace**, builds the CASL ability from them, and
29
- * each route's `ability(...)` tier checks its slugs against it. There is no role-based bypass —
30
- * holding a role called "admin" that carries no permissions gets exactly the same 403 as holding no
31
- * role at all, which is why `npm run seed` (which provisions the catalog and the roles that carry
32
- * it) is a prerequisite for this router doing anything.
33
- *
34
- * Every handler passes `req.authz` down to the service, and every service method reaches the
35
- * database through a workspace-scoped query. That is the security property this model rests on: an
36
- * admin of one workspace has no expressible way to name a row in another.
37
- *
38
- * Each route says what it demands; the rows say who is granted it. The slugs below are checked at
39
- * compile time against `PERMISSION_CATALOG` in `rbac.defaults.ts`, while who holds them — and
40
- * whether the permission is active at all — is edited through this very router and takes effect on
41
- * the next request. `GET /auth/me` returns the caller's slugs, and a console rebuilds the same
42
- * ability from them with the same function the middleware used.
43
- *
44
- * Replaces the reference combo's `AdminController`. Mounted under `/auth/admin` by
45
- * create-auth-app.ts; `createTieredRouter` stands in for its
46
- * `@UseGuards(AuthGuard, AuthzGuard, AbilityGuard)` — see route-tiers.ts for why the tier is a
47
- * required argument rather than a decorator.
48
- */
49
- export function createAdminRouter(deps: AdminRouterDeps): RequestHandler {
50
- const { auth, workspaces, authentication, workspaceScope } = deps;
51
- const admin = createTieredRouter({ authentication, authorization: workspaceScope });
52
-
53
- admin.route("get", "/users", ability("users:read"), async (req: Request, res: Response, next: NextFunction) => {
54
- try {
55
- const { search, page, limit } = req.query as Record<string, string | undefined>;
56
- res.status(200).json(await auth.listUsers(req.authz!, { search, page: page ? Number(page) : undefined, limit: limit ? Number(limit) : undefined }));
57
- } catch (err) {
58
- next(err);
59
- }
60
- });
61
-
62
- admin.route("post", "/users", ability("users:manage"), async (req: Request, res: Response, next: NextFunction) => {
63
- try {
64
- const body = req.body as Record<string, unknown>;
65
- const passwordHash = await hashPassword(requireString(body.password, "password"));
66
- const member = await workspaces.createMember(
67
- req.authz!.workspaceId,
68
- {
69
- email: requireString(body.email, "email"),
70
- passwordHash,
71
- firstName: optionalString(body.firstName),
72
- lastName: optionalString(body.lastName),
73
- displayName: optionalString(body.displayName),
74
- phone: optionalString(body.phone),
75
- username: optionalString(body.username),
76
- roles: Array.isArray(body.roles) ? body.roles.filter((role): role is string => typeof role === "string") : undefined,
77
- },
78
- req.auth!.sub,
79
- );
80
- res.status(201).json(await auth.getUser(req.authz!, member.userId));
81
- } catch (err) {
82
- next(err);
83
- }
84
- });
85
-
86
- admin.route("get", "/users/:userId", ability("users:read"), async (req: Request, res: Response, next: NextFunction) => {
87
- try {
88
- res.status(200).json(await auth.getUser(req.authz!, requireString(req.params.userId, "userId")));
89
- } catch (err) {
90
- next(err);
91
- }
92
- });
93
-
94
- admin.route("patch", "/users/:userId", ability("users:manage"), async (req: Request, res: Response, next: NextFunction) => {
95
- try {
96
- const body = req.body as Record<string, unknown>;
97
- res.status(200).json(
98
- await auth.updateUser(
99
- req.authz!,
100
- requireString(req.params.userId, "userId"),
101
- {
102
- firstName: body.firstName === null ? null : optionalString(body.firstName),
103
- lastName: body.lastName === null ? null : optionalString(body.lastName),
104
- displayName: body.displayName === null ? null : optionalString(body.displayName),
105
- phone: body.phone === null ? null : optionalString(body.phone),
106
- username: body.username === null ? null : optionalString(body.username),
107
- photo: body.photo === null ? null : optionalString(body.photo),
108
- },
109
- req.auth!.sub,
110
- ),
111
- );
112
- } catch (err) {
113
- next(err);
114
- }
115
- });
116
-
117
- admin.route("delete", "/users/:userId", ability("users:manage"), async (req: Request, res: Response, next: NextFunction) => {
118
- try {
119
- const userId = requireString(req.params.userId, "userId");
120
- if (userId === req.auth!.sub) throw new HttpError(403, "cannot delete your own account");
121
- const body = (req.body ?? {}) as Record<string, unknown>;
122
- await auth.deleteUser(req.authz!, userId, req.auth!.sub, optionalString(body.reason));
123
- res.status(200).json({ ok: true });
124
- } catch (err) {
125
- next(err);
126
- }
127
- });
128
-
129
- admin.route("get", "/audit-log", ability("audit-log:read"), async (req: Request, res: Response, next: NextFunction) => {
130
- try {
131
- const { userId, action, since, until, page, limit } = req.query as Record<string, string | undefined>;
132
- res.status(200).json(
133
- await auth.listAuditLog(req.authz!, { userId, action, since, until, page: page ? Number(page) : undefined, limit: limit ? Number(limit) : undefined }),
134
- );
135
- } catch (err) {
136
- next(err);
137
- }
138
- });
139
-
140
- admin.route("get", "/permissions", ability("permissions:read"), async (_req: Request, res: Response, next: NextFunction) => {
141
- try {
142
- res.status(200).json(await auth.listPermissions());
143
- } catch (err) {
144
- next(err);
145
- }
146
- });
147
-
148
- admin.route("post", "/permissions", ability("permissions:define"), async (req: Request, res: Response, next: NextFunction) => {
149
- try {
150
- const body = req.body as Record<string, unknown>;
151
- res.status(201).json(
152
- await auth.definePermission(
153
- {
154
- slug: requireString(body.slug, "slug"),
155
- name: optionalString(body.name),
156
- displayName: optionalString(body.displayName),
157
- description: body.description === null ? null : optionalString(body.description),
158
- group: optionalString(body.group),
159
- groupOrder: typeof body.groupOrder === "number" ? body.groupOrder : undefined,
160
- order: typeof body.order === "number" ? body.order : undefined,
161
- isActive: typeof body.isActive === "boolean" ? body.isActive : undefined,
162
- },
163
- req.auth!.sub,
164
- ),
165
- );
166
- } catch (err) {
167
- next(err);
168
- }
169
- });
170
-
171
- admin.route("get", "/roles", ability("roles:manage"), async (req: Request, res: Response, next: NextFunction) => {
172
- try {
173
- res.status(200).json(await auth.listRoles(req.authz!));
174
- } catch (err) {
175
- next(err);
176
- }
177
- });
178
-
179
- admin.route("post", "/roles", ability("roles:manage"), async (req: Request, res: Response, next: NextFunction) => {
180
- try {
181
- const body = req.body as Record<string, unknown>;
182
- res.status(201).json(
183
- await auth.createRole(
184
- req.authz!,
185
- {
186
- slug: requireString(body.slug, "slug"),
187
- name: optionalString(body.name),
188
- displayName: optionalString(body.displayName),
189
- description: optionalString(body.description) ?? null,
190
- },
191
- req.auth!.sub,
192
- ),
193
- );
194
- } catch (err) {
195
- next(err);
196
- }
197
- });
198
-
199
- admin.route("patch", "/roles/:roleId", ability("roles:manage"), async (req: Request, res: Response, next: NextFunction) => {
200
- try {
201
- const body = req.body as Record<string, unknown>;
202
- res.status(200).json(
203
- await auth.updateRole(
204
- req.authz!,
205
- requireString(req.params.roleId, "roleId"),
206
- {
207
- name: optionalString(body.name),
208
- displayName: optionalString(body.displayName),
209
- description: body.description === null ? null : optionalString(body.description),
210
- isActive: typeof body.isActive === "boolean" ? body.isActive : undefined,
211
- },
212
- req.auth!.sub,
213
- ),
214
- );
215
- } catch (err) {
216
- next(err);
217
- }
218
- });
219
-
220
- admin.route("delete", "/roles/:roleId", ability("roles:manage"), async (req: Request, res: Response, next: NextFunction) => {
221
- try {
222
- const body = (req.body ?? {}) as Record<string, unknown>;
223
- await auth.deleteRole(req.authz!, requireString(req.params.roleId, "roleId"), req.auth!.sub, optionalString(body.reason));
224
- res.status(200).json({ ok: true });
225
- } catch (err) {
226
- next(err);
227
- }
228
- });
229
-
230
- admin.route("post", "/roles/:roleId/permissions", ability("roles:manage"), async (req: Request, res: Response, next: NextFunction) => {
231
- try {
232
- const body = req.body as Record<string, unknown>;
233
- await auth.attachPermissionToRole(req.authz!, requireString(req.params.roleId, "roleId"), requireString(body.permission, "permission"), req.auth!.sub);
234
- res.status(201).json({ ok: true });
235
- } catch (err) {
236
- next(err);
237
- }
238
- });
239
-
240
- admin.route("post", "/users/:userId/roles", ability("roles:assign"), async (req: Request, res: Response, next: NextFunction) => {
241
- try {
242
- const body = req.body as Record<string, unknown>;
243
- await auth.assignRole(req.authz!, requireString(req.params.userId, "userId"), requireString(body.role, "role"));
244
- res.status(201).json({ ok: true });
245
- } catch (err) {
246
- next(err);
247
- }
248
- });
249
-
250
- admin.route("post", "/users/:userId/roles/:roleSlug/revoke", ability("roles:assign"), async (req: Request, res: Response, next: NextFunction) => {
251
- try {
252
- const userId = requireString(req.params.userId, "userId");
253
- // Revoking your own `admin` would strip the very permission that let you call this,
254
- // with no route back in. Assigning to yourself is fine — it can't lock anyone out.
255
- if (userId === req.auth!.sub) throw new HttpError(403, "cannot change your own roles");
256
- await auth.revokeRole(req.authz!, userId, requireString(req.params.roleSlug, "roleSlug"));
257
- res.status(201).json({ ok: true });
258
- } catch (err) {
259
- next(err);
260
- }
261
- });
262
-
263
- admin.route("post", "/users/:userId/permissions", ability("permissions:grant"), async (req: Request, res: Response, next: NextFunction) => {
264
- try {
265
- const body = req.body as Record<string, unknown>;
266
- await auth.grantPermission(req.authz!, requireString(req.params.userId, "userId"), requireString(body.permission, "permission"), req.auth!.sub);
267
- res.status(201).json({ ok: true });
268
- } catch (err) {
269
- next(err);
270
- }
271
- });
272
-
273
- admin.route("post", "/users/:userId/permissions/:permissionSlug/revoke", ability("permissions:grant"), async (req: Request, res: Response, next: NextFunction) => {
274
- try {
275
- await auth.revokePermission(req.authz!, requireString(req.params.userId, "userId"), requireString(req.params.permissionSlug, "permissionSlug"));
276
- res.status(201).json({ ok: true });
277
- } catch (err) {
278
- next(err);
279
- }
280
- });
281
-
282
- admin.route("post", "/users/:userId/block", ability("users:block"), async (req: Request, res: Response, next: NextFunction) => {
283
- try {
284
- const userId = requireString(req.params.userId, "userId");
285
- if (userId === req.auth!.sub) throw new HttpError(403, "cannot block your own account");
286
- await auth.block(req.authz!, userId, { userId: req.auth!.sub, ip: req.ip });
287
- res.status(201).json({ ok: true });
288
- } catch (err) {
289
- next(err);
290
- }
291
- });
292
-
293
- admin.route("post", "/users/:userId/unblock", ability("users:block"), async (req: Request, res: Response, next: NextFunction) => {
294
- try {
295
- await auth.unblock(req.authz!, requireString(req.params.userId, "userId"), { userId: req.auth!.sub, ip: req.ip });
296
- res.status(201).json({ ok: true });
297
- } catch (err) {
298
- next(err);
299
- }
300
- });
301
-
302
- admin.route("post", "/users/:userId/deactivate", ability("users:block"), async (req: Request, res: Response, next: NextFunction) => {
303
- try {
304
- const userId = requireString(req.params.userId, "userId");
305
- if (userId === req.auth!.sub) throw new HttpError(403, "cannot deactivate your own account");
306
- await auth.deactivate(req.authz!, userId, { userId: req.auth!.sub, ip: req.ip });
307
- res.status(201).json({ ok: true });
308
- } catch (err) {
309
- next(err);
310
- }
311
- });
312
-
313
- admin.route("post", "/users/:userId/activate", ability("users:block"), async (req: Request, res: Response, next: NextFunction) => {
314
- try {
315
- await auth.activate(req.authz!, requireString(req.params.userId, "userId"), { userId: req.auth!.sub, ip: req.ip });
316
- res.status(201).json({ ok: true });
317
- } catch (err) {
318
- next(err);
319
- }
320
- });
321
-
322
- return admin.handler;
323
- }
@@ -1,123 +0,0 @@
1
- import { Router } from "express";
2
- import type { NextFunction, Request, RequestHandler, Response } from "express";
3
- import { HttpError } from "./http-error.js";
4
- import { RbacRepository } from "./rbac.repository.js";
5
- import { ability, authenticated, createTieredRouter } from "./route-tiers.js";
6
- import { WorkspaceRepository } from "./workspace.repository.js";
7
- import "./request-context.js";
8
-
9
- function requireString(value: unknown, field: string): string {
10
- if (typeof value !== "string" || value.length === 0) throw new HttpError(400, `${field} is required`);
11
- return value;
12
- }
13
-
14
- function requireStringArray(value: unknown, field: string): string[] {
15
- if (!Array.isArray(value) || value.some((v) => typeof v !== "string")) throw new HttpError(400, `${field} must be an array of strings`);
16
- return value as string[];
17
- }
18
-
19
- export interface WorkspaceRouterDeps {
20
- workspaces: WorkspaceRepository;
21
- rbac: RbacRepository;
22
- authentication: RequestHandler;
23
- /** Resolves a workspace when the request names one, and does nothing when it does not. */
24
- authorization: RequestHandler;
25
- /** The same resolution, but the `X-Workspace-Id` header is mandatory. */
26
- workspaceScope: RequestHandler;
27
- }
28
-
29
- /**
30
- * Workspace membership. Every route below that acts *inside* a workspace names it with the
31
- * `X-Workspace-Id` header rather than a path segment — the same rule the `/auth/admin/*` routes
32
- * follow, so there is exactly one way a request says which workspace it means.
33
- *
34
- * Three routes here are deliberately tier 2 — `authenticated()`, any logged-in caller — and the
35
- * permission catalog mints no slugs for them. That is a decision written on each route, not an
36
- * omission: the tier is a required argument, so a route with none is a compile error
37
- * (route-tiers.ts).
38
- * • `POST /workspaces` and `GET /workspaces` are outside every workspace — any authenticated
39
- * user may create one or list their own. There is no workspace whose permissions could be
40
- * checked, and gating them on a permission granted *inside* some other workspace would mean
41
- * your first workspace could only be created by someone who already had one.
42
- * • `GET /workspaces/members` is gated on membership itself: the workspace middleware already
43
- * proved the caller belongs to the workspace, and seeing who else is in a room you are in is
44
- * not an administrative capability.
45
- * The three that mutate membership are permission-gated — see `rbac.defaults.ts` for the catalog.
46
- *
47
- * Two tiered routers, because the tier's middleware is what enforces the tier: the unscoped
48
- * routes resolve a workspace only if one is named, while everything under a workspace uses the
49
- * mandatory resolution. Mounting them in this order matters — the scoped router is consulted
50
- * first, so `/workspaces/members` reaches it rather than falling through.
51
- *
52
- * Replaces the reference combo's `WorkspaceController`.
53
- */
54
- export function createWorkspaceRouter(deps: WorkspaceRouterDeps): RequestHandler {
55
- const { workspaces, rbac, authentication, authorization, workspaceScope } = deps;
56
-
57
- const scoped = createTieredRouter({ authentication, authorization: workspaceScope });
58
- const unscoped = createTieredRouter({ authentication, authorization });
59
-
60
- unscoped.route("post", "/", authenticated(), async (req: Request, res: Response, next: NextFunction) => {
61
- try {
62
- const body = req.body as Record<string, unknown>;
63
- res.status(201).json(await workspaces.create(req.auth!.sub, requireString(body.name, "name")));
64
- } catch (err) {
65
- next(err);
66
- }
67
- });
68
-
69
- unscoped.route("get", "/", authenticated(), async (req: Request, res: Response, next: NextFunction) => {
70
- try {
71
- res.status(200).json(await workspaces.listForUser(req.auth!.sub));
72
- } catch (err) {
73
- next(err);
74
- }
75
- });
76
-
77
- scoped.route("get", "/members", authenticated(), async (req: Request, res: Response, next: NextFunction) => {
78
- try {
79
- res.status(200).json(await workspaces.listMembers(req.authz!.workspaceId));
80
- } catch (err) {
81
- next(err);
82
- }
83
- });
84
-
85
- scoped.route("post", "/members", ability("members:manage"), async (req: Request, res: Response, next: NextFunction) => {
86
- try {
87
- const body = req.body as Record<string, unknown>;
88
- // No `roles` in the body means "whatever this workspace flags as the default role" — the
89
- // default lives in a row, not in this line.
90
- const roles = body.roles === undefined ? undefined : requireStringArray(body.roles, "roles");
91
- res.status(201).json(await workspaces.addMember(req.authz!.workspaceId, requireString(body.email, "email"), roles));
92
- } catch (err) {
93
- next(err);
94
- }
95
- });
96
-
97
- scoped.route("put", "/members/:memberId/roles", ability("roles:assign"), async (req: Request, res: Response, next: NextFunction) => {
98
- try {
99
- const memberId = requireString(req.params.memberId, "memberId");
100
- if (memberId === req.authz!.memberId) throw new HttpError(403, "cannot change your own roles");
101
- const body = req.body as Record<string, unknown>;
102
- res.status(200).json(await rbac.setMemberRoles(req.authz!.workspaceId, memberId, requireStringArray(body.roles, "roles")));
103
- } catch (err) {
104
- next(err);
105
- }
106
- });
107
-
108
- scoped.route("delete", "/members/:memberId", ability("members:manage"), async (req: Request, res: Response, next: NextFunction) => {
109
- try {
110
- const memberId = requireString(req.params.memberId, "memberId");
111
- if (memberId === req.authz!.memberId) throw new HttpError(403, "cannot remove yourself from a workspace you administer");
112
- await workspaces.removeMember(req.authz!.workspaceId, memberId);
113
- res.status(200).json({ ok: true });
114
- } catch (err) {
115
- next(err);
116
- }
117
- });
118
-
119
- const router = Router();
120
- router.use(scoped.handler);
121
- router.use(unscoped.handler);
122
- return router;
123
- }