@open-pencil/cloud 0.17.0-beta.4 → 0.17.0-beta.6
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.
- package/README.md +2 -1
- package/dist/bin/server.mjs +1 -1
- package/dist/bin/server.mjs.map +1 -1
- package/dist/bin/services.mjs +1 -1
- package/dist/bin/services.mjs.map +1 -1
- package/dist/client.d.ts +783 -47
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +1651 -382
- package/dist/client.js.map +1 -1
- package/dist/contract.d.ts +2 -2
- package/dist/contract.js +2 -2
- package/dist/contract2.js +701 -45
- package/dist/contract2.js.map +1 -1
- package/dist/email.d.ts +2138 -34
- package/dist/email.d.ts.map +1 -1
- package/dist/email.js +4343 -306
- package/dist/email.js.map +1 -1
- package/dist/errors.d.ts +2 -0
- package/dist/errors.js +61 -0
- package/dist/errors.js.map +1 -0
- package/dist/index.d.ts +1338 -44
- package/dist/index.d.ts.map +1 -1
- package/dist/index2.d.ts +45 -0
- package/dist/index2.d.ts.map +1 -0
- package/dist/listen.mjs +958 -340
- package/dist/listen.mjs.map +1 -1
- package/dist/runtime-cloudflare.d.ts +93 -0
- package/dist/runtime-cloudflare.d.ts.map +1 -0
- package/dist/runtime-cloudflare.js +18032 -0
- package/dist/runtime-cloudflare.js.map +1 -0
- package/dist/runtime-node.d.mts +12615 -5249
- package/dist/runtime-node.d.mts.map +1 -1
- package/dist/server.d.ts +17367 -8567
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +13587 -7333
- package/dist/server.js.map +1 -1
- package/dist/server.mjs +11601 -5401
- package/dist/server.mjs.map +1 -1
- package/dist/server2.mjs +84 -62
- package/dist/server2.mjs.map +1 -1
- package/package.json +31 -5
- package/src/admin/api/routes.ts +263 -190
- package/src/admin/audit/service.ts +11 -3
- package/src/admin/bootstrap.ts +86 -0
- package/src/admin/documents/service.ts +195 -10
- package/src/admin/email/service.ts +2 -1
- package/src/admin/enrollment/email.ts +17 -3
- package/src/admin/enrollment/service.ts +71 -10
- package/src/admin/errors.ts +5 -0
- package/src/admin/index.ts +1 -0
- package/src/admin/reports/service.ts +15 -3
- package/src/admin/schema.ts +6 -5
- package/src/admin/users/service.ts +173 -16
- package/src/client/api.ts +52 -473
- package/src/client/auth/client.ts +22 -3
- package/src/client/comments.ts +205 -0
- package/src/client/community.ts +40 -0
- package/src/client/device-authorization.ts +4 -20
- package/src/client/discovery.ts +39 -11
- package/src/client/documents.ts +160 -0
- package/src/client/files/archive.ts +60 -0
- package/src/client/files/checksum.ts +7 -0
- package/src/client/files/download.ts +122 -0
- package/src/client/files/images.ts +89 -0
- package/src/client/files/index.ts +15 -0
- package/src/client/files/objects.ts +173 -0
- package/src/client/files/save.ts +79 -0
- package/src/client/index.ts +4 -0
- package/src/client/portal/account.ts +73 -3
- package/src/client/portal/administration.ts +52 -5
- package/src/client/portal/request.ts +6 -2
- package/src/client/response.ts +21 -0
- package/src/client/schema.ts +8 -0
- package/src/client/services.ts +23 -18
- package/src/client/sharing.ts +262 -0
- package/src/client/tour.ts +44 -0
- package/src/client/versions.ts +110 -0
- package/src/contract/account.ts +111 -11
- package/src/contract/admin/index.ts +48 -3
- package/src/contract/billing.ts +235 -0
- package/src/contract/collaboration.ts +5 -0
- package/src/contract/comments.ts +223 -0
- package/src/contract/community.ts +60 -0
- package/src/contract/discovery.ts +94 -5
- package/src/contract/entitlements.ts +10 -0
- package/src/contract/index.ts +64 -5
- package/src/contract/links.ts +62 -4
- package/src/contract/locale.ts +27 -0
- package/src/contract/portal.ts +12 -1
- package/src/contract/relay.ts +3 -1
- package/src/contract/routes.ts +10 -0
- package/src/contract/services.ts +62 -20
- package/src/contract/workspaces.ts +5 -0
- package/src/email/i18n.ts +174 -0
- package/src/email/index.ts +13 -2
- package/src/email/locales/ar.json +169 -0
- package/src/email/locales/de.json +169 -0
- package/src/email/locales/es.json +169 -0
- package/src/email/locales/fr.json +169 -0
- package/src/email/locales/it.json +169 -0
- package/src/email/locales/ja.json +169 -0
- package/src/email/locales/pl.json +169 -0
- package/src/email/locales/pt-br.json +169 -0
- package/src/email/locales/ru.json +169 -0
- package/src/email/locales/zh-cn.json +169 -0
- package/src/email/messages.ts +235 -0
- package/src/email/render.ts +160 -276
- package/src/email/samples.ts +142 -0
- package/src/email/schema.ts +98 -8
- package/src/email/templates/BrandEmail.vue +56 -0
- package/src/email/templates/CommentNotification.vue +39 -0
- package/src/email/templates/DocumentBlocked.vue +45 -0
- package/src/email/templates/DocumentInvitation.vue +24 -0
- package/src/email/templates/DocumentReport.vue +32 -0
- package/src/email/templates/DocumentReportDecided.vue +36 -0
- package/src/email/templates/DocumentReportReceived.vue +18 -0
- package/src/email/templates/DocumentRestored.vue +24 -0
- package/src/email/templates/EmailChangeRequested.vue +24 -0
- package/src/email/templates/EmailRoot.vue +19 -0
- package/src/email/templates/EmailText.vue +9 -0
- package/src/email/templates/EmailVerification.vue +38 -0
- package/src/email/templates/EnrollmentInvitation.vue +53 -0
- package/src/email/templates/EnrollmentNotification.vue +24 -0
- package/src/email/templates/EnrollmentUpdate.vue +52 -0
- package/src/email/templates/NewSignIn.vue +37 -0
- package/src/email/templates/PasswordChanged.vue +22 -0
- package/src/email/templates/PasswordReset.vue +23 -0
- package/src/email/templates/StorageLimitReached.vue +28 -0
- package/src/email/templates/TwoStepChanged.vue +47 -0
- package/src/email/templates/WaitlistConfirmation.vue +29 -0
- package/src/email/templates/WorkspaceInvitation.vue +28 -0
- package/src/email/templates/brand.ts +15 -61
- package/src/email/templates/localization.ts +17 -0
- package/src/errors/index.ts +6 -0
- package/src/{server/errors → errors}/posthog.ts +28 -4
- package/src/global.d.ts +7 -0
- package/src/runtime/cloudflare/email.ts +2 -0
- package/src/runtime/cloudflare/relay/index.ts +28 -7
- package/src/runtime/cloudflare/tsconfig.json +2 -1
- package/src/runtime/cloudflare/worker.ts +14 -1
- package/src/runtime/cloudflare/xml.ts +12 -0
- package/src/runtime/node/admin.ts +51 -47
- package/src/runtime/node/cleanup.ts +5 -1
- package/src/runtime/node/email/runtime.ts +1 -0
- package/src/runtime/node/email/transport.ts +14 -10
- package/src/runtime/node/main.ts +1 -1
- package/src/runtime/node/server.ts +20 -4
- package/src/runtime/node/services/main.ts +1 -1
- package/src/runtime/posthog/errors.ts +5 -2
- package/src/runtime/s3/objects.ts +17 -0
- package/src/runtime/site/community.ts +101 -0
- package/src/runtime/site/server.ts +17 -1
- package/src/server/account/actions.ts +3 -1
- package/src/server/account/deletion.ts +40 -4
- package/src/server/account/routes.ts +305 -253
- package/src/server/account/tokens.ts +57 -0
- package/src/server/api/router.ts +44 -6
- package/src/server/app/checks.ts +89 -0
- package/src/server/app/cors.ts +44 -0
- package/src/server/app/editors.ts +20 -0
- package/src/server/app/index.ts +128 -0
- package/src/server/app/indexing.ts +40 -0
- package/src/server/app/limiters.ts +53 -0
- package/src/server/app/routes.ts +123 -0
- package/src/server/app/services.ts +219 -0
- package/src/server/auth/access-control.ts +13 -8
- package/src/server/auth/access-tokens.ts +62 -0
- package/src/server/auth/account.ts +13 -12
- package/src/server/auth/activity.ts +7 -2
- package/src/server/auth/adapter.ts +36 -3
- package/src/server/auth/email.ts +33 -18
- package/src/server/auth/endpoints.ts +4 -0
- package/src/server/auth/enrollment.ts +116 -0
- package/src/server/auth/factory.ts +165 -189
- package/src/server/auth/index.ts +1 -1
- package/src/server/auth/logger.ts +23 -0
- package/src/server/auth/methods.ts +162 -0
- package/src/server/auth/mfa-assurance.ts +190 -2
- package/src/server/auth/passwords.ts +43 -0
- package/src/server/auth/rate-limit.ts +31 -0
- package/src/server/auth/runtime.ts +19 -5
- package/src/server/auth/session.ts +2 -0
- package/src/server/auth/social-providers.ts +70 -24
- package/src/server/billing/index.ts +8 -0
- package/src/server/billing/notify.ts +55 -0
- package/src/server/billing/routes.ts +27 -0
- package/src/server/billing/seats.ts +17 -0
- package/src/server/billing/tokens.ts +37 -0
- package/src/server/cleanup/configured.ts +16 -3
- package/src/server/cleanup/documents.ts +5 -2
- package/src/server/cleanup/revisions.ts +6 -3
- package/src/server/cleanup/uploads.ts +2 -1
- package/src/server/cleanup/worker.ts +10 -1
- package/src/server/collaboration/relay/connection.ts +7 -2
- package/src/server/collaboration/relay/hub.ts +80 -166
- package/src/server/collaboration/relay/room.ts +154 -0
- package/src/server/collaboration/routes.ts +8 -5
- package/src/server/collaboration/service.ts +21 -2
- package/src/server/comments/index.ts +9 -0
- package/src/server/comments/notify.ts +277 -0
- package/src/server/comments/routes.ts +352 -0
- package/src/server/comments/rows.ts +249 -0
- package/src/server/comments/service.ts +570 -0
- package/src/server/community/index.ts +2 -0
- package/src/server/community/routes.ts +93 -0
- package/src/server/community/service.ts +134 -0
- package/src/server/config/deployment.ts +35 -10
- package/src/server/config/index.ts +2 -2
- package/src/server/config/public.ts +25 -6
- package/src/server/config/schema.ts +53 -293
- package/src/server/config/toml/schema.ts +330 -0
- package/src/server/db/index.ts +3 -1
- package/src/server/db/migrate.ts +33 -1
- package/src/server/db/migrations/009_access_tokens.ts +47 -0
- package/src/server/db/migrations/010_storage_limit_notices.ts +50 -0
- package/src/server/db/migrations/011_account_ids.ts +30 -0
- package/src/server/db/migrations/012_email_locales.ts +34 -0
- package/src/server/db/migrations/013_document_block_emails.ts +40 -0
- package/src/server/db/migrations/014_report_replies.ts +28 -0
- package/src/server/db/migrations/015_comments.ts +57 -0
- package/src/server/db/migrations/016_comment_notifications.ts +76 -0
- package/src/server/db/migrations/017_invitation_emails.ts +19 -0
- package/src/server/db/migrations/018_enrollment_source.ts +17 -0
- package/src/server/db/migrations/schema.ts +26 -1
- package/src/server/db/tables.ts +122 -3
- package/src/server/db/users.ts +22 -0
- package/src/server/documents/access.ts +17 -0
- package/src/server/documents/images.ts +6 -1
- package/src/server/documents/index.ts +1 -1
- package/src/server/documents/limits.ts +7 -1
- package/src/server/documents/routes.ts +12 -12
- package/src/server/documents/service.ts +31 -407
- package/src/server/documents/summary.ts +15 -0
- package/src/server/documents/uploads.ts +450 -0
- package/src/server/documents/versions/routes.ts +7 -8
- package/src/server/documents/versions/service.ts +86 -26
- package/src/server/email/invitations.ts +1 -0
- package/src/server/email/service.ts +39 -6
- package/src/server/email/types.ts +13 -0
- package/src/server/errors/index.ts +49 -12
- package/src/server/index.ts +27 -6
- package/src/server/internal/routes.ts +8 -2
- package/src/server/internal/service.ts +10 -0
- package/src/server/invitations/budget.ts +3 -1
- package/src/server/invitations/index.ts +1 -0
- package/src/server/invitations/links.ts +6 -0
- package/src/server/invitations/types.ts +5 -1
- package/src/server/objects/types.ts +5 -0
- package/src/server/pictures/service.ts +3 -1
- package/src/server/policy/configured.ts +9 -3
- package/src/server/policy/database.ts +13 -2
- package/src/server/policy/policy.ts +39 -12
- package/src/server/policy/service.ts +71 -52
- package/src/server/policy/storage.ts +33 -0
- package/src/server/policy/workspace.ts +5 -2
- package/src/server/quota/index.ts +6 -0
- package/src/server/quota/notices.ts +121 -0
- package/src/server/quota/storage.ts +5 -0
- package/src/server/rate-limit/middleware.ts +4 -0
- package/src/server/reports/index.ts +1 -0
- package/src/server/reports/replies.ts +55 -0
- package/src/server/reports/routes.ts +5 -3
- package/src/server/reports/service.ts +27 -3
- package/src/server/services/routes.ts +2 -2
- package/src/server/sharing/capabilities/service.ts +3 -4
- package/src/server/sharing/document-routes.ts +3 -3
- package/src/server/sharing/invitations/service.ts +17 -8
- package/src/server/sharing/routes.ts +15 -15
- package/src/server/validation.ts +35 -24
- package/src/server/workspaces/members.ts +57 -31
- package/src/server/workspaces/repository.ts +23 -12
- package/src/server/workspaces/routes.ts +8 -8
- package/src/services/app.ts +31 -22
- package/src/services/config.ts +48 -8
- package/src/services/metering.ts +15 -27
- package/src/services/usage.ts +6 -14
- package/src/email/templates/document-invitation.ts +0 -35
- package/src/email/templates/enrollment.ts +0 -27
- package/src/email/templates/layout.ts +0 -18
- package/src/server/app.ts +0 -453
package/src/admin/api/routes.ts
CHANGED
|
@@ -8,10 +8,11 @@ import type { AdminOperationsService } from '#cloud/admin/operations/service'
|
|
|
8
8
|
import type { AdminReportService } from '#cloud/admin/reports/service'
|
|
9
9
|
import {
|
|
10
10
|
enrollmentStatusSchema,
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
11
|
+
documentTakedownSchema,
|
|
12
|
+
enrollmentReviewSchema,
|
|
13
|
+
signInMethodMutationSchema,
|
|
14
|
+
userMutationSchema,
|
|
15
|
+
userRoleMutationSchema
|
|
15
16
|
} from '#cloud/admin/schema'
|
|
16
17
|
import type { AdminUserService } from '#cloud/admin/users/service'
|
|
17
18
|
import {
|
|
@@ -19,13 +20,20 @@ import {
|
|
|
19
20
|
cloudAdminDocumentFilterSchema,
|
|
20
21
|
cloudAdminEmailFilterSchema,
|
|
21
22
|
cloudAdminReportFilterSchema,
|
|
22
|
-
cloudAdminUserFilterSchema
|
|
23
|
+
cloudAdminUserFilterSchema,
|
|
24
|
+
cloudAdminUserMethodSchema
|
|
23
25
|
} from '#cloud/contract'
|
|
24
26
|
import type { CloudAPIEnvironment } from '#cloud/server/api'
|
|
25
27
|
import type { CloudAuthAdapter } from '#cloud/server/auth'
|
|
26
28
|
import type { CloudDatabase } from '#cloud/server/db'
|
|
29
|
+
import { DocumentNotFoundError } from '#cloud/server/documents/errors'
|
|
27
30
|
import { CLOUD_RATE_LIMITS, createActorRateLimiter } from '#cloud/server/rate-limit'
|
|
28
|
-
import {
|
|
31
|
+
import {
|
|
32
|
+
documentRevisionParams,
|
|
33
|
+
idParams,
|
|
34
|
+
validatedJSON,
|
|
35
|
+
validatedQuery
|
|
36
|
+
} from '#cloud/server/validation'
|
|
29
37
|
import { Hono, type Context } from 'hono'
|
|
30
38
|
import { NoResultError, type Kysely } from 'kysely'
|
|
31
39
|
import * as v from 'valibot'
|
|
@@ -37,20 +45,22 @@ import * as v from 'valibot'
|
|
|
37
45
|
const countSchema = v.optional(v.pipe(v.string(), v.digits(), v.toNumber(), v.safeInteger()))
|
|
38
46
|
/** What an admin list reads from its query string: a search, one of `filters`, and a page. */
|
|
39
47
|
function listQuery<const Filter extends string>(filters: v.PicklistSchema<Filter[], undefined>) {
|
|
40
|
-
|
|
48
|
+
return v.object({
|
|
41
49
|
search: v.optional(v.string()),
|
|
42
50
|
filter: v.optional(filters),
|
|
43
51
|
limit: countSchema,
|
|
44
52
|
offset: countSchema
|
|
45
53
|
})
|
|
46
|
-
return (input: unknown) => v.parse(schema, input)
|
|
47
54
|
}
|
|
48
|
-
const
|
|
49
|
-
const
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
const
|
|
55
|
+
const enrollmentQuerySchema = listQuery(enrollmentStatusSchema)
|
|
56
|
+
const userQuerySchema = v.object({
|
|
57
|
+
...listQuery(cloudAdminUserFilterSchema).entries,
|
|
58
|
+
method: v.optional(cloudAdminUserMethodSchema)
|
|
59
|
+
})
|
|
60
|
+
const emailQuerySchema = listQuery(cloudAdminEmailFilterSchema)
|
|
61
|
+
const auditQuerySchema = listQuery(cloudAdminAuditFilterSchema)
|
|
62
|
+
const documentQuerySchema = listQuery(cloudAdminDocumentFilterSchema)
|
|
63
|
+
const reportQuerySchema = listQuery(cloudAdminReportFilterSchema)
|
|
54
64
|
/** Accounts are named by UUID; anything else names no one, rather than failing the query. */
|
|
55
65
|
const accountIdSchema = v.pipe(v.string(), v.uuid())
|
|
56
66
|
|
|
@@ -63,7 +73,8 @@ async function accountMutation(
|
|
|
63
73
|
if (!v.is(accountIdSchema, userId)) {
|
|
64
74
|
return context.json({ error: { code: 'not_found' as const } }, 404)
|
|
65
75
|
}
|
|
66
|
-
|
|
76
|
+
// A UUID matches in any case; the lowercase spelling is the one the actor's own ID uses.
|
|
77
|
+
await mutate(context.get('actor').userId, userId.toLowerCase())
|
|
67
78
|
return context.json({ ok: true as const })
|
|
68
79
|
}
|
|
69
80
|
|
|
@@ -99,194 +110,256 @@ export function createCloudAdminRoutes(
|
|
|
99
110
|
CLOUD_RATE_LIMITS.adminMutation,
|
|
100
111
|
(context) => context.req.method === 'GET'
|
|
101
112
|
)
|
|
102
|
-
return
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
if (security.requireMFA) {
|
|
110
|
-
const status = await security.auth.mfaStatus(context.req.raw.headers)
|
|
111
|
-
if (!status?.assured) {
|
|
112
|
-
return context.json({ error: { code: 'mfa_required' as const } }, 403)
|
|
113
|
+
return (
|
|
114
|
+
new Hono<CloudAPIEnvironment>()
|
|
115
|
+
.use('*', requireTrustedMutationOrigin(trustedOrigins))
|
|
116
|
+
.use('*', async (context, next) => {
|
|
117
|
+
const actor = context.get('actor')
|
|
118
|
+
if (actor.deploymentRole !== 'admin') {
|
|
119
|
+
return context.json({ error: { code: 'forbidden' as const } }, 403)
|
|
113
120
|
}
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
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
|
-
})
|
|
148
|
-
)
|
|
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
|
-
})
|
|
162
|
-
)
|
|
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
|
-
})
|
|
176
|
-
)
|
|
177
|
-
.get('/users', validatedQuery(parseUserQuery), async (context) =>
|
|
178
|
-
context.json(await services.users.list(context.req.valid('query')))
|
|
179
|
-
)
|
|
180
|
-
.get('/users/:id', idParams, async (context) => {
|
|
181
|
-
const detail = await services.users.detail(context.req.valid('param').id)
|
|
182
|
-
if (!detail) return context.json({ error: { code: 'not_found' as const } }, 404)
|
|
183
|
-
return context.json(detail)
|
|
184
|
-
})
|
|
185
|
-
.post('/users/reset-two-step', validatedJSON(parseUserMutation), (context) =>
|
|
186
|
-
accountMutation(context, context.req.valid('json').userId, (actorId, userId) =>
|
|
187
|
-
services.users.resetTwoStep(actorId, userId)
|
|
121
|
+
if (security.requireMFA) {
|
|
122
|
+
const status = await security.auth.mfaStatus(context.req.raw.headers)
|
|
123
|
+
if (!status?.assured) {
|
|
124
|
+
// Someone with two-step only has to prove it again; someone without has to turn it on.
|
|
125
|
+
const code = status?.enabled ? 'two_step_unconfirmed' : 'mfa_required'
|
|
126
|
+
return context.json({ error: { code } }, 403)
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
return next()
|
|
130
|
+
})
|
|
131
|
+
.use('*', adminRead)
|
|
132
|
+
.use('*', adminMutation)
|
|
133
|
+
.onError((error, context) => {
|
|
134
|
+
if (error instanceof AdminDomainError) {
|
|
135
|
+
return context.json({ error: { code: error.code } }, adminErrorStatus(error))
|
|
136
|
+
}
|
|
137
|
+
if (error instanceof v.ValiError) {
|
|
138
|
+
return context.json({ error: { code: 'invalid_request' as const } }, 400)
|
|
139
|
+
}
|
|
140
|
+
// An enrollment or message ID that names nothing, or a document with nothing saved.
|
|
141
|
+
if (error instanceof NoResultError || error instanceof DocumentNotFoundError) {
|
|
142
|
+
return context.json({ error: { code: 'not_found' as const } }, 404)
|
|
143
|
+
}
|
|
144
|
+
throw error
|
|
145
|
+
})
|
|
146
|
+
.get('/enrollments', validatedQuery(enrollmentQuerySchema), async (context) =>
|
|
147
|
+
context.json(await services.enrollment.list(context.req.valid('query')))
|
|
188
148
|
)
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
accountMutation(context, context.req.valid('json').userId, (actorId, userId) =>
|
|
192
|
-
services.users.removePicture(actorId, userId)
|
|
149
|
+
.post('/enrollments/invite', async (context) =>
|
|
150
|
+
context.json(await services.enrollment.invitePending(context.get('actor').userId))
|
|
193
151
|
)
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
context
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
152
|
+
.post(
|
|
153
|
+
'/enrollments/:id/approve',
|
|
154
|
+
idParams,
|
|
155
|
+
validatedJSON(enrollmentReviewSchema),
|
|
156
|
+
async (context) =>
|
|
157
|
+
context.json({
|
|
158
|
+
enrollment: await services.enrollment.review(
|
|
159
|
+
context.get('actor').userId,
|
|
160
|
+
context.req.valid('param').id,
|
|
161
|
+
'approved',
|
|
162
|
+
context.req.valid('json')
|
|
163
|
+
)
|
|
164
|
+
})
|
|
202
165
|
)
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
166
|
+
.post(
|
|
167
|
+
'/enrollments/:id/reject',
|
|
168
|
+
idParams,
|
|
169
|
+
validatedJSON(enrollmentReviewSchema),
|
|
170
|
+
async (context) =>
|
|
171
|
+
context.json({
|
|
172
|
+
enrollment: await services.enrollment.review(
|
|
173
|
+
context.get('actor').userId,
|
|
174
|
+
context.req.valid('param').id,
|
|
175
|
+
'rejected',
|
|
176
|
+
context.req.valid('json')
|
|
177
|
+
)
|
|
178
|
+
})
|
|
216
179
|
)
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
180
|
+
.post(
|
|
181
|
+
'/enrollments/:id/revoke',
|
|
182
|
+
idParams,
|
|
183
|
+
validatedJSON(enrollmentReviewSchema),
|
|
184
|
+
async (context) =>
|
|
185
|
+
context.json({
|
|
186
|
+
enrollment: await services.enrollment.review(
|
|
187
|
+
context.get('actor').userId,
|
|
188
|
+
context.req.valid('param').id,
|
|
189
|
+
'revoked',
|
|
190
|
+
context.req.valid('json')
|
|
191
|
+
)
|
|
192
|
+
})
|
|
226
193
|
)
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
.get('/email', validatedQuery(parseEmailQuery), async (context) =>
|
|
230
|
-
context.json(await services.email.list(context.req.valid('query')))
|
|
231
|
-
)
|
|
232
|
-
.post('/email/:id/regenerate', idParams, async (context) => {
|
|
233
|
-
await services.email.regenerate(context.get('actor').userId, context.req.valid('param').id)
|
|
234
|
-
return context.json({ ok: true as const })
|
|
235
|
-
})
|
|
236
|
-
.get('/audit', validatedQuery(parseAuditQuery), async (context) =>
|
|
237
|
-
context.json(await services.audit.list(context.req.valid('query')))
|
|
238
|
-
)
|
|
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'
|
|
194
|
+
.get('/users', validatedQuery(userQuerySchema), async (context) =>
|
|
195
|
+
context.json(await services.users.list(context.req.valid('query')))
|
|
248
196
|
)
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
'
|
|
197
|
+
.get('/users/:id', idParams, async (context) => {
|
|
198
|
+
const detail = await services.users.detail(context.req.valid('param').id)
|
|
199
|
+
if (!detail) return context.json({ error: { code: 'not_found' as const } }, 404)
|
|
200
|
+
return context.json(detail)
|
|
201
|
+
})
|
|
202
|
+
.post('/users/reset-two-step', validatedJSON(userMutationSchema), (context) =>
|
|
203
|
+
accountMutation(context, context.req.valid('json').userId, (actorId, userId) =>
|
|
204
|
+
services.users.resetTwoStep(actorId, userId)
|
|
205
|
+
)
|
|
256
206
|
)
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
207
|
+
.post(
|
|
208
|
+
'/users/remove-sign-in-method',
|
|
209
|
+
validatedJSON(signInMethodMutationSchema),
|
|
210
|
+
(context) => {
|
|
211
|
+
const { userId, methodId } = context.req.valid('json')
|
|
212
|
+
return accountMutation(context, userId, (actorId, id) =>
|
|
213
|
+
services.users.removeSignInMethod(actorId, id, methodId)
|
|
214
|
+
)
|
|
215
|
+
}
|
|
216
|
+
)
|
|
217
|
+
.post('/users/remove-picture', validatedJSON(userMutationSchema), (context) =>
|
|
218
|
+
accountMutation(context, context.req.valid('json').userId, (actorId, userId) =>
|
|
219
|
+
services.users.removePicture(actorId, userId)
|
|
220
|
+
)
|
|
221
|
+
)
|
|
222
|
+
.post('/users/delete', validatedJSON(userMutationSchema), (context) =>
|
|
223
|
+
accountMutation(context, context.req.valid('json').userId, (actorId, userId) =>
|
|
224
|
+
services.users.deleteUnapproved(actorId, userId)
|
|
225
|
+
)
|
|
226
|
+
)
|
|
227
|
+
.post('/users/ban', validatedJSON(userMutationSchema), async (context) => {
|
|
228
|
+
const input = context.req.valid('json')
|
|
229
|
+
await services.users.ban(
|
|
230
|
+
context.req.raw.headers,
|
|
231
|
+
context.get('actor').userId,
|
|
232
|
+
input.userId,
|
|
233
|
+
input.reason
|
|
234
|
+
)
|
|
235
|
+
return context.json({ ok: true as const })
|
|
236
|
+
})
|
|
237
|
+
.post('/users/unban', validatedJSON(userMutationSchema), async (context) => {
|
|
238
|
+
const input = context.req.valid('json')
|
|
239
|
+
await services.users.unban(
|
|
240
|
+
context.req.raw.headers,
|
|
241
|
+
context.get('actor').userId,
|
|
242
|
+
input.userId
|
|
243
|
+
)
|
|
244
|
+
return context.json({ ok: true as const })
|
|
245
|
+
})
|
|
246
|
+
.post('/users/revoke-sessions', validatedJSON(userMutationSchema), async (context) => {
|
|
247
|
+
const input = context.req.valid('json')
|
|
248
|
+
await services.users.revokeSessions(
|
|
249
|
+
context.req.raw.headers,
|
|
250
|
+
context.get('actor').userId,
|
|
251
|
+
input.userId
|
|
252
|
+
)
|
|
253
|
+
return context.json({ ok: true as const })
|
|
254
|
+
})
|
|
255
|
+
.post('/users/set-admin', validatedJSON(userRoleMutationSchema), async (context) => {
|
|
256
|
+
const input = context.req.valid('json')
|
|
257
|
+
await services.users.setAdmin(
|
|
258
|
+
context.req.raw.headers,
|
|
259
|
+
context.get('actor').userId,
|
|
260
|
+
input.userId,
|
|
261
|
+
input.enabled
|
|
262
|
+
)
|
|
263
|
+
return context.json({ ok: true as const })
|
|
264
|
+
})
|
|
265
|
+
.get('/email', validatedQuery(emailQuerySchema), async (context) =>
|
|
266
|
+
context.json(await services.email.list(context.req.valid('query')))
|
|
267
|
+
)
|
|
268
|
+
.post('/email/:id/regenerate', idParams, async (context) => {
|
|
269
|
+
await services.email.regenerate(context.get('actor').userId, context.req.valid('param').id)
|
|
270
|
+
return context.json({ ok: true as const })
|
|
271
|
+
})
|
|
272
|
+
.get('/audit', validatedQuery(auditQuerySchema), async (context) =>
|
|
273
|
+
context.json(await services.audit.list(context.req.valid('query')))
|
|
274
|
+
)
|
|
275
|
+
.get('/operations', async (context) => context.json(await services.operations.summary()))
|
|
276
|
+
.get('/reports', validatedQuery(reportQuerySchema), async (context) =>
|
|
277
|
+
context.json(await services.reports.list(context.req.valid('query')))
|
|
278
|
+
)
|
|
279
|
+
.post('/reports/:id/dismiss', idParams, async (context) => {
|
|
280
|
+
await services.reports.resolve(
|
|
268
281
|
context.get('actor').userId,
|
|
269
282
|
context.req.valid('param').id,
|
|
270
|
-
|
|
283
|
+
'dismissed'
|
|
271
284
|
)
|
|
272
285
|
return context.json({ ok: true as const })
|
|
273
|
-
}
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
286
|
+
})
|
|
287
|
+
.post('/reports/:id/action', idParams, async (context) => {
|
|
288
|
+
await services.reports.resolve(
|
|
289
|
+
context.get('actor').userId,
|
|
290
|
+
context.req.valid('param').id,
|
|
291
|
+
'actioned'
|
|
292
|
+
)
|
|
293
|
+
return context.json({ ok: true as const })
|
|
294
|
+
})
|
|
295
|
+
.get('/documents', validatedQuery(documentQuerySchema), async (context) =>
|
|
296
|
+
context.json(await services.documents.list(context.req.valid('query')))
|
|
297
|
+
)
|
|
298
|
+
.post(
|
|
299
|
+
'/documents/:id/disable',
|
|
300
|
+
idParams,
|
|
301
|
+
validatedJSON(documentTakedownSchema),
|
|
302
|
+
async (context) => {
|
|
303
|
+
await services.documents.disable(
|
|
304
|
+
context.get('actor').userId,
|
|
305
|
+
context.req.valid('param').id,
|
|
306
|
+
context.req.valid('json').reason
|
|
307
|
+
)
|
|
308
|
+
return context.json({ ok: true as const })
|
|
309
|
+
}
|
|
310
|
+
)
|
|
311
|
+
.post('/documents/:id/enable', idParams, async (context) => {
|
|
312
|
+
await services.documents.enable(context.get('actor').userId, context.req.valid('param').id)
|
|
313
|
+
return context.json({ ok: true as const })
|
|
314
|
+
})
|
|
315
|
+
// Its address names the revision it shows, which is also its ETag. The browser asks again
|
|
316
|
+
// each time, so the administrator and two-step checks always run, even for another account
|
|
317
|
+
// later in the same browser; an unchanged thumbnail answers 304 without reading storage.
|
|
318
|
+
.get(
|
|
319
|
+
'/documents/:documentId/thumbnails/:revisionId',
|
|
320
|
+
documentRevisionParams,
|
|
321
|
+
async (context) => {
|
|
322
|
+
const { documentId, revisionId } = context.req.valid('param')
|
|
323
|
+
const etag = `"${revisionId}"`
|
|
324
|
+
context.header('Cache-Control', 'private, no-cache')
|
|
325
|
+
context.header('ETag', etag)
|
|
326
|
+
if (
|
|
327
|
+
context.req.header('If-None-Match') === etag &&
|
|
328
|
+
(await services.documents.isCurrentRevision(documentId, revisionId))
|
|
329
|
+
) {
|
|
330
|
+
return context.body(null, 304)
|
|
331
|
+
}
|
|
332
|
+
const thumbnail = await services.documents.thumbnail(documentId, revisionId)
|
|
333
|
+
if (!thumbnail) return context.json({ error: { code: 'not_found' as const } }, 404)
|
|
334
|
+
context.header('Content-Type', 'image/png')
|
|
335
|
+
context.header('X-Content-Type-Options', 'nosniff')
|
|
336
|
+
context.header('Content-Security-Policy', "default-src 'none'; sandbox")
|
|
337
|
+
return context.body(new Uint8Array(thumbnail))
|
|
338
|
+
}
|
|
339
|
+
)
|
|
340
|
+
.post('/documents/:id/download', idParams, async (context) =>
|
|
341
|
+
context.json(
|
|
342
|
+
await services.documents.download(
|
|
343
|
+
context.get('actor').userId,
|
|
344
|
+
context.req.valid('param').id
|
|
345
|
+
)
|
|
346
|
+
)
|
|
287
347
|
)
|
|
288
|
-
|
|
289
|
-
|
|
348
|
+
.post('/documents/:id/undelete', idParams, async (context) => {
|
|
349
|
+
await services.documents.undelete(
|
|
350
|
+
context.get('actor').userId,
|
|
351
|
+
context.req.valid('param').id
|
|
352
|
+
)
|
|
353
|
+
return context.json({ ok: true as const })
|
|
354
|
+
})
|
|
355
|
+
.post('/shares/:id/revoke', idParams, async (context) => {
|
|
356
|
+
await services.documents.revokeShare(
|
|
357
|
+
context.get('actor').userId,
|
|
358
|
+
context.req.valid('param').id
|
|
359
|
+
)
|
|
360
|
+
return context.json({ ok: true as const })
|
|
361
|
+
})
|
|
362
|
+
)
|
|
290
363
|
}
|
|
291
364
|
|
|
292
365
|
/** The administration routes' types, for the portal's typed client. */
|
|
@@ -8,7 +8,7 @@ import {
|
|
|
8
8
|
} from '#cloud/admin/list'
|
|
9
9
|
import { isUUID } from '#cloud/admin/schema'
|
|
10
10
|
import { cloudAdminAuditFilterSchema, type CloudAdminAuditFilter } from '#cloud/contract'
|
|
11
|
-
import type
|
|
11
|
+
import { userIdText, type CloudDatabase } from '#cloud/server/db'
|
|
12
12
|
import { uniq } from 'es-toolkit'
|
|
13
13
|
import type { ExpressionBuilder, Kysely } from 'kysely'
|
|
14
14
|
|
|
@@ -36,7 +36,7 @@ function searchCondition(pattern: string) {
|
|
|
36
36
|
expression
|
|
37
37
|
.selectFrom('user')
|
|
38
38
|
.select('user.id')
|
|
39
|
-
.
|
|
39
|
+
.whereRef(userIdText, '=', column)
|
|
40
40
|
.where((inner) =>
|
|
41
41
|
inner.or([inner('user.name', 'ilike', pattern), inner('user.email', 'ilike', pattern)])
|
|
42
42
|
)
|
|
@@ -72,6 +72,12 @@ function searchCondition(pattern: string) {
|
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
74
|
|
|
75
|
+
/** The name an entry recorded about its subject, as deleting an account does. */
|
|
76
|
+
function recordedName(metadata: unknown): string | undefined {
|
|
77
|
+
if (typeof metadata !== 'object' || metadata === null || !('name' in metadata)) return undefined
|
|
78
|
+
return typeof metadata.name === 'string' ? metadata.name : undefined
|
|
79
|
+
}
|
|
80
|
+
|
|
75
81
|
export function createAdminAuditService(database: Kysely<CloudDatabase>) {
|
|
76
82
|
return {
|
|
77
83
|
/**
|
|
@@ -144,7 +150,9 @@ export function createAdminAuditService(database: Kysely<CloudDatabase>) {
|
|
|
144
150
|
subject: {
|
|
145
151
|
type: event.subjectType,
|
|
146
152
|
id: event.subjectId,
|
|
147
|
-
|
|
153
|
+
// A deleted account is named by what its deletion's entry recorded.
|
|
154
|
+
name:
|
|
155
|
+
subjectName(event.subjectType, event.subjectId) ?? recordedName(event.metadata) ?? null
|
|
148
156
|
},
|
|
149
157
|
metadata: event.metadata,
|
|
150
158
|
createdAt: event.createdAt
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
import type { CloudDatabase } from '#cloud/server/db'
|
|
2
|
+
import type { Kysely } from 'kysely'
|
|
3
|
+
|
|
4
|
+
import { normalizeEnrollmentEmail } from './enrollment/service'
|
|
5
|
+
|
|
6
|
+
/** Who the audit trail names for what the admin command did, since no account did it. */
|
|
7
|
+
export const ADMIN_BOOTSTRAP_ACTOR = 'cli-bootstrap'
|
|
8
|
+
|
|
9
|
+
/**
|
|
10
|
+
* Approves an email's enrollment from the admin command, whether or not that person has asked
|
|
11
|
+
* yet, for a deployment with no administrator to approve it in the console. As a review there
|
|
12
|
+
* does, it binds the account that already uses the address, which keeps the approval when that
|
|
13
|
+
* account changes its address (`followEmailChange`), and records the approval in the audit trail.
|
|
14
|
+
*/
|
|
15
|
+
export async function approveEnrollmentByEmail(
|
|
16
|
+
database: Kysely<CloudDatabase>,
|
|
17
|
+
email: string
|
|
18
|
+
): Promise<string> {
|
|
19
|
+
const normalized = normalizeEnrollmentEmail(email)
|
|
20
|
+
await database.transaction().execute(async (transaction) => {
|
|
21
|
+
const user = await transaction
|
|
22
|
+
.selectFrom('user')
|
|
23
|
+
.select('id')
|
|
24
|
+
.where('email', '=', normalized)
|
|
25
|
+
.executeTakeFirst()
|
|
26
|
+
const review = {
|
|
27
|
+
status: 'approved',
|
|
28
|
+
reviewedAt: new Date(),
|
|
29
|
+
reviewedBy: ADMIN_BOOTSTRAP_ACTOR,
|
|
30
|
+
reviewNote: 'Approved through CLI bootstrap',
|
|
31
|
+
...(user ? { approvedUserId: user.id } : {})
|
|
32
|
+
} as const
|
|
33
|
+
const enrollment = await transaction
|
|
34
|
+
.insertInto('enrollment')
|
|
35
|
+
.values({ id: crypto.randomUUID(), emailNormalized: normalized, ...review })
|
|
36
|
+
.onConflict((conflict) => conflict.column('emailNormalized').doUpdateSet(review))
|
|
37
|
+
.returning('id')
|
|
38
|
+
.executeTakeFirstOrThrow()
|
|
39
|
+
await transaction
|
|
40
|
+
.insertInto('adminAuditEvent')
|
|
41
|
+
.values({
|
|
42
|
+
id: crypto.randomUUID(),
|
|
43
|
+
actorUserId: ADMIN_BOOTSTRAP_ACTOR,
|
|
44
|
+
action: 'enrollment.approved',
|
|
45
|
+
subjectType: 'enrollment',
|
|
46
|
+
subjectId: enrollment.id,
|
|
47
|
+
metadata: { email: normalized }
|
|
48
|
+
})
|
|
49
|
+
.execute()
|
|
50
|
+
})
|
|
51
|
+
return normalized
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
/**
|
|
55
|
+
* Makes an existing account a deployment administrator from the admin command, recorded in the
|
|
56
|
+
* audit trail as the console records a grant. The account exists once its person has signed in.
|
|
57
|
+
*/
|
|
58
|
+
export async function grantDeploymentAdminByEmail(
|
|
59
|
+
database: Kysely<CloudDatabase>,
|
|
60
|
+
email: string
|
|
61
|
+
): Promise<{ email: string; userId: string }> {
|
|
62
|
+
const normalized = normalizeEnrollmentEmail(email)
|
|
63
|
+
return database.transaction().execute(async (transaction) => {
|
|
64
|
+
const user = await transaction
|
|
65
|
+
.updateTable('user')
|
|
66
|
+
.set({ role: 'admin' })
|
|
67
|
+
.where('email', '=', normalized)
|
|
68
|
+
.returning('id')
|
|
69
|
+
.executeTakeFirst()
|
|
70
|
+
if (!user) {
|
|
71
|
+
throw new Error(`No account uses ${normalized}; that person signs in once first`)
|
|
72
|
+
}
|
|
73
|
+
await transaction
|
|
74
|
+
.insertInto('adminAuditEvent')
|
|
75
|
+
.values({
|
|
76
|
+
id: crypto.randomUUID(),
|
|
77
|
+
actorUserId: ADMIN_BOOTSTRAP_ACTOR,
|
|
78
|
+
action: 'user.admin-granted',
|
|
79
|
+
subjectType: 'user',
|
|
80
|
+
subjectId: user.id,
|
|
81
|
+
metadata: { email: normalized }
|
|
82
|
+
})
|
|
83
|
+
.execute()
|
|
84
|
+
return { email: normalized, userId: user.id }
|
|
85
|
+
})
|
|
86
|
+
}
|