@open-pencil/cloud 0.17.0-beta.1 → 0.17.0-beta.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (235) hide show
  1. package/README.md +1 -1
  2. package/dist/bin/{ai-relay.mjs → services.mjs} +8 -8
  3. package/dist/bin/services.mjs.map +1 -0
  4. package/dist/client.d.ts +236 -46
  5. package/dist/client.d.ts.map +1 -1
  6. package/dist/client.js +649 -400
  7. package/dist/client.js.map +1 -1
  8. package/dist/contract.d.ts +2 -2
  9. package/dist/contract.js +2 -2
  10. package/dist/contract2.js +680 -443
  11. package/dist/contract2.js.map +1 -1
  12. package/dist/email.d.ts +9 -1
  13. package/dist/email.d.ts.map +1 -1
  14. package/dist/email.js +99 -58
  15. package/dist/email.js.map +1 -1
  16. package/dist/index.d.ts +468 -64
  17. package/dist/index.d.ts.map +1 -1
  18. package/dist/listen.mjs +575 -738
  19. package/dist/listen.mjs.map +1 -1
  20. package/dist/runtime-node.d.mts +6564 -2934
  21. package/dist/runtime-node.d.mts.map +1 -1
  22. package/dist/runtime-node.mjs +6 -5
  23. package/dist/runtime-node.mjs.map +1 -1
  24. package/dist/server.d.ts +8931 -4198
  25. package/dist/server.d.ts.map +1 -1
  26. package/dist/server.js +5260 -3859
  27. package/dist/server.js.map +1 -1
  28. package/dist/server.mjs +5686 -3736
  29. package/dist/server.mjs.map +1 -1
  30. package/dist/server2.mjs +101 -79
  31. package/dist/server2.mjs.map +1 -1
  32. package/package.json +9 -6
  33. package/src/admin/api/routes.ts +103 -33
  34. package/src/admin/audit/service.ts +25 -6
  35. package/src/admin/documents/service.ts +361 -0
  36. package/src/admin/errors.ts +9 -1
  37. package/src/admin/index.ts +6 -0
  38. package/src/admin/operations/service.ts +7 -0
  39. package/src/admin/reports/service.ts +147 -0
  40. package/src/admin/schema.ts +6 -0
  41. package/src/client/api.ts +36 -21
  42. package/src/client/auth/navigation.ts +6 -5
  43. package/src/client/index.ts +7 -7
  44. package/src/client/portal/account.ts +25 -0
  45. package/src/client/portal/administration.ts +56 -0
  46. package/src/client/{ai.ts → services.ts} +44 -27
  47. package/src/contract/account.ts +58 -2
  48. package/src/contract/admin/index.ts +67 -3
  49. package/src/contract/collaboration.ts +6 -1
  50. package/src/contract/discovery.ts +22 -4
  51. package/src/contract/documents.ts +27 -0
  52. package/src/contract/entitlements.ts +2 -2
  53. package/src/contract/index.ts +63 -37
  54. package/src/contract/relay.ts +6 -0
  55. package/src/contract/reports.ts +42 -0
  56. package/src/contract/services.ts +233 -0
  57. package/src/contract/sharing.ts +3 -9
  58. package/src/email/render.ts +26 -0
  59. package/src/email/schema.ts +11 -1
  60. package/src/email/templates/brand.ts +1 -1
  61. package/src/runtime/cloudflare/environment.ts +31 -6
  62. package/src/runtime/cloudflare/index.ts +1 -1
  63. package/src/runtime/cloudflare/logging.ts +15 -0
  64. package/src/runtime/cloudflare/maintenance.ts +31 -0
  65. package/src/runtime/cloudflare/relay/index.ts +176 -0
  66. package/src/runtime/cloudflare/relay/sockets.ts +112 -0
  67. package/src/runtime/cloudflare/worker.ts +89 -26
  68. package/src/runtime/node/application.ts +5 -3
  69. package/src/runtime/node/bootstrap.ts +20 -4
  70. package/src/runtime/node/cleanup.ts +16 -3
  71. package/src/runtime/node/entitlements/main.ts +14 -11
  72. package/src/runtime/node/index.ts +1 -1
  73. package/src/runtime/node/migrate.ts +5 -1
  74. package/src/runtime/node/relay.ts +8 -2
  75. package/src/runtime/node/request-id.ts +13 -0
  76. package/src/runtime/node/server.ts +71 -15
  77. package/src/runtime/node/{ai-relay → services}/main.ts +6 -6
  78. package/src/runtime/node/{ai-relay → services}/server.ts +18 -18
  79. package/src/runtime/postgres/database.ts +20 -1
  80. package/src/runtime/posthog/errors.ts +32 -0
  81. package/src/runtime/s3/objects.ts +50 -1
  82. package/src/runtime/site/server.ts +33 -4
  83. package/src/server/account/actions.ts +5 -0
  84. package/src/server/account/deletion.ts +302 -0
  85. package/src/server/account/routes.ts +47 -3
  86. package/src/server/account/terms.ts +42 -0
  87. package/src/server/api/router.ts +12 -7
  88. package/src/server/api/types.ts +9 -0
  89. package/src/server/app.ts +93 -15
  90. package/src/server/auth/access-control.ts +63 -0
  91. package/src/server/auth/adapter.ts +11 -0
  92. package/src/server/auth/endpoints.ts +5 -1
  93. package/src/server/auth/factory.ts +30 -3
  94. package/src/server/auth/index.ts +10 -1
  95. package/src/server/cleanup/configured.ts +12 -5
  96. package/src/server/cleanup/documents.ts +165 -71
  97. package/src/server/cleanup/objects.ts +10 -2
  98. package/src/server/cleanup/revisions.ts +24 -7
  99. package/src/server/cleanup/uploads.ts +8 -2
  100. package/src/server/cleanup/worker.ts +5 -2
  101. package/src/server/collaboration/index.ts +3 -0
  102. package/src/server/collaboration/relay/connection.ts +196 -0
  103. package/src/server/collaboration/relay/documents.ts +13 -10
  104. package/src/server/collaboration/relay/hub.ts +279 -195
  105. package/src/server/collaboration/relay/index.ts +3 -1
  106. package/src/server/collaboration/relay/log.ts +79 -0
  107. package/src/server/collaboration/relay/persistence.ts +147 -22
  108. package/src/server/collaboration/relay/resume.ts +28 -0
  109. package/src/server/collaboration/routes.ts +27 -16
  110. package/src/server/collaboration/service.ts +27 -31
  111. package/src/server/config/deployment.ts +35 -4
  112. package/src/server/config/public.ts +5 -4
  113. package/src/server/config/schema.ts +104 -16
  114. package/src/server/db/expressions.ts +15 -1
  115. package/src/server/db/migrate.ts +34 -114
  116. package/src/server/db/migrations/001_accounts.ts +79 -0
  117. package/src/server/db/migrations/002_workspaces.ts +48 -0
  118. package/src/server/db/migrations/003_storage.ts +44 -0
  119. package/src/server/db/migrations/004_documents.ts +193 -0
  120. package/src/server/db/migrations/005_sharing.ts +95 -0
  121. package/src/server/db/migrations/006_operations.ts +110 -0
  122. package/src/server/db/migrations/007_trash.ts +33 -0
  123. package/src/server/db/migrations/008_terms.ts +18 -0
  124. package/src/server/db/migrations/schema.ts +71 -0
  125. package/src/server/db/tables.ts +70 -7
  126. package/src/server/documents/access.ts +66 -55
  127. package/src/server/documents/errors.ts +7 -0
  128. package/src/server/documents/images.ts +2 -1
  129. package/src/server/documents/limits.ts +9 -9
  130. package/src/server/documents/purge.ts +75 -0
  131. package/src/server/documents/repository.ts +2 -0
  132. package/src/server/documents/routes.ts +132 -80
  133. package/src/server/documents/service.ts +18 -4
  134. package/src/server/documents/summary.ts +1 -0
  135. package/src/server/documents/trash.ts +203 -0
  136. package/src/server/documents/versions/checkpoint.ts +2 -1
  137. package/src/server/documents/versions/history.ts +11 -7
  138. package/src/server/documents/versions/routes.ts +36 -25
  139. package/src/server/documents/versions/service.ts +22 -4
  140. package/src/server/errors/index.ts +99 -0
  141. package/src/server/errors/posthog.ts +80 -0
  142. package/src/server/index.ts +56 -16
  143. package/src/server/internal/index.ts +3 -3
  144. package/src/server/internal/routes.ts +7 -15
  145. package/src/server/internal/schema.ts +1 -1
  146. package/src/server/internal/service.ts +17 -23
  147. package/src/server/invitations/budget.ts +66 -0
  148. package/src/server/invitations/index.ts +1 -0
  149. package/src/server/logging.ts +76 -0
  150. package/src/server/objects/types.ts +12 -0
  151. package/src/server/pictures/routes.ts +4 -2
  152. package/src/server/pictures/service.ts +2 -1
  153. package/src/server/policy/database.ts +39 -25
  154. package/src/server/policy/index.ts +2 -1
  155. package/src/server/policy/keys.ts +5 -2
  156. package/src/server/policy/policy.ts +1 -0
  157. package/src/server/policy/schema.ts +2 -2
  158. package/src/server/policy/service.ts +12 -9
  159. package/src/server/policy/static.ts +5 -5
  160. package/src/server/policy/workspace.ts +41 -0
  161. package/src/server/quota/reconcile.ts +2 -0
  162. package/src/server/quota/storage.ts +69 -31
  163. package/src/server/rate-limit/cleanup.ts +17 -5
  164. package/src/server/rate-limit/index.ts +4 -1
  165. package/src/server/rate-limit/middleware.ts +100 -12
  166. package/src/server/reports/index.ts +8 -0
  167. package/src/server/reports/routes.ts +37 -0
  168. package/src/server/reports/service.ts +123 -0
  169. package/src/server/services/errors.ts +7 -0
  170. package/src/server/services/index.ts +8 -0
  171. package/src/server/{ai → services}/keys.ts +11 -11
  172. package/src/server/services/routes.ts +47 -0
  173. package/src/server/{ai/service.ts → services/tokens.ts} +23 -20
  174. package/src/server/sharing/capabilities/service.ts +68 -22
  175. package/src/server/sharing/document-routes.ts +30 -22
  176. package/src/server/sharing/grants/service.ts +11 -18
  177. package/src/server/sharing/http.ts +4 -0
  178. package/src/server/sharing/invitations/service.ts +21 -11
  179. package/src/server/sharing/policy.ts +9 -14
  180. package/src/server/sharing/routes.ts +108 -85
  181. package/src/server/sharing/service.ts +1 -17
  182. package/src/server/validation.ts +59 -2
  183. package/src/server/workspaces/index.ts +1 -0
  184. package/src/server/workspaces/members.ts +89 -38
  185. package/src/server/workspaces/repository.ts +2 -1
  186. package/src/server/workspaces/routes.ts +67 -45
  187. package/src/{ai-relay → services}/app.ts +48 -44
  188. package/src/{ai-relay → services}/config.ts +25 -19
  189. package/src/services/db/index.ts +10 -0
  190. package/src/services/db/migrate.ts +37 -0
  191. package/src/{ai-relay/db/migrations/001_usage.ts → services/db/migrations/001_baseline.ts} +18 -7
  192. package/src/services/db/schema.ts +22 -0
  193. package/src/services/index.ts +18 -0
  194. package/src/{ai-relay → services}/metering.ts +2 -2
  195. package/src/{ai-relay → services}/usage.ts +43 -19
  196. package/dist/bin/ai-relay.mjs.map +0 -1
  197. package/src/ai-relay/db/index.ts +0 -10
  198. package/src/ai-relay/db/migrate.ts +0 -32
  199. package/src/ai-relay/db/schema.ts +0 -20
  200. package/src/ai-relay/index.ts +0 -18
  201. package/src/contract/ai.ts +0 -150
  202. package/src/runtime/cloudflare/relay.ts +0 -136
  203. package/src/server/ai/errors.ts +0 -7
  204. package/src/server/ai/index.ts +0 -4
  205. package/src/server/ai/routes.ts +0 -43
  206. package/src/server/auth/workspace-access.ts +0 -23
  207. package/src/server/db/migrations/001_foundation.ts +0 -164
  208. package/src/server/db/migrations/002_upload_cleanup_claims.ts +0 -34
  209. package/src/server/db/migrations/003_document_cleanup_claims.ts +0 -23
  210. package/src/server/db/migrations/004_document_sharing.ts +0 -82
  211. package/src/server/db/migrations/005_document_collaboration_epoch.ts +0 -13
  212. package/src/server/db/migrations/006_invitation_continuation.ts +0 -27
  213. package/src/server/db/migrations/007_collaboration_state.ts +0 -25
  214. package/src/server/db/migrations/008_storage_reservations.ts +0 -37
  215. package/src/server/db/migrations/009_workspace_entitlements.ts +0 -22
  216. package/src/server/db/migrations/010_upload_finalization.ts +0 -22
  217. package/src/server/db/migrations/011_upload_finalization_lease.ts +0 -12
  218. package/src/server/db/migrations/012_transactional_email.ts +0 -48
  219. package/src/server/db/migrations/013_admin_enrollment.ts +0 -54
  220. package/src/server/db/migrations/014_enrollment_email_kinds.ts +0 -30
  221. package/src/server/db/migrations/015_cloud_rate_limit.ts +0 -22
  222. package/src/server/db/migrations/016_auth_schema.ts +0 -16
  223. package/src/server/db/migrations/017_authentication_email_kinds.ts +0 -32
  224. package/src/server/db/migrations/018_authentication_mfa.ts +0 -78
  225. package/src/server/db/migrations/019_better_auth_account_issuer.ts +0 -42
  226. package/src/server/db/migrations/020_workspace_invitations.ts +0 -57
  227. package/src/server/db/migrations/021_document_versions.ts +0 -66
  228. package/src/server/db/migrations/022_entitlement_external_version.ts +0 -17
  229. package/src/server/db/migrations/023_document_images.ts +0 -61
  230. package/src/server/db/migrations/024_account_activity.ts +0 -66
  231. package/src/server/db/migrations/025_table_names.ts +0 -58
  232. package/src/server/db/migrations/026_user_picture.ts +0 -30
  233. package/src/server/db/migrations/027_document_kind.ts +0 -19
  234. package/src/server/db/migrations/helpers.ts +0 -78
  235. /package/dist/bin/{ai-relay.d.mts → services.d.mts} +0 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@open-pencil/cloud",
