@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.
- package/README.md +1 -1
- package/dist/bin/{ai-relay.mjs → services.mjs} +8 -8
- package/dist/bin/services.mjs.map +1 -0
- package/dist/client.d.ts +236 -46
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +649 -400
- package/dist/client.js.map +1 -1
- package/dist/contract.d.ts +2 -2
- package/dist/contract.js +2 -2
- package/dist/contract2.js +680 -443
- package/dist/contract2.js.map +1 -1
- package/dist/email.d.ts +9 -1
- package/dist/email.d.ts.map +1 -1
- package/dist/email.js +99 -58
- package/dist/email.js.map +1 -1
- package/dist/index.d.ts +468 -64
- package/dist/index.d.ts.map +1 -1
- package/dist/listen.mjs +575 -738
- package/dist/listen.mjs.map +1 -1
- package/dist/runtime-node.d.mts +6564 -2934
- package/dist/runtime-node.d.mts.map +1 -1
- package/dist/runtime-node.mjs +6 -5
- package/dist/runtime-node.mjs.map +1 -1
- package/dist/server.d.ts +8931 -4198
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +5260 -3859
- package/dist/server.js.map +1 -1
- package/dist/server.mjs +5686 -3736
- package/dist/server.mjs.map +1 -1
- package/dist/server2.mjs +101 -79
- package/dist/server2.mjs.map +1 -1
- package/package.json +9 -6
- package/src/admin/api/routes.ts +103 -33
- package/src/admin/audit/service.ts +25 -6
- package/src/admin/documents/service.ts +361 -0
- package/src/admin/errors.ts +9 -1
- package/src/admin/index.ts +6 -0
- package/src/admin/operations/service.ts +7 -0
- package/src/admin/reports/service.ts +147 -0
- package/src/admin/schema.ts +6 -0
- package/src/client/api.ts +36 -21
- package/src/client/auth/navigation.ts +6 -5
- package/src/client/index.ts +7 -7
- package/src/client/portal/account.ts +25 -0
- package/src/client/portal/administration.ts +56 -0
- package/src/client/{ai.ts → services.ts} +44 -27
- package/src/contract/account.ts +58 -2
- package/src/contract/admin/index.ts +67 -3
- package/src/contract/collaboration.ts +6 -1
- package/src/contract/discovery.ts +22 -4
- package/src/contract/documents.ts +27 -0
- package/src/contract/entitlements.ts +2 -2
- package/src/contract/index.ts +63 -37
- package/src/contract/relay.ts +6 -0
- package/src/contract/reports.ts +42 -0
- package/src/contract/services.ts +233 -0
- package/src/contract/sharing.ts +3 -9
- package/src/email/render.ts +26 -0
- package/src/email/schema.ts +11 -1
- package/src/email/templates/brand.ts +1 -1
- package/src/runtime/cloudflare/environment.ts +31 -6
- package/src/runtime/cloudflare/index.ts +1 -1
- package/src/runtime/cloudflare/logging.ts +15 -0
- package/src/runtime/cloudflare/maintenance.ts +31 -0
- package/src/runtime/cloudflare/relay/index.ts +176 -0
- package/src/runtime/cloudflare/relay/sockets.ts +112 -0
- package/src/runtime/cloudflare/worker.ts +89 -26
- package/src/runtime/node/application.ts +5 -3
- package/src/runtime/node/bootstrap.ts +20 -4
- package/src/runtime/node/cleanup.ts +16 -3
- package/src/runtime/node/entitlements/main.ts +14 -11
- package/src/runtime/node/index.ts +1 -1
- package/src/runtime/node/migrate.ts +5 -1
- package/src/runtime/node/relay.ts +8 -2
- package/src/runtime/node/request-id.ts +13 -0
- package/src/runtime/node/server.ts +71 -15
- package/src/runtime/node/{ai-relay → services}/main.ts +6 -6
- package/src/runtime/node/{ai-relay → services}/server.ts +18 -18
- package/src/runtime/postgres/database.ts +20 -1
- package/src/runtime/posthog/errors.ts +32 -0
- package/src/runtime/s3/objects.ts +50 -1
- package/src/runtime/site/server.ts +33 -4
- package/src/server/account/actions.ts +5 -0
- package/src/server/account/deletion.ts +302 -0
- package/src/server/account/routes.ts +47 -3
- package/src/server/account/terms.ts +42 -0
- package/src/server/api/router.ts +12 -7
- package/src/server/api/types.ts +9 -0
- package/src/server/app.ts +93 -15
- package/src/server/auth/access-control.ts +63 -0
- package/src/server/auth/adapter.ts +11 -0
- package/src/server/auth/endpoints.ts +5 -1
- package/src/server/auth/factory.ts +30 -3
- package/src/server/auth/index.ts +10 -1
- package/src/server/cleanup/configured.ts +12 -5
- package/src/server/cleanup/documents.ts +165 -71
- package/src/server/cleanup/objects.ts +10 -2
- package/src/server/cleanup/revisions.ts +24 -7
- package/src/server/cleanup/uploads.ts +8 -2
- package/src/server/cleanup/worker.ts +5 -2
- package/src/server/collaboration/index.ts +3 -0
- package/src/server/collaboration/relay/connection.ts +196 -0
- package/src/server/collaboration/relay/documents.ts +13 -10
- package/src/server/collaboration/relay/hub.ts +279 -195
- package/src/server/collaboration/relay/index.ts +3 -1
- package/src/server/collaboration/relay/log.ts +79 -0
- package/src/server/collaboration/relay/persistence.ts +147 -22
- package/src/server/collaboration/relay/resume.ts +28 -0
- package/src/server/collaboration/routes.ts +27 -16
- package/src/server/collaboration/service.ts +27 -31
- package/src/server/config/deployment.ts +35 -4
- package/src/server/config/public.ts +5 -4
- package/src/server/config/schema.ts +104 -16
- package/src/server/db/expressions.ts +15 -1
- package/src/server/db/migrate.ts +34 -114
- package/src/server/db/migrations/001_accounts.ts +79 -0
- package/src/server/db/migrations/002_workspaces.ts +48 -0
- package/src/server/db/migrations/003_storage.ts +44 -0
- package/src/server/db/migrations/004_documents.ts +193 -0
- package/src/server/db/migrations/005_sharing.ts +95 -0
- package/src/server/db/migrations/006_operations.ts +110 -0
- package/src/server/db/migrations/007_trash.ts +33 -0
- package/src/server/db/migrations/008_terms.ts +18 -0
- package/src/server/db/migrations/schema.ts +71 -0
- package/src/server/db/tables.ts +70 -7
- package/src/server/documents/access.ts +66 -55
- package/src/server/documents/errors.ts +7 -0
- package/src/server/documents/images.ts +2 -1
- package/src/server/documents/limits.ts +9 -9
- package/src/server/documents/purge.ts +75 -0
- package/src/server/documents/repository.ts +2 -0
- package/src/server/documents/routes.ts +132 -80
- package/src/server/documents/service.ts +18 -4
- package/src/server/documents/summary.ts +1 -0
- package/src/server/documents/trash.ts +203 -0
- package/src/server/documents/versions/checkpoint.ts +2 -1
- package/src/server/documents/versions/history.ts +11 -7
- package/src/server/documents/versions/routes.ts +36 -25
- package/src/server/documents/versions/service.ts +22 -4
- package/src/server/errors/index.ts +99 -0
- package/src/server/errors/posthog.ts +80 -0
- package/src/server/index.ts +56 -16
- package/src/server/internal/index.ts +3 -3
- package/src/server/internal/routes.ts +7 -15
- package/src/server/internal/schema.ts +1 -1
- package/src/server/internal/service.ts +17 -23
- package/src/server/invitations/budget.ts +66 -0
- package/src/server/invitations/index.ts +1 -0
- package/src/server/logging.ts +76 -0
- package/src/server/objects/types.ts +12 -0
- package/src/server/pictures/routes.ts +4 -2
- package/src/server/pictures/service.ts +2 -1
- package/src/server/policy/database.ts +39 -25
- package/src/server/policy/index.ts +2 -1
- package/src/server/policy/keys.ts +5 -2
- package/src/server/policy/policy.ts +1 -0
- package/src/server/policy/schema.ts +2 -2
- package/src/server/policy/service.ts +12 -9
- package/src/server/policy/static.ts +5 -5
- package/src/server/policy/workspace.ts +41 -0
- package/src/server/quota/reconcile.ts +2 -0
- package/src/server/quota/storage.ts +69 -31
- package/src/server/rate-limit/cleanup.ts +17 -5
- package/src/server/rate-limit/index.ts +4 -1
- package/src/server/rate-limit/middleware.ts +100 -12
- package/src/server/reports/index.ts +8 -0
- package/src/server/reports/routes.ts +37 -0
- package/src/server/reports/service.ts +123 -0
- package/src/server/services/errors.ts +7 -0
- package/src/server/services/index.ts +8 -0
- package/src/server/{ai → services}/keys.ts +11 -11
- package/src/server/services/routes.ts +47 -0
- package/src/server/{ai/service.ts → services/tokens.ts} +23 -20
- package/src/server/sharing/capabilities/service.ts +68 -22
- package/src/server/sharing/document-routes.ts +30 -22
- package/src/server/sharing/grants/service.ts +11 -18
- package/src/server/sharing/http.ts +4 -0
- package/src/server/sharing/invitations/service.ts +21 -11
- package/src/server/sharing/policy.ts +9 -14
- package/src/server/sharing/routes.ts +108 -85
- package/src/server/sharing/service.ts +1 -17
- package/src/server/validation.ts +59 -2
- package/src/server/workspaces/index.ts +1 -0
- package/src/server/workspaces/members.ts +89 -38
- package/src/server/workspaces/repository.ts +2 -1
- package/src/server/workspaces/routes.ts +67 -45
- package/src/{ai-relay → services}/app.ts +48 -44
- package/src/{ai-relay → services}/config.ts +25 -19
- package/src/services/db/index.ts +10 -0
- package/src/services/db/migrate.ts +37 -0
- package/src/{ai-relay/db/migrations/001_usage.ts → services/db/migrations/001_baseline.ts} +18 -7
- package/src/services/db/schema.ts +22 -0
- package/src/services/index.ts +18 -0
- package/src/{ai-relay → services}/metering.ts +2 -2
- package/src/{ai-relay → services}/usage.ts +43 -19
- package/dist/bin/ai-relay.mjs.map +0 -1
- package/src/ai-relay/db/index.ts +0 -10
- package/src/ai-relay/db/migrate.ts +0 -32
- package/src/ai-relay/db/schema.ts +0 -20
- package/src/ai-relay/index.ts +0 -18
- package/src/contract/ai.ts +0 -150
- package/src/runtime/cloudflare/relay.ts +0 -136
- package/src/server/ai/errors.ts +0 -7
- package/src/server/ai/index.ts +0 -4
- package/src/server/ai/routes.ts +0 -43
- package/src/server/auth/workspace-access.ts +0 -23
- package/src/server/db/migrations/001_foundation.ts +0 -164
- package/src/server/db/migrations/002_upload_cleanup_claims.ts +0 -34
- package/src/server/db/migrations/003_document_cleanup_claims.ts +0 -23
- package/src/server/db/migrations/004_document_sharing.ts +0 -82
- package/src/server/db/migrations/005_document_collaboration_epoch.ts +0 -13
- package/src/server/db/migrations/006_invitation_continuation.ts +0 -27
- package/src/server/db/migrations/007_collaboration_state.ts +0 -25
- package/src/server/db/migrations/008_storage_reservations.ts +0 -37
- package/src/server/db/migrations/009_workspace_entitlements.ts +0 -22
- package/src/server/db/migrations/010_upload_finalization.ts +0 -22
- package/src/server/db/migrations/011_upload_finalization_lease.ts +0 -12
- package/src/server/db/migrations/012_transactional_email.ts +0 -48
- package/src/server/db/migrations/013_admin_enrollment.ts +0 -54
- package/src/server/db/migrations/014_enrollment_email_kinds.ts +0 -30
- package/src/server/db/migrations/015_cloud_rate_limit.ts +0 -22
- package/src/server/db/migrations/016_auth_schema.ts +0 -16
- package/src/server/db/migrations/017_authentication_email_kinds.ts +0 -32
- package/src/server/db/migrations/018_authentication_mfa.ts +0 -78
- package/src/server/db/migrations/019_better_auth_account_issuer.ts +0 -42
- package/src/server/db/migrations/020_workspace_invitations.ts +0 -57
- package/src/server/db/migrations/021_document_versions.ts +0 -66
- package/src/server/db/migrations/022_entitlement_external_version.ts +0 -17
- package/src/server/db/migrations/023_document_images.ts +0 -61
- package/src/server/db/migrations/024_account_activity.ts +0 -66
- package/src/server/db/migrations/025_table_names.ts +0 -58
- package/src/server/db/migrations/026_user_picture.ts +0 -30
- package/src/server/db/migrations/027_document_kind.ts +0 -19
- package/src/server/db/migrations/helpers.ts +0 -78
- /package/dist/bin/{ai-relay.d.mts → services.d.mts} +0 -0
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { CloudDatabase } from '#cloud/server/db'
|
|
2
|
-
import { DocumentForbiddenError } from '#cloud/server/documents/errors'
|
|
3
|
-
import { CLOUD_FEATURE_KEYS, type CloudPolicy
|
|
2
|
+
import { DocumentForbiddenError, DocumentNotFoundError } from '#cloud/server/documents/errors'
|
|
3
|
+
import { CLOUD_FEATURE_KEYS, type CloudPolicy } from '#cloud/server/policy'
|
|
4
|
+
import { workspacePolicyContext } from '#cloud/server/policy/workspace'
|
|
4
5
|
import type { Kysely } from 'kysely'
|
|
5
6
|
|
|
6
7
|
export type SharingPolicyOptions = {
|
|
@@ -19,18 +20,12 @@ export function createSharingPolicy(
|
|
|
19
20
|
) {
|
|
20
21
|
async function requireCapabilityLink(input: CapabilityLinkPolicyInput): Promise<void> {
|
|
21
22
|
if (!options.policy) return
|
|
22
|
-
const
|
|
23
|
-
|
|
24
|
-
.
|
|
25
|
-
.
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
targetingKey: document.workspaceId,
|
|
29
|
-
actorId: input.actorId,
|
|
30
|
-
workspaceId: document.workspaceId,
|
|
31
|
-
documentId: input.documentId,
|
|
32
|
-
deploymentMode: options.deploymentMode ?? 'self-hosted'
|
|
33
|
-
}
|
|
23
|
+
const context = await workspacePolicyContext(
|
|
24
|
+
database,
|
|
25
|
+
{ documentId: input.documentId },
|
|
26
|
+
{ actorId: input.actorId, deploymentMode: options.deploymentMode ?? 'self-hosted' }
|
|
27
|
+
)
|
|
28
|
+
if (!context) throw new DocumentNotFoundError()
|
|
34
29
|
// Whether guests may follow the link is checked when they do, so edit links still work for
|
|
35
30
|
// people signed in to the server.
|
|
36
31
|
if (!(await options.policy.boolean(CLOUD_FEATURE_KEYS.links, false, context))) {
|
|
@@ -2,7 +2,6 @@ import {
|
|
|
2
2
|
parseAcceptDocumentInvitation,
|
|
3
3
|
parseCreateInvitationContinuation,
|
|
4
4
|
parseCreateDocumentInvitation,
|
|
5
|
-
parseLookupCloudUser,
|
|
6
5
|
parseCreateDocumentShare,
|
|
7
6
|
parsePutDocumentGrant,
|
|
8
7
|
parseResolveDocumentShare,
|
|
@@ -10,10 +9,23 @@ import {
|
|
|
10
9
|
} from '#cloud/contract'
|
|
11
10
|
import type { CloudActor, CloudSessionResolver } from '#cloud/server/auth'
|
|
12
11
|
import type { CloudDatabase } from '#cloud/server/db'
|
|
13
|
-
import {
|
|
12
|
+
import {
|
|
13
|
+
CLOUD_RATE_LIMITS,
|
|
14
|
+
routeParamResource,
|
|
15
|
+
createResourceRateLimiter
|
|
16
|
+
} from '#cloud/server/rate-limit'
|
|
14
17
|
import { sharingRoute } from '#cloud/server/sharing/http'
|
|
15
18
|
import type { DocumentSharingService } from '#cloud/server/sharing/service'
|
|
16
|
-
import {
|
|
19
|
+
import {
|
|
20
|
+
documentInvitationParams,
|
|
21
|
+
documentParams,
|
|
22
|
+
documentShareParams,
|
|
23
|
+
documentUserParams,
|
|
24
|
+
invitationContinuationParams,
|
|
25
|
+
invitationParams,
|
|
26
|
+
shareParams,
|
|
27
|
+
validatedJSON
|
|
28
|
+
} from '#cloud/server/validation'
|
|
17
29
|
import { Hono } from 'hono'
|
|
18
30
|
import type { Kysely } from 'kysely'
|
|
19
31
|
|
|
@@ -31,147 +43,146 @@ export function createDocumentSharingRoutes(
|
|
|
31
43
|
if (rateLimit) {
|
|
32
44
|
router.use(
|
|
33
45
|
'/documents/:documentId/invitations',
|
|
34
|
-
|
|
46
|
+
createResourceRateLimiter(
|
|
35
47
|
rateLimit.database,
|
|
36
48
|
rateLimit.secret,
|
|
37
49
|
CLOUD_RATE_LIMITS.invitationMutation,
|
|
38
|
-
(
|
|
39
|
-
(context) => context.req.
|
|
50
|
+
routeParamResource('documentId'),
|
|
51
|
+
(context) => context.req.method !== 'POST'
|
|
40
52
|
)
|
|
41
53
|
)
|
|
42
54
|
}
|
|
43
55
|
return router
|
|
44
|
-
.
|
|
45
|
-
sharingRoute(context, async () =>
|
|
46
|
-
context.json({
|
|
47
|
-
user: await service.lookupUser(
|
|
48
|
-
context.get('actor').userId,
|
|
49
|
-
context.req.param('documentId'),
|
|
50
|
-
context.req.valid('json')
|
|
51
|
-
)
|
|
52
|
-
})
|
|
53
|
-
)
|
|
54
|
-
)
|
|
55
|
-
.get('/documents/:documentId/users/:userId', (context) =>
|
|
56
|
+
.get('/documents/:documentId/users/:userId', documentUserParams, (context) =>
|
|
56
57
|
sharingRoute(context, async () =>
|
|
57
58
|
context.json({
|
|
58
59
|
user: await service.userProfile(
|
|
59
60
|
context.get('actor').userId,
|
|
60
|
-
context.req.
|
|
61
|
-
context.req.
|
|
61
|
+
context.req.valid('param').documentId,
|
|
62
|
+
context.req.valid('param').userId
|
|
62
63
|
)
|
|
63
64
|
})
|
|
64
65
|
)
|
|
65
66
|
)
|
|
66
|
-
.get('/documents/:documentId/shares', (context) =>
|
|
67
|
+
.get('/documents/:documentId/shares', documentParams, (context) =>
|
|
67
68
|
sharingRoute(context, async () =>
|
|
68
69
|
context.json({
|
|
69
70
|
shares: await service.listShares(
|
|
70
71
|
context.get('actor').userId,
|
|
71
|
-
context.req.
|
|
72
|
+
context.req.valid('param').documentId
|
|
72
73
|
)
|
|
73
74
|
})
|
|
74
75
|
)
|
|
75
76
|
)
|
|
76
|
-
.post(
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
77
|
+
.post(
|
|
78
|
+
'/documents/:documentId/shares',
|
|
79
|
+
documentParams,
|
|
80
|
+
validatedJSON(parseCreateDocumentShare),
|
|
81
|
+
(context) =>
|
|
82
|
+
sharingRoute(context, async () =>
|
|
83
|
+
context.json(
|
|
84
|
+
await service.createShare(
|
|
85
|
+
context.get('actor').userId,
|
|
86
|
+
context.req.valid('param').documentId,
|
|
87
|
+
context.req.valid('json')
|
|
88
|
+
),
|
|
89
|
+
201
|
|
90
|
+
)
|
|
85
91
|
)
|
|
86
|
-
)
|
|
87
92
|
)
|
|
88
93
|
.patch(
|
|
89
94
|
'/documents/:documentId/shares/:shareId',
|
|
95
|
+
documentShareParams,
|
|
90
96
|
validatedJSON(parseUpdateDocumentShare),
|
|
91
97
|
(context) =>
|
|
92
98
|
sharingRoute(context, async () =>
|
|
93
99
|
context.json({
|
|
94
100
|
share: await service.updateShare(
|
|
95
101
|
context.get('actor').userId,
|
|
96
|
-
context.req.
|
|
97
|
-
context.req.
|
|
102
|
+
context.req.valid('param').documentId,
|
|
103
|
+
context.req.valid('param').shareId,
|
|
98
104
|
context.req.valid('json')
|
|
99
105
|
)
|
|
100
106
|
})
|
|
101
107
|
)
|
|
102
108
|
)
|
|
103
|
-
.post('/documents/:documentId/shares/:shareId/rotate', (context) =>
|
|
109
|
+
.post('/documents/:documentId/shares/:shareId/rotate', documentShareParams, (context) =>
|
|
104
110
|
sharingRoute(context, async () =>
|
|
105
111
|
context.json(
|
|
106
112
|
await service.rotateShare(
|
|
107
113
|
context.get('actor').userId,
|
|
108
|
-
context.req.
|
|
109
|
-
context.req.
|
|
114
|
+
context.req.valid('param').documentId,
|
|
115
|
+
context.req.valid('param').shareId
|
|
110
116
|
)
|
|
111
117
|
)
|
|
112
118
|
)
|
|
113
119
|
)
|
|
114
|
-
.delete('/documents/:documentId/shares/:shareId', (context) =>
|
|
120
|
+
.delete('/documents/:documentId/shares/:shareId', documentShareParams, (context) =>
|
|
115
121
|
sharingRoute(context, async () => {
|
|
116
122
|
await service.revokeShare(
|
|
117
123
|
context.get('actor').userId,
|
|
118
|
-
context.req.
|
|
119
|
-
context.req.
|
|
124
|
+
context.req.valid('param').documentId,
|
|
125
|
+
context.req.valid('param').shareId
|
|
120
126
|
)
|
|
121
127
|
return context.body(null, 204)
|
|
122
128
|
})
|
|
123
129
|
)
|
|
124
|
-
.get('/documents/:documentId/grants', (context) =>
|
|
130
|
+
.get('/documents/:documentId/grants', documentParams, (context) =>
|
|
125
131
|
sharingRoute(context, async () =>
|
|
126
132
|
context.json({
|
|
127
133
|
grants: await service.listGrants(
|
|
128
134
|
context.get('actor').userId,
|
|
129
|
-
context.req.
|
|
135
|
+
context.req.valid('param').documentId
|
|
130
136
|
)
|
|
131
137
|
})
|
|
132
138
|
)
|
|
133
139
|
)
|
|
134
|
-
.put(
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
140
|
+
.put(
|
|
141
|
+
'/documents/:documentId/grants/:userId',
|
|
142
|
+
documentUserParams,
|
|
143
|
+
validatedJSON(parsePutDocumentGrant),
|
|
144
|
+
(context) =>
|
|
145
|
+
sharingRoute(context, async () =>
|
|
146
|
+
context.json({
|
|
147
|
+
grant: await service.putGrant(
|
|
148
|
+
context.get('actor').userId,
|
|
149
|
+
context.req.valid('param').documentId,
|
|
150
|
+
context.req.valid('param').userId,
|
|
151
|
+
context.req.valid('json')
|
|
152
|
+
)
|
|
153
|
+
})
|
|
154
|
+
)
|
|
145
155
|
)
|
|
146
|
-
.delete('/documents/:documentId/grants/:userId', (context) =>
|
|
156
|
+
.delete('/documents/:documentId/grants/:userId', documentUserParams, (context) =>
|
|
147
157
|
sharingRoute(context, async () => {
|
|
148
158
|
await service.revokeGrant(
|
|
149
159
|
context.get('actor').userId,
|
|
150
|
-
context.req.
|
|
151
|
-
context.req.
|
|
160
|
+
context.req.valid('param').documentId,
|
|
161
|
+
context.req.valid('param').userId
|
|
152
162
|
)
|
|
153
163
|
return context.body(null, 204)
|
|
154
164
|
})
|
|
155
165
|
)
|
|
156
|
-
.get('/documents/:documentId/invitations', (context) =>
|
|
166
|
+
.get('/documents/:documentId/invitations', documentParams, (context) =>
|
|
157
167
|
sharingRoute(context, async () =>
|
|
158
168
|
context.json({
|
|
159
169
|
invitations: await service.listInvitations(
|
|
160
170
|
context.get('actor').userId,
|
|
161
|
-
context.req.
|
|
171
|
+
context.req.valid('param').documentId
|
|
162
172
|
)
|
|
163
173
|
})
|
|
164
174
|
)
|
|
165
175
|
)
|
|
166
176
|
.post(
|
|
167
177
|
'/documents/:documentId/invitations',
|
|
178
|
+
documentParams,
|
|
168
179
|
validatedJSON(parseCreateDocumentInvitation),
|
|
169
180
|
(context) =>
|
|
170
181
|
sharingRoute(context, async () =>
|
|
171
182
|
context.json(
|
|
172
183
|
await service.createInvitation(
|
|
173
184
|
context.get('actor').userId,
|
|
174
|
-
context.req.
|
|
185
|
+
context.req.valid('param').documentId,
|
|
175
186
|
context.req.valid('json')
|
|
176
187
|
),
|
|
177
188
|
201
|
|
@@ -180,27 +191,31 @@ export function createDocumentSharingRoutes(
|
|
|
180
191
|
)
|
|
181
192
|
.post(
|
|
182
193
|
'/invitations/:invitationId/accept',
|
|
194
|
+
invitationParams,
|
|
183
195
|
validatedJSON(parseAcceptDocumentInvitation),
|
|
184
196
|
(context) =>
|
|
185
197
|
sharingRoute(context, async () =>
|
|
186
198
|
context.json({
|
|
187
199
|
accepted: await service.acceptInvitation(
|
|
188
200
|
context.get('actor'),
|
|
189
|
-
context.req.
|
|
201
|
+
context.req.valid('param').invitationId,
|
|
190
202
|
context.req.valid('json')
|
|
191
203
|
)
|
|
192
204
|
})
|
|
193
205
|
)
|
|
194
206
|
)
|
|
195
|
-
.delete(
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
207
|
+
.delete(
|
|
208
|
+
'/documents/:documentId/invitations/:invitationId',
|
|
209
|
+
documentInvitationParams,
|
|
210
|
+
(context) =>
|
|
211
|
+
sharingRoute(context, async () => {
|
|
212
|
+
await service.revokeInvitation(
|
|
213
|
+
context.get('actor').userId,
|
|
214
|
+
context.req.valid('param').documentId,
|
|
215
|
+
context.req.valid('param').invitationId
|
|
216
|
+
)
|
|
217
|
+
return context.body(null, 204)
|
|
218
|
+
})
|
|
204
219
|
)
|
|
205
220
|
}
|
|
206
221
|
|
|
@@ -217,35 +232,43 @@ export function createPublicSharingRoutes(
|
|
|
217
232
|
context.json(await service.createInvitationContinuation(context.req.valid('json')), 201)
|
|
218
233
|
)
|
|
219
234
|
)
|
|
220
|
-
.post(
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
235
|
+
.post(
|
|
236
|
+
'/invitations/continuations/:continuationId/consume',
|
|
237
|
+
invitationContinuationParams,
|
|
238
|
+
(context) =>
|
|
239
|
+
sharingRoute(context, async () =>
|
|
240
|
+
context.json(
|
|
241
|
+
await service.consumeInvitationContinuation(context.req.valid('param').continuationId)
|
|
242
|
+
)
|
|
224
243
|
)
|
|
225
|
-
)
|
|
226
244
|
)
|
|
227
245
|
.post(
|
|
228
246
|
'/invitations/:invitationId/preview',
|
|
247
|
+
invitationParams,
|
|
229
248
|
validatedJSON(parseAcceptDocumentInvitation),
|
|
230
249
|
(context) =>
|
|
231
250
|
sharingRoute(context, async () =>
|
|
232
251
|
context.json({
|
|
233
252
|
invitation: await service.previewInvitation(
|
|
234
|
-
context.req.
|
|
253
|
+
context.req.valid('param').invitationId,
|
|
235
254
|
context.req.valid('json')
|
|
236
255
|
)
|
|
237
256
|
})
|
|
238
257
|
)
|
|
239
258
|
)
|
|
240
|
-
.post(
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
259
|
+
.post(
|
|
260
|
+
'/shares/:shareId/resolve',
|
|
261
|
+
shareParams,
|
|
262
|
+
validatedJSON(parseResolveDocumentShare),
|
|
263
|
+
(context) =>
|
|
264
|
+
sharingRoute(context, async () =>
|
|
265
|
+
context.json({
|
|
266
|
+
resolution: await service.resolveShare(
|
|
267
|
+
context.req.valid('param').shareId,
|
|
268
|
+
context.req.valid('json'),
|
|
269
|
+
await shareActor(context.req.raw, resolveSession)
|
|
270
|
+
)
|
|
271
|
+
})
|
|
272
|
+
)
|
|
250
273
|
)
|
|
251
274
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { CloudUserProfile
|
|
1
|
+
import type { CloudUserProfile } from '#cloud/contract'
|
|
2
2
|
import type { CloudDatabase } from '#cloud/server/db'
|
|
3
3
|
import type { InvitationDelivery, InvitationOutbox } from '#cloud/server/invitations'
|
|
4
4
|
import type { CloudPolicy } from '#cloud/server/policy/policy'
|
|
@@ -35,22 +35,6 @@ export function createDocumentSharingService(
|
|
|
35
35
|
const invitations = createInvitationService(database, options)
|
|
36
36
|
|
|
37
37
|
return {
|
|
38
|
-
async lookupUser(
|
|
39
|
-
userId: string,
|
|
40
|
-
documentId: string,
|
|
41
|
-
input: LookupCloudUserInput
|
|
42
|
-
): Promise<CloudUserProfile | null> {
|
|
43
|
-
await requireSharingAccess(database, userId, documentId)
|
|
44
|
-
const user = await database
|
|
45
|
-
.selectFrom('user')
|
|
46
|
-
.select(['id', 'name', 'email', 'image'])
|
|
47
|
-
.where((expression) =>
|
|
48
|
-
expression(expression.fn('lower', [expression.ref('email')]), '=', input.email)
|
|
49
|
-
)
|
|
50
|
-
.executeTakeFirst()
|
|
51
|
-
return user ?? null
|
|
52
|
-
},
|
|
53
|
-
|
|
54
38
|
async userProfile(
|
|
55
39
|
userId: string,
|
|
56
40
|
documentId: string,
|
package/src/server/validation.ts
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import type { Context } from 'hono'
|
|
2
2
|
import { validator } from 'hono/validator'
|
|
3
|
-
import
|
|
3
|
+
import * as v from 'valibot'
|
|
4
4
|
|
|
5
5
|
/** A request part that fails its schema is a 400, never a server error. */
|
|
6
6
|
function parseOrReject<T>(parse: (input: unknown) => T, value: unknown, context: Context) {
|
|
7
7
|
try {
|
|
8
8
|
return parse(value)
|
|
9
9
|
} catch (error) {
|
|
10
|
-
if (error instanceof ValiError) {
|
|
10
|
+
if (error instanceof v.ValiError) {
|
|
11
11
|
return context.json({ error: { code: 'invalid_request' as const } }, 400)
|
|
12
12
|
}
|
|
13
13
|
throw error
|
|
@@ -22,3 +22,60 @@ export function validatedJSON<T>(parse: (input: unknown) => T) {
|
|
|
22
22
|
export function validatedQuery<T>(parse: (input: unknown) => T) {
|
|
23
23
|
return validator('query', (value, context: Context) => parseOrReject(parse, value, context))
|
|
24
24
|
}
|
|
25
|
+
|
|
26
|
+
/**
|
|
27
|
+
* A route parameter that names a row by UUID, in lowercase: the database matches any case, but an
|
|
28
|
+
* ID that also names something else, such as a document's relay, must have one spelling.
|
|
29
|
+
*/
|
|
30
|
+
const uuidParamSchema = v.pipe(v.string(), v.uuid(), v.toLowerCase())
|
|
31
|
+
|
|
32
|
+
/**
|
|
33
|
+
* Route parameters through `schema`; handlers read them from `context.req.valid('param')`. A
|
|
34
|
+
* parameter that fails it names nothing, so the route answers 404 as for a missing row, and the
|
|
35
|
+
* value never reaches the database.
|
|
36
|
+
*/
|
|
37
|
+
export function validatedParams<TOutput>(schema: v.GenericSchema<unknown, TOutput>) {
|
|
38
|
+
return validator('param', (value, context: Context) => {
|
|
39
|
+
const parsed = v.safeParse(schema, value)
|
|
40
|
+
return parsed.success
|
|
41
|
+
? parsed.output
|
|
42
|
+
: context.json({ error: { code: 'not_found' as const } }, 404)
|
|
43
|
+
})
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
/** A route parameter the server takes as text, such as a user ID, which is not a UUID column. */
|
|
47
|
+
const textParamSchema = v.pipe(v.string(), v.minLength(1))
|
|
48
|
+
|
|
49
|
+
export const documentParams = validatedParams(v.object({ documentId: uuidParamSchema }))
|
|
50
|
+
export const documentVersionParams = validatedParams(
|
|
51
|
+
v.object({ documentId: uuidParamSchema, versionId: uuidParamSchema })
|
|
52
|
+
)
|
|
53
|
+
export const documentShareParams = validatedParams(
|
|
54
|
+
v.object({ documentId: uuidParamSchema, shareId: uuidParamSchema })
|
|
55
|
+
)
|
|
56
|
+
export const documentInvitationParams = validatedParams(
|
|
57
|
+
v.object({ documentId: uuidParamSchema, invitationId: uuidParamSchema })
|
|
58
|
+
)
|
|
59
|
+
export const documentUserParams = validatedParams(
|
|
60
|
+
v.object({ documentId: uuidParamSchema, userId: textParamSchema })
|
|
61
|
+
)
|
|
62
|
+
export const workspaceParams = validatedParams(v.object({ workspaceId: uuidParamSchema }))
|
|
63
|
+
export const workspaceInvitationParams = validatedParams(
|
|
64
|
+
v.object({ workspaceId: uuidParamSchema, invitationId: uuidParamSchema })
|
|
65
|
+
)
|
|
66
|
+
export const workspaceMemberParams = validatedParams(
|
|
67
|
+
v.object({ workspaceId: uuidParamSchema, userId: textParamSchema })
|
|
68
|
+
)
|
|
69
|
+
export const accountParams = validatedParams(v.object({ userId: uuidParamSchema }))
|
|
70
|
+
export const shareParams = validatedParams(v.object({ shareId: uuidParamSchema }))
|
|
71
|
+
export const invitationParams = validatedParams(v.object({ invitationId: uuidParamSchema }))
|
|
72
|
+
export const invitationContinuationParams = validatedParams(
|
|
73
|
+
v.object({ continuationId: textParamSchema })
|
|
74
|
+
)
|
|
75
|
+
export const uploadParams = validatedParams(v.object({ uploadId: uuidParamSchema }))
|
|
76
|
+
/** Admin records (enrollments, accounts, and messages), all named by UUID. */
|
|
77
|
+
export const idParams = validatedParams(v.object({ id: uuidParamSchema }))
|
|
78
|
+
/** A picture's address names its owner and a prefix of its checksum, which the service checks. */
|
|
79
|
+
export const pictureParams = validatedParams(
|
|
80
|
+
v.object({ userId: textParamSchema, version: textParamSchema })
|
|
81
|
+
)
|