@open-pencil/cloud 0.17.0-beta.5 → 0.17.0-beta.7

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 (188) hide show
  1. package/dist/client.d.ts +560 -93
  2. package/dist/client.d.ts.map +1 -1
  3. package/dist/client.js +1101 -186
  4. package/dist/client.js.map +1 -1
  5. package/dist/contract.d.ts +2 -2
  6. package/dist/contract.js +2 -2
  7. package/dist/contract2.js +390 -44
  8. package/dist/contract2.js.map +1 -1
  9. package/dist/email.d.ts +366 -3
  10. package/dist/email.d.ts.map +1 -1
  11. package/dist/email.js +1403 -556
  12. package/dist/email.js.map +1 -1
  13. package/dist/errors.js +16 -3
  14. package/dist/errors.js.map +1 -1
  15. package/dist/index.d.ts +878 -37
  16. package/dist/index.d.ts.map +1 -1
  17. package/dist/index2.d.ts +12 -2
  18. package/dist/index2.d.ts.map +1 -1
  19. package/dist/listen.mjs +589 -128
  20. package/dist/listen.mjs.map +1 -1
  21. package/dist/runtime-cloudflare.d.ts +4 -0
  22. package/dist/runtime-cloudflare.d.ts.map +1 -1
  23. package/dist/runtime-cloudflare.js +8690 -6325
  24. package/dist/runtime-cloudflare.js.map +1 -1
  25. package/dist/runtime-node.d.mts +10098 -5401
  26. package/dist/runtime-node.d.mts.map +1 -1
  27. package/dist/server.d.ts +13807 -7638
  28. package/dist/server.d.ts.map +1 -1
  29. package/dist/server.js +11723 -9412
  30. package/dist/server.js.map +1 -1
  31. package/dist/server.mjs +10659 -8650
  32. package/dist/server.mjs.map +1 -1
  33. package/dist/server2.mjs +79 -57
  34. package/dist/server2.mjs.map +1 -1
  35. package/package.json +13 -4
  36. package/src/admin/api/routes.ts +263 -190
  37. package/src/admin/audit/service.ts +9 -1
  38. package/src/admin/bootstrap.ts +86 -0
  39. package/src/admin/documents/service.ts +119 -4
  40. package/src/admin/email/service.ts +2 -1
  41. package/src/admin/enrollment/email.ts +17 -3
  42. package/src/admin/enrollment/service.ts +71 -10
  43. package/src/admin/errors.ts +5 -0
  44. package/src/admin/index.ts +1 -0
  45. package/src/admin/reports/service.ts +9 -3
  46. package/src/admin/schema.ts +6 -5
  47. package/src/admin/users/service.ts +173 -16
  48. package/src/client/api.ts +29 -2
  49. package/src/client/comments.ts +205 -0
  50. package/src/client/device-authorization.ts +4 -20
  51. package/src/client/discovery.ts +4 -2
  52. package/src/client/files/archive.ts +60 -0
  53. package/src/client/files/checksum.ts +7 -0
  54. package/src/client/files/download.ts +122 -0
  55. package/src/client/files/images.ts +89 -0
  56. package/src/client/files/index.ts +15 -0
  57. package/src/client/files/objects.ts +173 -0
  58. package/src/client/files/save.ts +79 -0
  59. package/src/client/index.ts +3 -6
  60. package/src/client/portal/account.ts +20 -2
  61. package/src/client/portal/administration.ts +52 -5
  62. package/src/client/portal/request.ts +4 -2
  63. package/src/client/tour.ts +44 -0
  64. package/src/client/versions.ts +7 -1
  65. package/src/contract/account.ts +61 -11
  66. package/src/contract/admin/index.ts +48 -3
  67. package/src/contract/billing.ts +73 -4
  68. package/src/contract/comments.ts +223 -0
  69. package/src/contract/discovery.ts +47 -19
  70. package/src/contract/index.ts +10 -0
  71. package/src/contract/links.ts +5 -0
  72. package/src/contract/relay.ts +3 -1
  73. package/src/contract/services.ts +44 -4
  74. package/src/contract/workspaces.ts +5 -0
  75. package/src/email/locales/ar.json +28 -0
  76. package/src/email/locales/de.json +28 -0
  77. package/src/email/locales/es.json +28 -0
  78. package/src/email/locales/fr.json +28 -0
  79. package/src/email/locales/it.json +28 -0
  80. package/src/email/locales/ja.json +28 -0
  81. package/src/email/locales/pl.json +28 -0
  82. package/src/email/locales/pt-br.json +28 -0
  83. package/src/email/locales/ru.json +28 -0
  84. package/src/email/locales/zh-cn.json +28 -0
  85. package/src/email/messages.ts +35 -0
  86. package/src/email/render.ts +18 -0
  87. package/src/email/samples.ts +28 -1
  88. package/src/email/schema.ts +29 -3
  89. package/src/email/templates/BrandEmail.vue +3 -1
  90. package/src/email/templates/CommentNotification.vue +39 -0
  91. package/src/email/templates/EnrollmentInvitation.vue +53 -0
  92. package/src/email/templates/TwoStepChanged.vue +17 -2
  93. package/src/email/templates/brand.ts +6 -0
  94. package/src/errors/posthog.ts +28 -4
  95. package/src/runtime/cloudflare/email.ts +2 -0
  96. package/src/runtime/cloudflare/relay/index.ts +21 -6
  97. package/src/runtime/cloudflare/worker.ts +6 -0
  98. package/src/runtime/cloudflare/xml.ts +12 -0
  99. package/src/runtime/node/admin.ts +51 -47
  100. package/src/runtime/node/email/runtime.ts +1 -0
  101. package/src/runtime/node/email/transport.ts +1 -0
  102. package/src/runtime/node/server.ts +8 -2
  103. package/src/runtime/posthog/errors.ts +3 -1
  104. package/src/runtime/site/server.ts +4 -1
  105. package/src/server/account/actions.ts +3 -1
  106. package/src/server/account/deletion.ts +38 -4
  107. package/src/server/account/routes.ts +67 -46
  108. package/src/server/account/tokens.ts +3 -3
  109. package/src/server/api/router.ts +22 -7
  110. package/src/server/app/checks.ts +6 -1
  111. package/src/server/app/cors.ts +44 -0
  112. package/src/server/app/index.ts +76 -76
  113. package/src/server/app/routes.ts +14 -5
  114. package/src/server/app/services.ts +49 -15
  115. package/src/server/auth/access-control.ts +13 -8
  116. package/src/server/auth/account.ts +13 -12
  117. package/src/server/auth/activity.ts +7 -2
  118. package/src/server/auth/adapter.ts +16 -3
  119. package/src/server/auth/email.ts +29 -17
  120. package/src/server/auth/endpoints.ts +4 -0
  121. package/src/server/auth/factory.ts +83 -64
  122. package/src/server/auth/index.ts +1 -1
  123. package/src/server/auth/methods.ts +162 -0
  124. package/src/server/auth/mfa-assurance.ts +147 -10
  125. package/src/server/auth/rate-limit.ts +31 -0
  126. package/src/server/auth/runtime.ts +19 -5
  127. package/src/server/auth/social-providers.ts +70 -24
  128. package/src/server/billing/index.ts +2 -0
  129. package/src/server/billing/notify.ts +55 -0
  130. package/src/server/billing/seats.ts +17 -0
  131. package/src/server/billing/tokens.ts +1 -1
  132. package/src/server/cleanup/documents.ts +5 -2
  133. package/src/server/cleanup/revisions.ts +6 -3
  134. package/src/server/cleanup/uploads.ts +2 -1
  135. package/src/server/collaboration/relay/connection.ts +7 -2
  136. package/src/server/collaboration/relay/hub.ts +55 -24
  137. package/src/server/collaboration/routes.ts +8 -5
  138. package/src/server/comments/index.ts +9 -0
  139. package/src/server/comments/notify.ts +277 -0
  140. package/src/server/comments/routes.ts +352 -0
  141. package/src/server/comments/rows.ts +249 -0
  142. package/src/server/comments/service.ts +570 -0
  143. package/src/server/community/routes.ts +6 -6
  144. package/src/server/config/deployment.ts +19 -6
  145. package/src/server/config/index.ts +1 -1
  146. package/src/server/config/public.ts +19 -6
  147. package/src/server/config/schema.ts +14 -2
  148. package/src/server/config/toml/schema.ts +27 -4
  149. package/src/server/db/index.ts +2 -1
  150. package/src/server/db/migrate.ts +21 -1
  151. package/src/server/db/migrations/015_comments.ts +57 -0
  152. package/src/server/db/migrations/016_comment_notifications.ts +76 -0
  153. package/src/server/db/migrations/017_invitation_emails.ts +19 -0
  154. package/src/server/db/migrations/018_enrollment_source.ts +17 -0
  155. package/src/server/db/tables.ts +92 -2
  156. package/src/server/documents/access.ts +17 -0
  157. package/src/server/documents/images.ts +6 -1
  158. package/src/server/documents/routes.ts +12 -12
  159. package/src/server/documents/service.ts +19 -5
  160. package/src/server/documents/summary.ts +15 -0
  161. package/src/server/documents/versions/routes.ts +7 -8
  162. package/src/server/documents/versions/service.ts +5 -2
  163. package/src/server/email/service.ts +8 -2
  164. package/src/server/email/types.ts +1 -0
  165. package/src/server/errors/index.ts +48 -3
  166. package/src/server/index.ts +15 -1
  167. package/src/server/internal/routes.ts +8 -2
  168. package/src/server/internal/service.ts +10 -0
  169. package/src/server/invitations/budget.ts +3 -1
  170. package/src/server/invitations/index.ts +1 -0
  171. package/src/server/invitations/links.ts +6 -0
  172. package/src/server/pictures/service.ts +3 -1
  173. package/src/server/policy/workspace.ts +5 -2
  174. package/src/server/reports/routes.ts +2 -2
  175. package/src/server/reports/service.ts +3 -1
  176. package/src/server/services/routes.ts +2 -2
  177. package/src/server/sharing/capabilities/service.ts +1 -1
  178. package/src/server/sharing/document-routes.ts +3 -3
  179. package/src/server/sharing/invitations/service.ts +3 -4
  180. package/src/server/sharing/routes.ts +15 -15
  181. package/src/server/validation.ts +33 -25
  182. package/src/server/workspaces/members.ts +50 -12
  183. package/src/server/workspaces/repository.ts +23 -12
  184. package/src/server/workspaces/routes.ts +8 -8
  185. package/src/services/app.ts +30 -19
  186. package/src/services/config.ts +47 -8
  187. package/src/services/metering.ts +15 -27
  188. package/src/client/billing.ts +0 -80