3
- "version": "0.17.0-beta.1",
3
+ "version": "0.17.0-beta.4",
4
4
  "license": "Apache-2.0 AND MIT",
5
5
  "files": [
6
6
  "dist",
@@ -10,7 +10,7 @@
10
10
  "LICENSE-MIT"
11
11
  ],
12
12
  "bin": {
13
- "openpencil-ai-relay": "./dist/bin/ai-relay.mjs",
13
+ "openpencil-services": "./dist/bin/services.mjs",
14
14
  "openpencil-cloud": "./dist/bin/server.mjs"
15
15
  },
16
16
  "dependencies": {
@@ -22,7 +22,7 @@
22
22
  "@hono/node-server": "^1.19.17",
23
23
  "@internationalized/date": "^3.12.3",
24
24
  "@noble/hashes": "^2.4.0",
25
- "@open-pencil/scene-graph": "^0.17.0-beta.1",
25
+ "@open-pencil/scene-graph": "^0.17.0-beta.4",
26
26
  "@openfeature/server-sdk": "^1.23.0",
27
27
  "@vue-email/components": "^0.0.21",
28
28
  "@vue-email/render": "^0.0.9",
@@ -39,6 +39,7 @@
39
39
  "kysely": "^0.29.6",
40
40
  "lib0": "^0.2.117",
41
41
  "nodemailer": "^9.0.5",
42
+ "posthog-node": "5.56.0",
42
43
  "smol-toml": "^1.8.0",
43
44
  "ufo": "^1.6.4",
44
45
  "valibot": "^1.5.0",
@@ -83,14 +84,13 @@
83
84
  },
