@simple-auth-kit/cli 1.4.3 → 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 +4 -4
  116. package/simple-auth-kit.ts +29 -2
  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,307 +0,0 @@
1
- import type { NextFunction, Request, RequestHandler, Response } from "express";
2
- import { AuthService } from "./auth.service.js";
3
- import { HttpError } from "./http-error.js";
4
- import { ability, createTieredRouter, type TierMiddleware } from "./route-tiers.js";
5
- import "./request-context.js";
6
-
7
- function requireString(value: unknown, field: string): string {
8
- if (typeof value !== "string" || value.length === 0) throw new HttpError(400, `${field} is required`);
9
- return value;
10
- }
11
-
12
- const optionalString = (value: unknown): string | undefined => (typeof value === "string" ? value : undefined);
13
-
14
- export interface AdminRouterDeps extends TierMiddleware {
15
- auth: AuthService;
16
- }
17
-
18
- /**
19
- * Administration of the whole deployment. Authority is a permission, never a role name: the authz
20
- * middleware resolves the caller's roles and permissions from the database on this request, builds
21
- * the CASL ability from them, and each route's `ability(...)` tier checks its slugs against it.
22
- * There is no role-based bypass — holding a role called "admin" that carries no permissions gets
23
- * exactly the same 403 as holding no role at all, which is why `npm run seed` (which provisions the
24
- * catalog and the roles that carry it) is a prerequisite for this router doing anything.
25
- *
26
- * Each route says what it demands; the rows say who is granted it. The slugs below are checked at
27
- * compile time against `PERMISSION_CATALOG` in `rbac.defaults.ts`, while who holds them — and
28
- * whether the permission is active at all — is edited through this very router and takes effect on
29
- * the next request. `GET /auth/me` returns the caller's slugs, and a console rebuilds the same
30
- * ability from them with the same function the middleware used.
31
- *
32
- * Replaces the reference combo's `AdminController`. Mounted under `/auth/admin` by
33
- * create-auth-app.ts; `createTieredRouter` stands in for its
34
- * `@UseGuards(AuthGuard, AuthzGuard, AbilityGuard)` — see route-tiers.ts for why the tier is a
35
- * required argument rather than a decorator.
36
- */
37
- export function createAdminRouter(deps: AdminRouterDeps): RequestHandler {
38
- const { auth, authentication, authorization } = deps;
39
- const admin = createTieredRouter({ authentication, authorization });
40
-
41
- admin.route("get", "/users", ability("users:read"), async (req: Request, res: Response, next: NextFunction) => {
42
- try {
43
- const { search, page, limit } = req.query as Record<string, string | undefined>;
44
- res.status(200).json(await auth.listUsers({ search, page: page ? Number(page) : undefined, limit: limit ? Number(limit) : undefined }));
45
- } catch (err) {
46
- next(err);
47
- }
48
- });
49
-
50
- admin.route("post", "/users", ability("users:manage"), async (req: Request, res: Response, next: NextFunction) => {
51
- try {
52
- const body = req.body as Record<string, unknown>;
53
- res.status(201).json(
54
- await auth.createUser(
55
- {
56
- email: requireString(body.email, "email"),
57
- password: requireString(body.password, "password"),
58
- firstName: optionalString(body.firstName),
59
- lastName: optionalString(body.lastName),
60
- displayName: optionalString(body.displayName),
61
- phone: optionalString(body.phone),
62
- username: optionalString(body.username),
63
- roles: Array.isArray(body.roles) ? body.roles.filter((role): role is string => typeof role === "string") : undefined,
64
- },
65
- req.auth!.sub,
66
- ),
67
- );
68
- } catch (err) {
69
- next(err);
70
- }
71
- });
72
-
73
- admin.route("get", "/users/:userId", ability("users:read"), async (req: Request, res: Response, next: NextFunction) => {
74
- try {
75
- res.status(200).json(await auth.getUser(requireString(req.params.userId, "userId")));
76
- } catch (err) {
77
- next(err);
78
- }
79
- });
80
-
81
- admin.route("patch", "/users/:userId", ability("users:manage"), async (req: Request, res: Response, next: NextFunction) => {
82
- try {
83
- const body = req.body as Record<string, unknown>;
84
- res.status(200).json(
85
- await auth.updateUser(
86
- requireString(req.params.userId, "userId"),
87
- {
88
- firstName: body.firstName === null ? null : optionalString(body.firstName),
89
- lastName: body.lastName === null ? null : optionalString(body.lastName),
90
- displayName: body.displayName === null ? null : optionalString(body.displayName),
91
- phone: body.phone === null ? null : optionalString(body.phone),
92
- username: body.username === null ? null : optionalString(body.username),
93
- photo: body.photo === null ? null : optionalString(body.photo),
94
- },
95
- req.auth!.sub,
96
- ),
97
- );
98
- } catch (err) {
99
- next(err);
100
- }
101
- });
102
-
103
- admin.route("delete", "/users/:userId", ability("users:manage"), async (req: Request, res: Response, next: NextFunction) => {
104
- try {
105
- const userId = requireString(req.params.userId, "userId");
106
- if (userId === req.auth!.sub) throw new HttpError(403, "cannot delete your own account");
107
- const body = (req.body ?? {}) as Record<string, unknown>;
108
- await auth.deleteUser(userId, req.auth!.sub, optionalString(body.reason));
109
- res.status(200).json({ ok: true });
110
- } catch (err) {
111
- next(err);
112
- }
113
- });
114
-
115
- admin.route("get", "/audit-log", ability("audit-log:read"), async (req: Request, res: Response, next: NextFunction) => {
116
- try {
117
- const { userId, action, since, until, page, limit } = req.query as Record<string, string | undefined>;
118
- res.status(200).json(
119
- await auth.listAuditLog({ userId, action, since, until, page: page ? Number(page) : undefined, limit: limit ? Number(limit) : undefined }),
120
- );
121
- } catch (err) {
122
- next(err);
123
- }
124
- });
125
-
126
- admin.route("get", "/permissions", ability("permissions:read"), async (_req: Request, res: Response, next: NextFunction) => {
127
- try {
128
- res.status(200).json(await auth.listPermissions());
129
- } catch (err) {
130
- next(err);
131
- }
132
- });
133
-
134
- admin.route("post", "/permissions", ability("permissions:define"), async (req: Request, res: Response, next: NextFunction) => {
135
- try {
136
- const body = req.body as Record<string, unknown>;
137
- res.status(201).json(
138
- await auth.definePermission(
139
- {
140
- slug: requireString(body.slug, "slug"),
141
- name: optionalString(body.name),
142
- displayName: optionalString(body.displayName),
143
- description: body.description === null ? null : optionalString(body.description),
144
- group: optionalString(body.group),
145
- groupOrder: typeof body.groupOrder === "number" ? body.groupOrder : undefined,
146
- order: typeof body.order === "number" ? body.order : undefined,
147
- isActive: typeof body.isActive === "boolean" ? body.isActive : undefined,
148
- },
149
- req.auth!.sub,
150
- ),
151
- );
152
- } catch (err) {
153
- next(err);
154
- }
155
- });
156
-
157
- admin.route("get", "/roles", ability("roles:manage"), async (_req: Request, res: Response, next: NextFunction) => {
158
- try {
159
- res.status(200).json(await auth.listRoles());
160
- } catch (err) {
161
- next(err);
162
- }
163
- });
164
-
165
- admin.route("post", "/roles", ability("roles:manage"), async (req: Request, res: Response, next: NextFunction) => {
166
- try {
167
- const body = req.body as Record<string, unknown>;
168
- res.status(201).json(
169
- await auth.createRole(
170
- {
171
- slug: requireString(body.slug, "slug"),
172
- name: optionalString(body.name),
173
- displayName: optionalString(body.displayName),
174
- description: optionalString(body.description) ?? null,
175
- },
176
- req.auth!.sub,
177
- ),
178
- );
179
- } catch (err) {
180
- next(err);
181
- }
182
- });
183
-
184
- admin.route("patch", "/roles/:roleId", ability("roles:manage"), async (req: Request, res: Response, next: NextFunction) => {
185
- try {
186
- const body = req.body as Record<string, unknown>;
187
- res.status(200).json(
188
- await auth.updateRole(
189
- requireString(req.params.roleId, "roleId"),
190
- {
191
- name: optionalString(body.name),
192
- displayName: optionalString(body.displayName),
193
- description: body.description === null ? null : optionalString(body.description),
194
- isActive: typeof body.isActive === "boolean" ? body.isActive : undefined,
195
- },
196
- req.auth!.sub,
197
- ),
198
- );
199
- } catch (err) {
200
- next(err);
201
- }
202
- });
203
-
204
- admin.route("delete", "/roles/:roleId", ability("roles:manage"), async (req: Request, res: Response, next: NextFunction) => {
205
- try {
206
- const body = (req.body ?? {}) as Record<string, unknown>;
207
- await auth.deleteRole(requireString(req.params.roleId, "roleId"), req.auth!.sub, optionalString(body.reason));
208
- res.status(200).json({ ok: true });
209
- } catch (err) {
210
- next(err);
211
- }
212
- });
213
-
214
- admin.route("post", "/roles/:roleId/permissions", ability("roles:manage"), async (req: Request, res: Response, next: NextFunction) => {
215
- try {
216
- const body = req.body as Record<string, unknown>;
217
- await auth.attachPermissionToRole(requireString(req.params.roleId, "roleId"), requireString(body.permission, "permission"), req.auth!.sub);
218
- res.status(201).json({ ok: true });
219
- } catch (err) {
220
- next(err);
221
- }
222
- });
223
-
224
- admin.route("post", "/users/:userId/roles", ability("roles:assign"), async (req: Request, res: Response, next: NextFunction) => {
225
- try {
226
- const body = req.body as Record<string, unknown>;
227
- await auth.assignRole(requireString(req.params.userId, "userId"), requireString(body.role, "role"));
228
- res.status(201).json({ ok: true });
229
- } catch (err) {
230
- next(err);
231
- }
232
- });
233
-
234
- admin.route("post", "/users/:userId/roles/:roleSlug/revoke", ability("roles:assign"), async (req: Request, res: Response, next: NextFunction) => {
235
- try {
236
- const userId = requireString(req.params.userId, "userId");
237
- // Revoking your own `admin` would strip the very permission that let you call this,
238
- // with no route back in. Assigning to yourself is fine — it can't lock anyone out.
239
- if (userId === req.auth!.sub) throw new HttpError(403, "cannot change your own roles");
240
- await auth.revokeRole(userId, requireString(req.params.roleSlug, "roleSlug"));
241
- res.status(201).json({ ok: true });
242
- } catch (err) {
243
- next(err);
244
- }
245
- });
246
-
247
- admin.route("post", "/users/:userId/permissions", ability("permissions:grant"), async (req: Request, res: Response, next: NextFunction) => {
248
- try {
249
- const body = req.body as Record<string, unknown>;
250
- await auth.grantPermission(requireString(req.params.userId, "userId"), requireString(body.permission, "permission"), req.auth!.sub);
251
- res.status(201).json({ ok: true });
252
- } catch (err) {
253
- next(err);
254
- }
255
- });
256
-
257
- admin.route("post", "/users/:userId/permissions/:permissionSlug/revoke", ability("permissions:grant"), async (req: Request, res: Response, next: NextFunction) => {
258
- try {
259
- await auth.revokePermission(requireString(req.params.userId, "userId"), requireString(req.params.permissionSlug, "permissionSlug"));
260
- res.status(201).json({ ok: true });
261
- } catch (err) {
262
- next(err);
263
- }
264
- });
265
-
266
- admin.route("post", "/users/:userId/block", ability("users:block"), async (req: Request, res: Response, next: NextFunction) => {
267
- try {
268
- const userId = requireString(req.params.userId, "userId");
269
- if (userId === req.auth!.sub) throw new HttpError(403, "cannot block your own account");
270
- await auth.block(userId, { userId: req.auth!.sub, ip: req.ip });
271
- res.status(201).json({ ok: true });
272
- } catch (err) {
273
- next(err);
274
- }
275
- });
276
-
277
- admin.route("post", "/users/:userId/unblock", ability("users:block"), async (req: Request, res: Response, next: NextFunction) => {
278
- try {
279
- await auth.unblock(requireString(req.params.userId, "userId"), { userId: req.auth!.sub, ip: req.ip });
280
- res.status(201).json({ ok: true });
281
- } catch (err) {
282
- next(err);
283
- }
284
- });
285
-
286
- admin.route("post", "/users/:userId/deactivate", ability("users:block"), async (req: Request, res: Response, next: NextFunction) => {
287
- try {
288
- const userId = requireString(req.params.userId, "userId");
289
- if (userId === req.auth!.sub) throw new HttpError(403, "cannot deactivate your own account");
290
- await auth.deactivate(userId, { userId: req.auth!.sub, ip: req.ip });
291
- res.status(201).json({ ok: true });
292
- } catch (err) {
293
- next(err);
294
- }
295
- });
296
-
297
- admin.route("post", "/users/:userId/activate", ability("users:block"), async (req: Request, res: Response, next: NextFunction) => {
298
- try {
299
- await auth.activate(requireString(req.params.userId, "userId"), { userId: req.auth!.sub, ip: req.ip });
300
- res.status(201).json({ ok: true });
301
- } catch (err) {
302
- next(err);
303
- }
304
- });
305
-
306
- return admin.handler;
307
- }
@@ -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
- }