@@ -1,19 +1,19 @@
1
1
  import type { EnrollmentService } from '#cloud/admin'
2
2
  import {
3
- parseCloudPasswordChange,
4
- parseCloudMFAEnable,
5
- parseCloudMFAVerify,
6
- parseCloudPasskeyDelete,
7
- parseCloudSocialLink,
8
- parseCloudUnlinkAuthenticationMethod,
9
- parseCloudEmailChange,
10
- parseCloudProfileUpdate,
11
- parseCloudLocaleUpdate,
12
- parseCloudPictureUpload,
3
+ cloudPasswordChangeSchema,
4
+ cloudMFAEnableSchema,
5
+ cloudMFAVerifySchema,
6
+ cloudPasskeyDeleteSchema,
7
+ cloudSocialLinkSchema,
8
+ cloudUnlinkAuthenticationMethodSchema,
9
+ cloudEmailChangeSchema,
10
+ cloudProfileUpdateSchema,
11
+ cloudLocaleUpdateSchema,
12
+ cloudPictureUploadSchema,
13
13
  CLOUD_PICTURE_MAX_BYTES,
14
- parseCloudSessionRevoke,
15
- parseCloudAccountDelete,
16
- parseCloudTermsAcceptance,
14
+ cloudSessionRevokeSchema,
15
+ cloudAccountDeleteSchema,
16
+ cloudTermsAcceptanceSchema,
17
17
  type CloudAccountStatus
18
18
  } from '#cloud/contract'