84
85
  "imports": {
85
86
  "#cloud/admin": "./src/admin/index.ts",
86
- "#cloud/ai-relay": "./src/ai-relay/index.ts",
87
+ "#cloud/services": "./src/services/index.ts",
87
88
  "#cloud/client": "./src/client/index.ts",
88
89
  "#cloud/contract": "./src/contract/index.ts",
89
90
  "#cloud/email": "./src/email/index.ts",
90
91
  "#cloud/runtime/cloudflare": "./src/runtime/cloudflare/index.ts",
91
92
  "#cloud/runtime/node": "./src/runtime/node/index.ts",
92
93
  "#cloud/server": "./src/server/index.ts",
93
- "#cloud/server/ai": "./src/server/ai/index.ts",
94
94
  "#cloud/server/api": "./src/server/api/index.ts",
95
95
  "#cloud/server/auth": "./src/server/auth/index.ts",
96
96
  "#cloud/server/cleanup": "./src/server/cleanup/index.ts",
@@ -100,6 +100,7 @@
100
100
  "#cloud/server/documents": "./src/server/documents/index.ts",
101
101
  "#cloud/server/documents/versions": "./src/server/documents/versions/index.ts",
102
102
  "#cloud/server/email": "./src/server/email/index.ts",
103
+ "#cloud/server/errors": "./src/server/errors/index.ts",
103
104
  "#cloud/server/internal": "./src/server/internal/index.ts",
104
105
  "#cloud/server/invitations": "./src/server/invitations/index.ts",
105
106
  "#cloud/server/objects": "./src/server/objects/index.ts",
@@ -107,12 +108,14 @@
107
108
  "#cloud/server/policy": "./src/server/policy/index.ts",
108
109
  "#cloud/server/quota": "./src/server/quota/index.ts",
109
110
  "#cloud/server/rate-limit": "./src/server/rate-limit/index.ts",
111
+ "#cloud/server/reports": "./src/server/reports/index.ts",
112
+ "#cloud/server/services": "./src/server/services/index.ts",
110
113
  "#cloud/server/sharing": "./src/server/sharing/index.ts",
111
114
  "#cloud/server/workspaces": "./src/server/workspaces/index.ts",
112
115
  "#cloud/*": "./src/*.ts",
113
116
  "#cloud-tests/*": "./tests/*.ts"
114
117
  },