19
19
  import type { CloudAPIEnvironment } from '#cloud/server/api'
@@ -48,6 +48,8 @@ export type AccountRouteDependencies = {
48
48
  terms: TermsService
49
49
  resolveIdentity: CloudIdentityResolver
50
50
  resolveSession: CloudSessionResolver
51
+ /** Whether the request's session proved its account's second step, or the account has none. */
52
+ twoStepConfirmed: (request: Request) => Promise<boolean>
51
53
  requireActiveSession: MiddlewareHandler<CloudAPIEnvironment>
52
54
  /** Lets an account with terms to accept reach what leaving needs; see `resolveAccountSession`. */
53
55
  requireAccountSession: MiddlewareHandler<CloudAPIEnvironment>
@@ -60,6 +62,7 @@ export function createAccountRoutes(services: AccountRouteDependencies) {
60
62
  workspaces,
61
63
  resolveIdentity,
62
64
  resolveSession,
65
+ twoStepConfirmed,
63
66
  requireActiveSession,
64
67
  authenticatedMutationLimiter
65
68
  } = services
@@ -81,14 +84,18 @@ export function createAccountRoutes(services: AccountRouteDependencies) {
81
84
  services.config.enrollmentMode !== 'approval' || enrollmentStatus === 'approved'
82
85
  ? null
83
86
  : (enrollmentStatus ?? 'pending')
84
- // Terms come after approval: an account still waiting has nothing to accept yet.
87
+ // The second step comes after approval, and terms after it: an account still waiting has
88
+ // nothing to prove or accept yet.
85
89
  let state: CloudAccountStatus['state'] = enrollmentState ?? 'active'
86
- if (!enrollmentState && !(await services.terms.hasAccepted(identity.userId)))
90
+ if (!enrollmentState && !(await twoStepConfirmed(context.req.raw))) {
91
+ state = 'two-step'
92
+ } else if (!enrollmentState && !(await services.terms.hasAccepted(identity.userId))) {
87
93
  state = 'terms'
94
+ }
88
95
  if (state === 'active') await workspaces.ensurePersonal(identity)
89
96
  return context.json({ user: identity, state })
90
97
  })