115
- "description": "Self-hostable OpenPencil Cloud: accounts, workspaces, document revisions, sharing, collaboration, and the AI relay, for Node and Cloudflare Workers.",
118
+ "description": "Self-hostable OpenPencil Cloud: accounts, workspaces, document revisions, sharing, collaboration, and the services server, for Node and Cloudflare Workers.",
116
119
  "repository": {
117
120
  "type": "git",
118
121
  "url": "git+https://github.com/open-pencil/open-pencil.git",
@@ -1,11 +1,14 @@
1
1
  import { requireTrustedMutationOrigin } from '#cloud/admin/api/security'
2
2
  import type { AdminAuditService } from '#cloud/admin/audit/service'
3
+ import type { AdminDocumentService } from '#cloud/admin/documents/service'
3
4
  import type { AdminEmailService } from '#cloud/admin/email/service'
4
5
  import type { EnrollmentService } from '#cloud/admin/enrollment/service'
5
6
  import { adminErrorStatus, AdminDomainError } from '#cloud/admin/errors'
6
7
  import type { AdminOperationsService } from '#cloud/admin/operations/service'
8
+ import type { AdminReportService } from '#cloud/admin/reports/service'
7
9
  import {
8
10
  enrollmentStatusSchema,
11
+ parseDocumentTakedown,
9
12
  parseEnrollmentReview,
10
13
  parseUserMutation,
11
14
  parseUserRoleMutation
@@ -13,14 +16,16 @@ import {
13
16
  import type { AdminUserService } from '#cloud/admin/users/service'
14
17
  import {
15
18
  cloudAdminAuditFilterSchema,
19
+ cloudAdminDocumentFilterSchema,
16
20
  cloudAdminEmailFilterSchema,
21
+ cloudAdminReportFilterSchema,
17
22
  cloudAdminUserFilterSchema
18
23
  } from '#cloud/contract'
19
24
  import type { CloudAPIEnvironment } from '#cloud/server/api'
20
25
  import type { CloudAuthAdapter } from '#cloud/server/auth'
21
26
  import type { CloudDatabase } from '#cloud/server/db'
22
27
  import { CLOUD_RATE_LIMITS, createActorRateLimiter } from '#cloud/server/rate-limit'
23
- import { validatedJSON, validatedQuery } from '#cloud/server/validation'
28
+ import { idParams, validatedJSON, validatedQuery } from '#cloud/server/validation'
24
29
  import { Hono, type Context } from 'hono'
25
30
  import { NoResultError, type Kysely } from 'kysely'
26
31
  import * as v from 'valibot'
@@ -44,6 +49,8 @@ const parseEnrollmentQuery = listQuery(enrollmentStatusSchema)
44
49
  const parseUserQuery = listQuery(cloudAdminUserFilterSchema)
45
50
  const parseEmailQuery = listQuery(cloudAdminEmailFilterSchema)
46
51
  const parseAuditQuery = listQuery(cloudAdminAuditFilterSchema)
52
+ const parseDocumentQuery = listQuery(cloudAdminDocumentFilterSchema)
53
+ const parseReportQuery = listQuery(cloudAdminReportFilterSchema)
47
54
  /** Accounts are named by UUID; anything else names no one, rather than failing the query. */
48
55
  const accountIdSchema = v.pipe(v.string(), v.uuid())
49
56
 
@@ -66,6 +73,8 @@ export type CloudAdminServices = {
66
73
  users: AdminUserService
67
74
  audit: AdminAuditService
68
75
  operations: AdminOperationsService
76
+ documents: AdminDocumentService
77
+ reports: AdminReportService
69
78
  }
70
79
 
71
80
  export function createCloudAdminRoutes(
@@ -123,42 +132,53 @@ export function createCloudAdminRoutes(
123
132
  .get('/enrollments', validatedQuery(parseEnrollmentQuery), async (context) =>
124
133
  context.json(await services.enrollment.list(context.req.valid('query')))
125
134
  )
126
- .post('/enrollments/:id/approve', validatedJSON(parseEnrollmentReview), async (context) =>
127
- context.json({
128
- enrollment: await services.enrollment.review(
129
- context.get('actor').userId,
130
- context.req.param('id'),
131
- 'approved',
132
- context.req.valid('json')
133
- )
134
- })
135
+ .post(
136
+ '/enrollments/:id/approve',
137
+ idParams,
138
+ validatedJSON(parseEnrollmentReview),
139
+ async (context) =>
140
+ context.json({
141
+ enrollment: await services.enrollment.review(
142
+ context.get('actor').userId,
143
+ context.req.valid('param').id,
144
+ 'approved',
145
+ context.req.valid('json')
146
+ )
147
+ })
135
148
  )
136
- .post('/enrollments/:id/reject', validatedJSON(parseEnrollmentReview), async (context) =>
137
- context.json({
138
- enrollment: await services.enrollment.review(
139
- context.get('actor').userId,
140
- context.req.param('id'),
141
- 'rejected',
142
- context.req.valid('json')
143
- )
144
- })
149
+ .post(
150
+ '/enrollments/:id/reject',
151
+ idParams,
152
+ validatedJSON(parseEnrollmentReview),
153
+ async (context) =>
154
+ context.json({
155
+ enrollment: await services.enrollment.review(
156
+ context.get('actor').userId,
157
+ context.req.valid('param').id,
158
+ 'rejected',
159
+ context.req.valid('json')
160
+ )
161
+ })
145
162
  )
146
- .post('/enrollments/:id/revoke', validatedJSON(parseEnrollmentReview), async (context) =>
147
- context.json({
148
- enrollment: await services.enrollment.review(
149
- context.get('actor').userId,
150
- context.req.param('id'),
151
- 'revoked',
152
- context.req.valid('json')
153
- )
154
- })
163
+ .post(
164
+ '/enrollments/:id/revoke',
165
+ idParams,
166
+ validatedJSON(parseEnrollmentReview),
167
+ async (context) =>
168
+ context.json({
169
+ enrollment: await services.enrollment.review(
170
+ context.get('actor').userId,
171
+ context.req.valid('param').id,
172
+ 'revoked',
173
+ context.req.valid('json')
174
+ )
175
+ })
155
176
  )
156
177
  .get('/users', validatedQuery(parseUserQuery), async (context) =>
157
178
  context.json(await services.users.list(context.req.valid('query')))
158
179
  )
159
- .get('/users/:id', async (context) => {
160
- const id = context.req.param('id')
161
- const detail = v.is(accountIdSchema, id) ? await services.users.detail(id) : null
180
+ .get('/users/:id', idParams, async (context) => {
181
+ const detail = await services.users.detail(context.req.valid('param').id)
162
182
  if (!detail) return context.json({ error: { code: 'not_found' as const } }, 404)
163
183
  return context.json(detail)
164
184
  })
@@ -209,14 +229,64 @@ export function createCloudAdminRoutes(
209
229
  .get('/email', validatedQuery(parseEmailQuery), async (context) =>
210
230
  context.json(await services.email.list(context.req.valid('query')))
211
231
  )
212
- .post('/email/:id/regenerate', async (context) => {
213
- await services.email.regenerate(context.get('actor').userId, context.req.param('id'))
232
+ .post('/email/:id/regenerate', idParams, async (context) => {
233
+ await services.email.regenerate(context.get('actor').userId, context.req.valid('param').id)
214
234
  return context.json({ ok: true as const })
215
235
  })
216
236
  .get('/audit', validatedQuery(parseAuditQuery), async (context) =>
217
237
  context.json(await services.audit.list(context.req.valid('query')))
218
238
  )
219
239
  .get('/operations', async (context) => context.json(await services.operations.summary()))
240
+ .get('/reports', validatedQuery(parseReportQuery), async (context) =>
241
+ context.json(await services.reports.list(context.req.valid('query')))
242
+ )
243
+ .post('/reports/:id/dismiss', idParams, async (context) => {
244
+ await services.reports.resolve(
245
+ context.get('actor').userId,
246
+ context.req.valid('param').id,
247
+ 'dismissed'
248
+ )
249
+ return context.json({ ok: true as const })
250
+ })
251
+ .post('/reports/:id/action', idParams, async (context) => {
252
+ await services.reports.resolve(
253
+ context.get('actor').userId,
254
+ context.req.valid('param').id,
255
+ 'actioned'
256
+ )
257
+ return context.json({ ok: true as const })
258
+ })
259
+ .get('/documents', validatedQuery(parseDocumentQuery), async (context) =>
260
+ context.json(await services.documents.list(context.req.valid('query')))
261
+ )
262
+ .post(
263
+ '/documents/:id/disable',
264
+ idParams,
265
+ validatedJSON(parseDocumentTakedown),
266
+ async (context) => {
267
+ await services.documents.disable(
268
+ context.get('actor').userId,
269
+ context.req.valid('param').id,
270
+ context.req.valid('json').reason
271
+ )
272
+ return context.json({ ok: true as const })
273
+ }
274
+ )
275
+ .post('/documents/:id/enable', idParams, async (context) => {
276
+ await services.documents.enable(context.get('actor').userId, context.req.valid('param').id)
277
+ return context.json({ ok: true as const })
278
+ })
279
+ .post('/documents/:id/undelete', idParams, async (context) => {
280
+ await services.documents.undelete(context.get('actor').userId, context.req.valid('param').id)
281
+ return context.json({ ok: true as const })
282
+ })
283
+ .post('/shares/:id/revoke', idParams, async (context) => {
284
+ await services.documents.revokeShare(
285
+ context.get('actor').userId,
286
+ context.req.valid('param').id
287
+ )
288
+ return context.json({ ok: true as const })
289
+ })
220
290
  }
221
291
 
222
292
  /** The administration routes' types, for the portal's typed client. */
@@ -17,7 +17,13 @@ const FILTERS: ListFilters<CloudAdminAuditFilter, 'adminAuditEvent'> = {
17
17
  all: (expression) => expression.lit(true),
18
18
  accounts: (expression) => expression('adminAuditEvent.subjectType', '=', 'user'),
19
19
  requests: (expression) => expression('adminAuditEvent.subjectType', '=', 'enrollment'),
20
- email: (expression) => expression('adminAuditEvent.subjectType', '=', 'transactional-email')
20
+ email: (expression) => expression('adminAuditEvent.subjectType', '=', 'transactional-email'),
21
+ documents: (expression) =>
22
+ expression('adminAuditEvent.subjectType', 'in', [
23
+ 'document',
24
+ 'document-share',
25
+ 'document-report'
26
+ ])
21
27
  }
22
28
 
23
29
  type AuditExpression = ExpressionBuilder<CloudDatabase, 'adminAuditEvent'>
@@ -96,7 +102,10 @@ export function createAdminAuditService(database: Kysely<CloudDatabase>) {
96
102
  const enrollmentIds = uniq(
97
103
  events.flatMap((event) => (event.subjectType === 'enrollment' ? [event.subjectId] : []))
98
104
  ).filter(isUUID)
99
- const [users, enrollments] = await Promise.all([
105
+ const documentIds = uniq(
106
+ events.flatMap((event) => (event.subjectType === 'document' ? [event.subjectId] : []))
107
+ ).filter(isUUID)
108
+ const [users, enrollments, documents] = await Promise.all([
100
109
  userIds.length
101
110
  ? database.selectFrom('user').select(['id', 'name']).where('id', 'in', userIds).execute()
102
111
  : [],
@@ -106,8 +115,16 @@ export function createAdminAuditService(database: Kysely<CloudDatabase>) {
106
115
  .select(['id', 'name', 'emailNormalized'])
107
116
  .where('id', 'in', enrollmentIds)
108
117
  .execute()
118
+ : [],
119
+ documentIds.length
120
+ ? database
121
+ .selectFrom('document')
122
+ .select(['id', 'name'])
123
+ .where('id', 'in', documentIds)
124
+ .execute()
109
125
  : []
110
126
  ])
127
+ const documentNames = new Map(documents.map((document) => [document.id, document.name]))
111
128
  const names = new Map(users.map((user) => [user.id, user.name]))
112
129
  const requesters = new Map(
113
130
  enrollments.map((enrollment) => [
@@ -115,6 +132,11 @@ export function createAdminAuditService(database: Kysely<CloudDatabase>) {
115
132
  enrollment.name ?? enrollment.emailNormalized
116
133
  ])
117
134
  )
135
+ const subjectName = (type: string, id: string) => {
136
+ if (type === 'enrollment') return requesters.get(id)
137
+ if (type === 'document') return documentNames.get(id)
138
+ return names.get(id)
139
+ }
118
140
  const rows = events.map((event) => ({
119
141
  id: event.id,
120
142
  actor: { id: event.actorUserId, name: names.get(event.actorUserId) ?? null },
@@ -122,10 +144,7 @@ export function createAdminAuditService(database: Kysely<CloudDatabase>) {
122
144
  subject: {
123
145
  type: event.subjectType,
124
146
  id: event.subjectId,
125
- name:
126
- (event.subjectType === 'enrollment'
127
- ? requesters.get(event.subjectId)
128
- : names.get(event.subjectId)) ?? null
147
+ name: subjectName(event.subjectType, event.subjectId) ?? null
129
148
  },
130
149
  metadata: event.metadata,
131
150
  createdAt: event.createdAt