91
- .post('/api/account/terms', validatedJSON(parseCloudTermsAcceptance), async (context) => {
98
+ .post('/api/account/terms', validatedJSON(cloudTermsAcceptanceSchema), async (context) => {
92
99
  const identity = await resolveIdentity(context.req.raw)
93
100
  if (!identity) return context.json({ error: { code: 'unauthorized' as const } }, 401)
94
101
  if (!services.terms.requiredVersion) {
@@ -100,33 +107,38 @@ export function createAccountRoutes(services: AccountRouteDependencies) {
100
107
  }
101
108
  return context.json({ ok: true as const })
102
109
  })
110
+ // A session still proving its second step reads which ways it has, and proves one.
103
111
  .get('/api/account/mfa', async (context) => {
104
- const actor = await resolveSession(context.req.raw)
112
+ const actor = await resolveIdentity(context.req.raw)
105
113
  if (!actor) return context.json({ error: { code: 'unauthorized' as const } }, 401)
106
114
  const mfa = await services.auth.mfaStatus(context.req.raw.headers)
107
115
  return mfa
108
116
  ? context.json({ mfa })
109
117
  : context.json({ error: { code: 'unauthorized' as const } }, 401)
110
118
  })
111
- .post('/api/account/mfa/totp/enable', validatedJSON(parseCloudMFAEnable), async (context) => {
112
- const result = await activeAccountAction(context, () =>
113
- services.auth.enableTOTP(context.req.raw.headers, context.req.valid('json').password)
114
- )
115
- return result instanceof Response ? result : context.json(result)
116
- })
117
- .post('/api/account/mfa/totp/verify', validatedJSON(parseCloudMFAVerify), (context) =>
118
- verifiedMFAAction(context, resolveSession, () =>
119
+ .post(
120
+ '/api/account/mfa/totp/enable',
121
+ validatedJSON(cloudMFAEnableSchema),
122
+ async (context) => {
123
+ const result = await activeAccountAction(context, () =>
124
+ services.auth.enableTOTP(context.req.raw.headers, context.req.valid('json').password)
125
+ )
126
+ return result instanceof Response ? result : context.json(result)
127
+ }
128
+ )
129
+ .post('/api/account/mfa/totp/verify', validatedJSON(cloudMFAVerifySchema), (context) =>
130
+ verifiedMFAAction(context, resolveIdentity, () =>
119
131
  services.auth.verifyTOTP(context.req.raw.headers, context.req.valid('json').code)
120
132
  )
121
133
  )
122
- .post('/api/account/mfa/recovery/verify', validatedJSON(parseCloudMFAVerify), (context) =>
134
+ .post('/api/account/mfa/recovery/verify', validatedJSON(cloudMFAVerifySchema), (context) =>
123
135
  verifiedMFAAction(context, resolveIdentity, () =>
124
136
  services.auth.verifyRecoveryCode(context.req.raw.headers, context.req.valid('json').code)
125
137
  )
126
138
  )
127
139
  .post(
128
140
  '/api/account/mfa/recovery/regenerate',
129
- validatedJSON(parseCloudMFAEnable),
141
+ validatedJSON(cloudMFAEnableSchema),
130
142
  async (context) => {
131
143
  const result = await activeAccountAction(context, () =>
132
144
  services.auth.generateRecoveryCodes(
@@ -139,7 +151,7 @@ export function createAccountRoutes(services: AccountRouteDependencies) {
139
151
  )
140
152
  .post(
141
153
  '/api/account/mfa/totp/disable',
142
- validatedJSON(parseCloudMFAEnable),
154
+ validatedJSON(cloudMFAEnableSchema),
143
155
  async (context) => {
144
156
  const actor = await resolveSession(context.req.raw)
145
157
  if (!actor) return context.json({ error: { code: 'unauthorized' as const } }, 401)
@@ -167,7 +179,7 @@ export function createAccountRoutes(services: AccountRouteDependencies) {
167
179
  })
168
180
  .post(
169
181
  '/api/account/mfa/passkeys/delete',
170
- validatedJSON(parseCloudPasskeyDelete),
182
+ validatedJSON(cloudPasskeyDeleteSchema),
171
183
  async (context) => {
172
184
  const actor = await resolveSession(context.req.raw)
173
185
  if (!actor) return context.json({ error: { code: 'unauthorized' as const } }, 401)
@@ -192,7 +204,7 @@ export function createAccountRoutes(services: AccountRouteDependencies) {
192
204
  .use('/api/account/authentication/*', authenticatedMutationLimiter)
193
205
  .post(
194
206
  '/api/account/authentication/change-password',
195
- validatedJSON(parseCloudPasswordChange),
207
+ validatedJSON(cloudPasswordChangeSchema),
196
208
  async (context) => {
197
209
  const result = await accountAction(
198
210
  () =>
@@ -207,7 +219,7 @@ export function createAccountRoutes(services: AccountRouteDependencies) {
207
219
  )
208
220
  .post(
209
221
  '/api/account/authentication/link-social',
210
- validatedJSON(parseCloudSocialLink),
222
+ validatedJSON(cloudSocialLinkSchema),
211
223
  async (context) => {
212
224
  const result = await accountAction(
213
225
  () =>
@@ -217,12 +229,17 @@ export function createAccountRoutes(services: AccountRouteDependencies) {
217
229
  ),
218
230
  context
219
231
  )
220
- return result instanceof Response ? result : context.json({ url: result })
232
+ if (result instanceof Response) return result
233
+ // The provider's callback checks the state cookie this sets.
234
+ for (const cookie of result.headers.getSetCookie()) {
235
+ context.header('Set-Cookie', cookie, { append: true })
236
+ }
237
+ return context.json({ url: result.url })
221
238
  }
222
239
  )
223
240
  .post(
224
241
  '/api/account/authentication/unlink',
225
- validatedJSON(parseCloudUnlinkAuthenticationMethod),
242
+ validatedJSON(cloudUnlinkAuthenticationMethodSchema),
226
243
  async (context) => {
227
244
  const result = await accountAction(
228
245
  () =>
@@ -265,7 +282,7 @@ export function createAccountRoutes(services: AccountRouteDependencies) {
265
282
  }
266
283
  })
267
284
  })
268
- .post('/api/account/profile', validatedJSON(parseCloudProfileUpdate), async (context) => {
285
+ .post('/api/account/profile', validatedJSON(cloudProfileUpdateSchema), async (context) => {
269
286
  const result = await accountAction(
270
287
  () => services.auth.updateProfile(context.req.raw.headers, context.req.valid('json')),
271
288
  context
@@ -273,7 +290,7 @@ export function createAccountRoutes(services: AccountRouteDependencies) {
273
290
  return result instanceof Response ? result : context.json({ ok: true as const })
274
291
  })
275
292
  // The app says which language it uses after signing in and whenever the person changes it.
276
- .put('/api/account/locale', validatedJSON(parseCloudLocaleUpdate), async (context) => {
293
+ .put('/api/account/locale', validatedJSON(cloudLocaleUpdateSchema), async (context) => {
277
294
  const result = await accountAction(
278
295
  () => services.auth.setLocale(context.req.raw.headers, context.req.valid('json').locale),
279
296
  context
@@ -286,7 +303,7 @@ export function createAccountRoutes(services: AccountRouteDependencies) {
286
303
  maxSize: PICTURE_BODY_BYTES,
287
304
  onError: (context) => context.json({ error: { code: 'picture_invalid' as const } }, 413)
288
305
  }),
289
- validatedJSON(parseCloudPictureUpload),
306
+ validatedJSON(cloudPictureUploadSchema),
290
307
  async (context) => {
291
308
  const bytes = toUint8Array(context.req.valid('json').data)
292
309
  try {
@@ -302,14 +319,18 @@ export function createAccountRoutes(services: AccountRouteDependencies) {
302
319
  await services.pictures.remove(context.get('actor').userId)
303
320
  return context.json({ ok: true as const })
304
321
  })
305
- .post('/api/account/profile/email', validatedJSON(parseCloudEmailChange), async (context) => {
306
- const result = await accountAction(
307
- () =>
308
- accountAuthentication.changeEmail(context.req.raw.headers, context.req.valid('json')),
309
- context
310
- )
311
- return result instanceof Response ? result : context.json({ ok: true as const })
312
- })
322
+ .post(
323
+ '/api/account/profile/email',
324
+ validatedJSON(cloudEmailChangeSchema),
325
+ async (context) => {
326
+ const result = await accountAction(
327
+ () =>
328
+ accountAuthentication.changeEmail(context.req.raw.headers, context.req.valid('json')),
329
+ context
330
+ )
331
+ return result instanceof Response ? result : context.json({ ok: true as const })
332
+ }
333
+ )
313
334
  .get('/api/account/sessions', async (context) => {
314
335
  const sessions = await services.auth.sessions(context.req.raw.headers)
315
336
  if (!sessions) return context.json({ error: { code: 'unauthorized' as const } }, 401)
@@ -317,7 +338,7 @@ export function createAccountRoutes(services: AccountRouteDependencies) {
317
338
  })
318
339
  .post(
319
340
  '/api/account/sessions/revoke',
320
- validatedJSON(parseCloudSessionRevoke),
341
+ validatedJSON(cloudSessionRevokeSchema),
321
342
  async (context) => {
322
343
  const result = await accountAction(
323
344
  () =>
@@ -345,7 +366,7 @@ export function createAccountRoutes(services: AccountRouteDependencies) {
345
366
  .get('/api/account/deletion', async (context) => {
346
367
  return context.json({ deletion: await services.deletion.plan(context.get('actor').userId) })
347
368
  })
348
- .post('/api/account/delete', validatedJSON(parseCloudAccountDelete), async (context) => {
369
+ .post('/api/account/delete', validatedJSON(cloudAccountDeleteSchema), async (context) => {
349
370
  const result = await accountAction(
350
371
  () =>
351
372
  services.auth.deleteAccount(
@@ -1,4 +1,4 @@
1
- import { parseCloudAccessTokenCreate, parseCloudAccessTokenRevoke } from '#cloud/contract'
1
+ import { cloudAccessTokenCreateSchema, cloudAccessTokenRevokeSchema } from '#cloud/contract'
2
2
  import type { CloudAPIEnvironment } from '#cloud/server/api'
3
3
  import type { CloudAuthAdapter, CloudSessionResolver } from '#cloud/server/auth'
4
4
  import { validatedJSON } from '#cloud/server/validation'
@@ -31,7 +31,7 @@ export function createAccessTokenRoutes(services: AccessTokenRouteDependencies)
31
31
  })
32
32
  .post(
33
33
  '/api/account/tokens/create',
34
- validatedJSON(parseCloudAccessTokenCreate),
34
+ validatedJSON(cloudAccessTokenCreateSchema),
35
35
  async (context) => {
36
36
  const result = await accountAction(
37
37
  () => services.auth.createAccessToken(context.req.raw.headers, context.req.valid('json')),
@@ -42,7 +42,7 @@ export function createAccessTokenRoutes(services: AccessTokenRouteDependencies)
42
42
  )
43
43
  .post(
44
44
  '/api/account/tokens/revoke',
45
- validatedJSON(parseCloudAccessTokenRevoke),
45
+ validatedJSON(cloudAccessTokenRevokeSchema),
46
46
  async (context) => {
47
47
  const result = await accountAction(
48
48
  () =>
@@ -6,10 +6,15 @@ import {
6
6
  createCollaborationRoutes,
7
7
  createPublicCollaborationRoutes
8
8
  } from '#cloud/server/collaboration'
9
+ import {
10
+ createCommentRoutes,
11
+ createSharedCommentRoutes,
12
+ type CommentService
13
+ } from '#cloud/server/comments'
9
14
  import { createCommunityRoutes, type CommunityService } from '#cloud/server/community'
10
15
  import type { CloudDatabase } from '#cloud/server/db'
11
16
  import type { DocumentService } from '#cloud/server/documents'
12
- import { createDocumentRoutes } from '#cloud/server/documents'
17
+ import { createDocumentRoutes, DocumentNotFoundError } from '#cloud/server/documents'
13
18
  import {
14
19
  createDocumentVersionRoutes,
15
20
  type DocumentVersionService
@@ -35,6 +40,7 @@ export type CloudAPIServices = {
35
40
  collaboration: CollaborationTicketService
36
41
  documents: DocumentService
37
42
  versions: DocumentVersionService
43
+ comments: CommentService
38
44
  /** The community gallery, which anyone may read. */
39
45
  community: CommunityService
40
46
  sharing: DocumentSharingService
@@ -58,6 +64,7 @@ export function createPublicCloudAPIRouter(services: CloudAPIServices) {
58
64
  '/',
59
65
  createPublicDocumentRoutes(services.sharing, services.documents, services.resolveSession)
60
66
  )
67
+ .route('/', createSharedCommentRoutes(services.comments, services.resolveSession))
61
68
  .route('/', createPublicCollaborationRoutes(services.collaboration, services.resolveSession))
62
69
  .route('/', createCommunityRoutes(services.community))
63
70
  }
@@ -75,12 +82,19 @@ export function createCloudAPIRouter(services: CloudAPIServices) {
75
82
  .get('/workspaces/:workspaceId/entitlements', workspaceParams, async (context) => {
76
83
  if (!services.entitlements)
77
84
  return context.json({ error: { code: 'not_found' as const } }, 404)
78
- return context.json({
79
- entitlements: await services.entitlements.workspace(
80
- context.get('actor').userId,
81
- context.req.valid('param').workspaceId
82
- )
83
- })
85
+ try {
86
+ return context.json({
87
+ entitlements: await services.entitlements.workspace(
88
+ context.get('actor').userId,
89
+ context.req.valid('param').workspaceId
90
+ )
91
+ })
92
+ } catch (error) {
93
+ // A workspace the account left, or one that has gone, since the editor listed it.
94
+ if (error instanceof DocumentNotFoundError)
95
+ return context.json({ error: { code: 'not_found' as const } }, 404)
96
+ throw error
97
+ }
84
98
  })
85
99
  .get('/session', (context) => context.json({ user: context.get('actor') }))
86
100
  .route(
@@ -120,6 +134,7 @@ export function createCloudAPIRouter(services: CloudAPIServices) {
120
134
  )
121
135
  )
122
136
  .route('/', createDocumentVersionRoutes(services.versions))
137
+ .route('/', createCommentRoutes(services.comments))
123
138
  .route(
124
139
  '/',
125
140
  createDocumentSharingRoutes(
@@ -28,7 +28,12 @@ export function createRequestResolvers(services: CloudServices) {
28
28
  services.resolveAccountSession ??
29
29
  (services.resolveSession
30
30
  ? services.resolveSession
31
- : (request: Request) => services.auth.resolveAccountSession(request.headers))
31
+ : (request: Request) => services.auth.resolveAccountSession(request.headers)),
32
+ twoStepConfirmed:
33
+ services.twoStepConfirmed ??
34
+ (services.resolveIdentity
35
+ ? async () => true
36
+ : (request: Request) => services.auth.twoStepConfirmed(request.headers))
32
37
  }
33
38
  }
34
39
 
@@ -0,0 +1,44 @@
1
+ import { CLOUD_DISCOVERY_PATH } from '#cloud/contract'
2
+ import type { MiddlewareHandler } from 'hono'
3
+ import { cors } from 'hono/cors'
4
+
5
+ /** The community gallery's addresses, which anyone may read from any page. */
6
+ const COMMUNITY_API_PATH = '/api/community'
7
+
8
+ /**
9
+ * Whether an address is a public read any page may make: the server's discovery, and the
10
+ * community gallery's list, documents, and thumbnails. They need no account, so they carry none.
11
+ */
12
+ function isOpenRead(method: string, path: string): boolean {
13
+ if (method !== 'GET' && method !== 'HEAD' && method !== 'OPTIONS') return false
14
+ return (
15
+ path === CLOUD_DISCOVERY_PATH ||
16
+ path === COMMUNITY_API_PATH ||
17
+ path.startsWith(`${COMMUNITY_API_PATH}/`)
18
+ )
19
+ }
20
+
21
+ /**
22
+ * Cross-origin access to the server. Its own pages and the origins it trusts send their account
23
+ * with every request. Any other page, such as the documentation site's landing showing the tour,
24
+ * may read the discovery and the gallery without one, and nothing else.
25
+ */
26
+ export function createCloudCORS(allowedOrigins: ReadonlySet<string>): MiddlewareHandler {
27
+ const trusted = cors({
28
+ origin: (origin) => (allowedOrigins.has(origin) ? origin : null),
29
+ allowMethods: ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'],
30
+ allowHeaders: ['Content-Type', 'Authorization'],
31
+ credentials: true,
32
+ maxAge: 600
33
+ })
34
+ const openRead = cors({ origin: '*', allowMethods: ['GET', 'HEAD'], maxAge: 600 })
35
+ return (context, next) => {
36
+ const origin = context.req.header('Origin')
37
+ const anyPage = origin !== undefined && !allowedOrigins.has(origin)
38
+ // A preflight names the method it asks for; a request is its own.
39
+ const method = context.req.header('Access-Control-Request-Method') ?? context.req.method
40
+ return anyPage && isOpenRead(method, context.req.path)
41
+ ? openRead(context, next)
42
+ : trusted(context, next)
43
+ }
44
+ }
@@ -13,9 +13,9 @@ import { cloudRequestId } from '#cloud/server/logging'
13
13
  import { createPictureRoutes } from '#cloud/server/pictures'
14
14
  import { Hono } from 'hono'
15
15
  import { bodyLimit } from 'hono/body-limit'
16
- import { cors } from 'hono/cors'
17
16
 
18
17
  import { createRequestChecks, createRequestResolvers } from './checks'
18
+ import { createCloudCORS } from './cors'
19
19
  import { requireMinimumEditor } from './editors'
20
20
  import { robotsText, shouldPreventIndexing } from './indexing'
21
21
  import { createAppRateLimiters } from './limiters'
@@ -39,90 +39,90 @@ export function createCloudApp(services: CloudServices) {
39
39
  const allowedOrigins = new Set(
40
40
  [config.publicURL, ...config.trustedOrigins].map((origin) => new URL(origin).origin)
41
41
  )
42
- const cloudCORS = cors({
43
- origin: (origin) => (allowedOrigins.has(origin) ? origin : null),
44
- allowMethods: ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'],
45
- allowHeaders: ['Content-Type', 'Authorization'],
46
- credentials: true,
47
- maxAge: 600
48
- })
42
+ const cloudCORS = createCloudCORS(allowedOrigins)
49
43
  const app = createAppServices(services)
50
44
  const resolvers = createRequestResolvers(services)
51
45
  const checks = createRequestChecks(services, resolvers)
52
46
  const limiters = createAppRateLimiters(services.database, config)
53
47
  const routers = createAppRouters(services, app, resolvers, checks, limiters, allowedOrigins)
54
48
 
55
- return new Hono<CloudAPIEnvironment>()
56
- .onError(cloudErrorHandler(services.reportError))
57
- .use('*', cloudRequestId(services.forwardedRequestId))
58
- .use(CLOUD_DISCOVERY_PATH, cloudCORS)
59
- .use('/api/*', cloudCORS)
60
- .use('/api/*', requireMinimumEditor(config.minimumEditorVersion))
61
- .use(
62
- '/api/*',
63
- bodyLimit({
64
- maxSize: CLOUD_API_MAX_BODY_BYTES,
65
- onError: (context) => context.json({ error: { code: 'invalid_request' as const } }, 413)
49
+ return (
50
+ new Hono<CloudAPIEnvironment>()
51
+ .onError(cloudErrorHandler(services.reportError))
52
+ .use('*', cloudRequestId(services.forwardedRequestId))
53
+ // Discovery is public, so any editor's page may read it without credentials: an editor on
54
+ // another address learns whether the server lists it before it signs in.
55
+ .use(CLOUD_DISCOVERY_PATH, cloudCORS)
56
+ .use('/api/*', cloudCORS)
57
+ .use('/api/*', requireMinimumEditor(config.minimumEditorVersion))
58
+ .use(
59
+ '/api/*',
60
+ bodyLimit({
61
+ maxSize: CLOUD_API_MAX_BODY_BYTES,
62
+ onError: (context) => context.json({ error: { code: 'invalid_request' as const } }, 413)
63
+ })
64
+ )
65
+ .use('*', async (context, next) => {
66
+ await next()
67
+ if (shouldPreventIndexing(context.req.path, config.indexingPolicy)) {
68
+ context.header('X-Robots-Tag', 'noindex, nofollow, noarchive')
69
+ }
66
70
  })
67
- )
68
- .use('*', async (context, next) => {
69
- await next()
70
- if (shouldPreventIndexing(context.req.path, config.indexingPolicy)) {
71
- context.header('X-Robots-Tag', 'noindex, nofollow, noarchive')
72
- }
73
- })
74
- .get('/robots.txt', (context) => {
75
- context.header('Content-Type', 'text/plain; charset=utf-8')
76
- return context.body(robotsText(config.indexingPolicy))
77
- })
78
- .get('/health', (context) =>
79
- context.json({
80
- status: 'ok' as const,
81
- protocolVersion: CLOUD_PROTOCOL_VERSION
71
+ .get('/robots.txt', (context) => {
72
+ context.header('Content-Type', 'text/plain; charset=utf-8')
73
+ return context.body(robotsText(config.indexingPolicy))
82
74
  })
83
- )
84
- .get('/ready', async (context) => {
85
- try {
86
- await services.database.selectFrom('workspace').select('id').limit(1).execute()
87
- const objects = await services.objects.checkReadiness()
88
- if (!objects.ok) {
89
- return context.json(
90
- { status: 'unavailable' as const, dependency: 'object_storage' as const },
91
- 503
92
- )
93
- }
94
- return context.json({
95
- status: 'ready' as const,
96
- objectStorage: {
97
- checksumVerification: objects.checksumVerification,
98
- multipartUpload: services.objects.capabilities.multipartUpload
99
- }
75
+ .get('/health', (context) =>
76
+ context.json({
77
+ status: 'ok' as const,
78
+ protocolVersion: CLOUD_PROTOCOL_VERSION
100
79
  })
101
- } catch {
102
- return context.json({ status: 'unavailable' as const }, 503)
103
- }
104
- })
105
- .get(CLOUD_DISCOVERY_PATH, (context) => context.json(discovery))
106
- .get(CLOUD_SERVICES_JWKS_PATH, async (context) =>
107
- app.servicesTokens ? context.json(app.servicesTokens.jwks()) : context.notFound()
108
- )
109
- .on(['GET', 'POST'], `${AUTH_BASE_PATH}/*`, (context) => services.auth.handler(context.req.raw))
110
- .route('/', routers.account)
111
- .route('/', routers.accessTokens)
112
- .route('/', createPictureRoutes(app.pictures))
113
- .use('/api/shares/:shareId/collaboration-ticket', limiters.publicCollaborationLimiter)
114
- .use('/api/public/*', limiters.publicRateLimiter)
115
- .use('/api/shares/*', limiters.publicRateLimiter)
116
- .use('/api/invitations/*', limiters.publicRateLimiter)
117
- .use('/api/community/*', limiters.communityLimiter, limiters.publicRateLimiter)
118
- .route('/', createCommunityThumbnailRoutes(app.community))
119
- .route('/api', routers.publicCloudAPI)
120
- .route('/api/internal', routers.internalAPI)
121
- .use('/api/documents/:documentId', checks.allowLeavingRead)
122
- .use('/api/*', checks.requireActiveActor)
123
- .route(ADMIN_API_PATH, routers.admin)
124
- .use('/api/*', limiters.authenticatedMutationLimiter)
125
- .route('/api', routers.cloudAPI)
80
+ )
81
+ .get('/ready', async (context) => {
82
+ try {
83
+ await services.database.selectFrom('workspace').select('id').limit(1).execute()
84
+ const objects = await services.objects.checkReadiness()
85
+ if (!objects.ok) {
86
+ return context.json(
87
+ { status: 'unavailable' as const, dependency: 'object_storage' as const },
88
+ 503
89
+ )
90
+ }
91
+ return context.json({
92
+ status: 'ready' as const,
93
+ objectStorage: {
94
+ checksumVerification: objects.checksumVerification,
95
+ multipartUpload: services.objects.capabilities.multipartUpload
96
+ }
97
+ })
98
+ } catch {
99
+ return context.json({ status: 'unavailable' as const }, 503)
100
+ }
101
+ })
102
+ .get(CLOUD_DISCOVERY_PATH, (context) => context.json(discovery))
103
+ .get(CLOUD_SERVICES_JWKS_PATH, async (context) =>
104
+ app.servicesTokens ? context.json(app.servicesTokens.jwks()) : context.notFound()
105
+ )
106
+ .on(['GET', 'POST'], `${AUTH_BASE_PATH}/*`, (context) =>
107
+ services.auth.handler(context.req.raw)
108
+ )
109
+ .route('/', routers.account)
110
+ .route('/', routers.accessTokens)
111
+ .route('/', createPictureRoutes(app.pictures))
112
+ .use('/api/shares/:shareId/collaboration-ticket', limiters.publicCollaborationLimiter)
113
+ .use('/api/public/*', limiters.publicRateLimiter)
114
+ .use('/api/shares/*', limiters.publicRateLimiter)
115
+ .use('/api/invitations/*', limiters.publicRateLimiter)
116
+ .use('/api/community/*', limiters.communityLimiter, limiters.publicRateLimiter)
117
+ .route('/', createCommunityThumbnailRoutes(app.community))
118
+ .route('/api', routers.publicCloudAPI)
119
+ .route('/api/internal', routers.internalAPI)
120
+ .use('/api/documents/:documentId', checks.allowLeavingRead)
121
+ .use('/api/*', checks.requireActiveActor)
122
+ .route(ADMIN_API_PATH, routers.admin)
123
+ .use('/api/*', limiters.authenticatedMutationLimiter)
124
+ .route('/api', routers.cloudAPI)
125
+ )
126
126
  }
127
127
 
128
128
  export type CloudApp = ReturnType<typeof createCloudApp>
@@ -13,6 +13,7 @@ import { createTermsService } from '#cloud/server/account/terms'
13
13
  import { createAccessTokenRoutes } from '#cloud/server/account/tokens'
14
14
  import { createCloudAPIRouter, createPublicCloudAPIRouter } from '#cloud/server/api'
15
15
  import { createAuthenticationEmailService } from '#cloud/server/auth'
16
+ import { signInProviders } from '#cloud/server/auth/methods'
16
17
  import { createInternalRoutes, createInternalService } from '#cloud/server/internal'
17
18
  import { Hono } from 'hono'
18
19
 
@@ -30,7 +31,7 @@ export function createAppRouters(
30
31
  allowedOrigins: ReadonlySet<string>
31
32
  ) {
32
33
  const { config, database } = services
33
- const { resolveIdentity, resolveSession } = resolvers
34
+ const { resolveIdentity, resolveSession, twoStepConfirmed } = resolvers
34
35
  const admin = createCloudAdminRoutes(
35
36
  {
36
37
  email: createAdminEmailService(database, services.transactionalEmail, {
@@ -39,6 +40,8 @@ export function createAppRouters(
39
40
  enrollment: app.enrollment,
40
41
  users: createAdminUserService(database, services.auth, {
41
42
  requireMFA: config.deploymentAdminMFARequired,
43
+ approval: config.enrollmentMode === 'approval',
44
+ signInProviders: signInProviders(config),
42
45
  pictures: app.pictures,
43
46
  notify: services.transactionalEmail
44
47
  ? createAuthenticationEmailService(services.transactionalEmail, config.publicURL)
@@ -49,14 +52,18 @@ export function createAppRouters(
49
52
  documents: createAdminDocumentService(database, {
50
53
  closeRooms: services.onDocumentTakenDown,
51
54
  purgeGraceMs: config.documentPurgeGraceMs,
55
+ communityWorkspaceId: config.community?.workspaceId ?? null,
56
+ objects: services.objects,
57
+ documents: app.documents,
52
58
  email: services.transactionalEmail,
53
59
  publicURL: config.publicURL,
54
60
  contactEmail: config.legal?.abuseEmail
55
61
  }),
56
- reports: createAdminReportService(database, {
57
- email: services.transactionalEmail,
58
- contactEmail: config.legal?.abuseEmail
59
- })
62
+ reports: createAdminReportService(
63
+ database,
64
+ { email: services.transactionalEmail, contactEmail: config.legal?.abuseEmail },
65
+ { communityWorkspaceId: config.community?.workspaceId ?? null }
66
+ )
60
67
  },
61
68
  allowedOrigins,
62
69
  {
@@ -76,6 +83,7 @@ export function createAppRouters(
76
83
  deletion: createAccountDeletionService(database),
77
84
  resolveIdentity,
78
85
  resolveSession,
86
+ twoStepConfirmed,
79
87
  requireActiveSession: checks.requireActiveSession,
80
88
  requireAccountSession: checks.requireAccountSession,
81
89
  authenticatedMutationLimiter: limiters.authenticatedMutationLimiter
@@ -90,6 +98,7 @@ export function createAppRouters(
90
98
  collaboration: app.collaboration,
91
99
  documents: app.documents,
92
100
  versions: app.versions,
101
+ comments: app.comments,
93
102
  community: app.community,
94
103
  entitlements: app.entitlements,
95
104
  sharing: app.sharing,