@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
|
@@ -0,0 +1,219 @@
|
|
|
1
|
+
import { createEnrollmentService, type EnrollmentService } from '#cloud/admin'
|
|
2
|
+
import type {
|
|
3
|
+
CloudAuthAdapter,
|
|
4
|
+
CloudIdentityResolver,
|
|
5
|
+
CloudSessionResolver
|
|
6
|
+
} from '#cloud/server/auth'
|
|
7
|
+
import { enrollmentEmailOptions } from '#cloud/server/auth'
|
|
8
|
+
import { createBillingTokenService, createSeatNotifier } from '#cloud/server/billing'
|
|
9
|
+
import { createCollaborationTicketService } from '#cloud/server/collaboration'
|
|
10
|
+
import { createCommentService } from '#cloud/server/comments'
|
|
11
|
+
import { createCommunityService } from '#cloud/server/community'
|
|
12
|
+
import { CloudConfigError, type CloudServerConfig } from '#cloud/server/config'
|
|
13
|
+
import type { CloudDatabase } from '#cloud/server/db'
|
|
14
|
+
import { createDocumentService } from '#cloud/server/documents'
|
|
15
|
+
import { createDocumentVersionService } from '#cloud/server/documents/versions'
|
|
16
|
+
import type { TransactionalEmailService } from '#cloud/server/email'
|
|
17
|
+
import { reportCloudError, type CloudErrorReporter } from '#cloud/server/errors'
|
|
18
|
+
import type { InvitationDelivery, InvitationOutbox } from '#cloud/server/invitations'
|
|
19
|
+
import type { ForwardedRequestId } from '#cloud/server/logging'
|
|
20
|
+
import type { ObjectStore } from '#cloud/server/objects'
|
|
21
|
+
import { createUserPictures } from '#cloud/server/pictures'
|
|
22
|
+
import {
|
|
23
|
+
createConfiguredCloudPolicy,
|
|
24
|
+
createDefaultCloudPolicy,
|
|
25
|
+
createEntitlementService,
|
|
26
|
+
EntitlementOpenFeatureProvider,
|
|
27
|
+
type CloudPolicy,
|
|
28
|
+
type EntitlementSource
|
|
29
|
+
} from '#cloud/server/policy'
|
|
30
|
+
import { createDocumentReportService } from '#cloud/server/reports'
|
|
31
|
+
import { createServicesTokenService, type ServicesSigningKey } from '#cloud/server/services'
|
|
32
|
+
import { createDocumentSharingService } from '#cloud/server/sharing'
|
|
33
|
+
import { createWorkspaceMemberService, createWorkspaceService } from '#cloud/server/workspaces'
|
|
34
|
+
import type { Kysely } from 'kysely'
|
|
35
|
+
|
|
36
|
+
export type CloudServices = {
|
|
37
|
+
config: CloudServerConfig
|
|
38
|
+
database: Kysely<CloudDatabase>
|
|
39
|
+
auth: CloudAuthAdapter
|
|
40
|
+
objects: ObjectStore
|
|
41
|
+
resolveIdentity?: CloudIdentityResolver
|
|
42
|
+
resolveSession?: CloudSessionResolver
|
|
43
|
+
/**
|
|
44
|
+
* An approved account even before it accepted the current terms, for leaving: reading its
|
|
45
|
+
* documents and deleting the account. Defaults to `resolveSession` when that is given.
|
|
46
|
+
*/
|
|
47
|
+
resolveAccountSession?: CloudSessionResolver
|
|
48
|
+
/**
|
|
49
|
+
* Whether the request's session proved its account's second step, or the account has none.
|
|
50
|
+
* Defaults to the auth adapter's, or to yes when `resolveIdentity` stands in for signing in.
|
|
51
|
+
*/
|
|
52
|
+
twoStepConfirmed?: (request: Request) => Promise<boolean>
|
|
53
|
+
invitationDelivery?: InvitationDelivery
|
|
54
|
+
invitationOutbox?: InvitationOutbox
|
|
55
|
+
transactionalEmail?: TransactionalEmailService
|
|
56
|
+
enrollment?: EnrollmentService
|
|
57
|
+
entitlementSource?: EntitlementSource
|
|
58
|
+
policy?: CloudPolicy
|
|
59
|
+
/** The imported `servicesSigningKey`, required when the config names one. See `loadServicesSigningKey`. */
|
|
60
|
+
servicesSigningKey?: ServicesSigningKey
|
|
61
|
+
/**
|
|
62
|
+
* Where clients reach this runtime's collaboration relay. Without one, Cloud rooms fall back to
|
|
63
|
+
* peer-to-peer and writes are not enforced by the server.
|
|
64
|
+
*/
|
|
65
|
+
relayURL?: string
|
|
66
|
+
/** Ends a restored document's live rooms, on the relay this runtime runs, if any. */
|
|
67
|
+
onDocumentRestored?: (documentId: string) => void
|
|
68
|
+
/** Ends a taken-down document's live rooms, saving them for when it is restored. */
|
|
69
|
+
onDocumentTakenDown?: (documentId: string) => void
|
|
70
|
+
/** Tells a document's live rooms its version history changed, on the relay this runtime runs. */
|
|
71
|
+
onDocumentVersionsChanged?: (documentId: string) => void
|
|
72
|
+
/** Tells a document's live rooms one of its comment threads changed, on this runtime's relay. */
|
|
73
|
+
onDocumentCommentsChanged?: (documentId: string, threadId: string) => void
|
|
74
|
+
/**
|
|
75
|
+
* Keeps work a request started running after its answer, as Workers' `waitUntil` does; without
|
|
76
|
+
* it the work runs on its own, as Node lets it.
|
|
77
|
+
*/
|
|
78
|
+
runInBackground?: (task: Promise<unknown>) => void
|
|
79
|
+
/** Logs errors no route handled, and reports them when the deployment configures error tracking. */
|
|
80
|
+
reportError?: CloudErrorReporter
|
|
81
|
+
/** The request ID this runtime trusts from what stands in front of it, such as `cf-ray`. */
|
|
82
|
+
forwardedRequestId?: ForwardedRequestId
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
/** The domain services the app's routes are built from, over the runtime's injected services. */
|
|
86
|
+
export function createAppServices(services: CloudServices) {
|
|
87
|
+
const { config, database, objects } = services
|
|
88
|
+
const workspaces = createWorkspaceService(database)
|
|
89
|
+
const pictures = createUserPictures(database, { publicURL: config.publicURL })
|
|
90
|
+
const billingTokens =
|
|
91
|
+
services.servicesSigningKey && config.billingEndpoint
|
|
92
|
+
? createBillingTokenService({
|
|
93
|
+
issuer: new URL(config.publicURL).origin,
|
|
94
|
+
signingKey: services.servicesSigningKey,
|
|
95
|
+
lifetimeSeconds: config.servicesTokenLifetimeSeconds
|
|
96
|
+
})
|
|
97
|
+
: undefined
|
|
98
|
+
// Billing charges for the people who can edit, so it hears when they change.
|
|
99
|
+
const seatNotifier =
|
|
100
|
+
billingTokens && config.billingEndpoint
|
|
101
|
+
? createSeatNotifier({ database, endpoint: config.billingEndpoint, tokens: billingTokens })
|
|
102
|
+
: undefined
|
|
103
|
+
const onSeatsChanged = seatNotifier
|
|
104
|
+
? (accountIds: readonly string[]) => {
|
|
105
|
+
const task = seatNotifier.notify(accountIds).catch((error: unknown) => {
|
|
106
|
+
void reportCloudError(services.reportError, 'Telling billing about seats failed', error, {
|
|
107
|
+
source: 'background'
|
|
108
|
+
})
|
|
109
|
+
})
|
|
110
|
+
if (services.runInBackground) services.runInBackground(task)
|
|
111
|
+
}
|
|
112
|
+
: undefined
|
|
113
|
+
const workspaceMembers = createWorkspaceMemberService(database, {
|
|
114
|
+
email: services.transactionalEmail,
|
|
115
|
+
publicURL: config.publicURL,
|
|
116
|
+
onSeatsChanged
|
|
117
|
+
})
|
|
118
|
+
const enrollment =
|
|
119
|
+
services.enrollment ??
|
|
120
|
+
createEnrollmentService(database, enrollmentEmailOptions(config, services.transactionalEmail))
|
|
121
|
+
const policy =
|
|
122
|
+
services.policy ??
|
|
123
|
+
(services.entitlementSource
|
|
124
|
+
? createDefaultCloudPolicy(new EntitlementOpenFeatureProvider(services.entitlementSource))
|
|
125
|
+
: createConfiguredCloudPolicy(config, database))
|
|
126
|
+
const documents = createDocumentService(database, objects, {
|
|
127
|
+
policy,
|
|
128
|
+
technicalMaximumUploadBytes: config.technicalLimits.maximumUploadBytes,
|
|
129
|
+
onVersionsChanged: services.onDocumentVersionsChanged,
|
|
130
|
+
trash: {
|
|
131
|
+
retentionMs: config.documentRetentionMs,
|
|
132
|
+
purgeGraceMs: config.documentPurgeGraceMs,
|
|
133
|
+
leaseDurationMs: config.cleanupLeaseDurationMs,
|
|
134
|
+
reportError: services.reportError
|
|
135
|
+
},
|
|
136
|
+
reportError: services.reportError
|
|
137
|
+
})
|
|
138
|
+
const versions = createDocumentVersionService(database, objects, {
|
|
139
|
+
policy,
|
|
140
|
+
deploymentMode: config.deployment,
|
|
141
|
+
onRestored: services.onDocumentRestored,
|
|
142
|
+
onVersionsChanged: services.onDocumentVersionsChanged
|
|
143
|
+
})
|
|
144
|
+
const community = createCommunityService(
|
|
145
|
+
database,
|
|
146
|
+
objects,
|
|
147
|
+
documents,
|
|
148
|
+
versions,
|
|
149
|
+
config.community?.workspaceId ?? null
|
|
150
|
+
)
|
|
151
|
+
const entitlements = createEntitlementService(
|
|
152
|
+
database,
|
|
153
|
+
policy,
|
|
154
|
+
config.technicalLimits.maximumUploadBytes,
|
|
155
|
+
config.technicalLimits.maximumConnectionsPerRoom
|
|
156
|
+
)
|
|
157
|
+
const sharing = createDocumentSharingService(database, {
|
|
158
|
+
delivery: services.invitationDelivery,
|
|
159
|
+
outbox: services.invitationOutbox,
|
|
160
|
+
continuationSecret: config.authSecret,
|
|
161
|
+
publicURL: config.publicURL,
|
|
162
|
+
policy,
|
|
163
|
+
deploymentMode: config.deployment,
|
|
164
|
+
workspaceInvitations: workspaceMembers
|
|
165
|
+
})
|
|
166
|
+
const collaboration = createCollaborationTicketService({
|
|
167
|
+
database,
|
|
168
|
+
sharing,
|
|
169
|
+
authSecret: config.authSecret,
|
|
170
|
+
relayURL: services.relayURL,
|
|
171
|
+
policy,
|
|
172
|
+
deploymentMode: config.deployment
|
|
173
|
+
})
|
|
174
|
+
if (config.servicesSigningKey && !services.servicesSigningKey) {
|
|
175
|
+
throw new CloudConfigError('Services need the signing key imported by loadServicesSigningKey')
|
|
176
|
+
}
|
|
177
|
+
const servicesTokens = services.servicesSigningKey
|
|
178
|
+
? createServicesTokenService({
|
|
179
|
+
database,
|
|
180
|
+
policy,
|
|
181
|
+
deploymentMode: config.deployment,
|
|
182
|
+
issuer: new URL(config.publicURL).origin,
|
|
183
|
+
signingKey: services.servicesSigningKey,
|
|
184
|
+
lifetimeSeconds: config.servicesTokenLifetimeSeconds
|
|
185
|
+
})
|
|
186
|
+
: undefined
|
|
187
|
+
const comments = createCommentService(database, {
|
|
188
|
+
sharing,
|
|
189
|
+
onCommentsChanged: services.onDocumentCommentsChanged,
|
|
190
|
+
notifier: services.transactionalEmail
|
|
191
|
+
? { email: services.transactionalEmail, publicURL: config.publicURL }
|
|
192
|
+
: undefined
|
|
193
|
+
})
|
|
194
|
+
const reports = createDocumentReportService(database, {
|
|
195
|
+
sharing,
|
|
196
|
+
email: services.transactionalEmail,
|
|
197
|
+
adminRecipients: config.enrollmentAdminNotificationEmails,
|
|
198
|
+
publicURL: config.publicURL
|
|
199
|
+
})
|
|
200
|
+
return {
|
|
201
|
+
workspaces,
|
|
202
|
+
pictures,
|
|
203
|
+
workspaceMembers,
|
|
204
|
+
enrollment,
|
|
205
|
+
policy,
|
|
206
|
+
documents,
|
|
207
|
+
versions,
|
|
208
|
+
community,
|
|
209
|
+
entitlements,
|
|
210
|
+
sharing,
|
|
211
|
+
collaboration,
|
|
212
|
+
servicesTokens,
|
|
213
|
+
billingTokens,
|
|
214
|
+
comments,
|
|
215
|
+
reports
|
|
216
|
+
}
|
|
217
|
+
}
|
|
218
|
+
|
|
219
|
+
export type CloudAppServices = ReturnType<typeof createAppServices>
|
|
@@ -3,8 +3,11 @@ import { createAccessControl } from 'better-auth/plugins/access'
|
|
|
3
3
|
|
|
4
4
|
export const accessStatements = {
|
|
5
5
|
workspace: ['read', 'update', 'delete', 'invite', 'manage-members'],
|
|
6
|
-
/**
|
|
7
|
-
|
|
6
|
+
/**
|
|
7
|
+
* `delete` moves a document to Trash and back; `purge` deletes it from Trash for good.
|
|
8
|
+
* `comment` writes comments, which everyone who can read may; `moderate` deletes anyone's.
|
|
9
|
+
*/
|
|
10
|
+
document: ['create', 'read', 'comment', 'edit', 'moderate', 'share', 'delete', 'purge']
|
|
8
11
|
} as const
|
|
9
12
|
|
|
10
13
|
type AccessStatements = typeof accessStatements
|
|
@@ -23,15 +26,15 @@ export const accessControl = createAccessControl(accessStatements)
|
|
|
23
26
|
export const workspaceRoles = {
|
|
24
27
|
admin: accessControl.newRole({
|
|
25
28
|
workspace: ['read', 'update', 'delete', 'invite', 'manage-members'],
|
|
26
|
-
document: ['create', 'read', 'edit', 'share', 'delete', 'purge']
|
|
29
|
+
document: ['create', 'read', 'comment', 'edit', 'moderate', 'share', 'delete', 'purge']
|
|
27
30
|
}),
|
|
28
31
|
editor: accessControl.newRole({
|
|
29
32
|
workspace: ['read'],
|
|
30
|
-
document: ['create', 'read', 'edit', 'share', 'delete']
|
|
33
|
+
document: ['create', 'read', 'comment', 'edit', 'moderate', 'share', 'delete']
|
|
31
34
|
}),
|
|
32
35
|
viewer: accessControl.newRole({
|
|
33
36
|
workspace: ['read'],
|
|
34
|
-
document: ['read']
|
|
37
|
+
document: ['read', 'comment']
|
|
35
38
|
})
|
|
36
39
|
} satisfies Record<WorkspaceRole, unknown>
|
|
37
40
|
|
|
@@ -41,9 +44,11 @@ export const workspaceRoles = {
|
|
|
41
44
|
* owner's document. Deleting from Trash for good is for the owner and workspace administrators.
|
|
42
45
|
*/
|
|
43
46
|
export const documentRoles = {
|
|
44
|
-
owner: accessControl.newRole({
|
|
45
|
-
|
|
46
|
-
|
|
47
|
+
owner: accessControl.newRole({
|
|
48
|
+
document: ['read', 'comment', 'edit', 'moderate', 'share', 'delete', 'purge']
|
|
49
|
+
}),
|
|
50
|
+
editor: accessControl.newRole({ document: ['read', 'comment', 'edit', 'moderate', 'share'] }),
|
|
51
|
+
viewer: accessControl.newRole({ document: ['read', 'comment'] })
|
|
47
52
|
}
|
|
48
53
|
|
|
49
54
|
export type DocumentRole = keyof typeof documentRoles
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import type { EnrollmentService } from '#cloud/admin/enrollment/service'
|
|
2
|
+
import { CLOUD_ACCESS_TOKEN_PREFIX, type CloudAccessToken } from '#cloud/contract'
|
|
3
|
+
import type { TermsService } from '#cloud/server/account/terms'
|
|
4
|
+
import type { CloudServerConfig } from '#cloud/server/config'
|
|
5
|
+
import type { CloudDatabase } from '#cloud/server/db'
|
|
6
|
+
import type { Kysely } from 'kysely'
|
|
7
|
+
|
|
8
|
+
/** The personal access token in `Authorization: Bearer`, when the header carries one of Cloud's. */
|
|
9
|
+
export function bearerAccessToken(headers: Headers): string | null {
|
|
10
|
+
const key = headers.get('authorization')?.match(/^Bearer\s+(\S+)$/i)?.[1]
|
|
11
|
+
return key?.startsWith(CLOUD_ACCESS_TOKEN_PREFIX) ? key : null
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
/**
|
|
15
|
+
* The account a verified token belongs to, held to what a session would be: not banned, approved,
|
|
16
|
+
* and with the current terms accepted.
|
|
17
|
+
*/
|
|
18
|
+
export async function accessTokenAccount(
|
|
19
|
+
{
|
|
20
|
+
database,
|
|
21
|
+
config,
|
|
22
|
+
enrollment,
|
|
23
|
+
terms
|
|
24
|
+
}: {
|
|
25
|
+
database: Kysely<CloudDatabase>
|
|
26
|
+
config: CloudServerConfig
|
|
27
|
+
enrollment: EnrollmentService
|
|
28
|
+
terms: TermsService
|
|
29
|
+
},
|
|
30
|
+
userId: string
|
|
31
|
+
) {
|
|
32
|
+
const user = await database
|
|
33
|
+
.selectFrom('user')
|
|
34
|
+
.select(['id', 'email', 'name', 'image', 'role', 'banned', 'banExpires'])
|
|
35
|
+
.where('id', '=', userId)
|
|
36
|
+
.executeTakeFirst()
|
|
37
|
+
if (!user) return null
|
|
38
|
+
const banExpires = user.banExpires ? new Date(user.banExpires).getTime() : null
|
|
39
|
+
if (user.banned && (banExpires === null || banExpires > Date.now())) return null
|
|
40
|
+
if (config.enrollmentMode === 'approval' && !(await enrollment.isApproved(user.email))) {
|
|
41
|
+
return null
|
|
42
|
+
}
|
|
43
|
+
if (!(await terms.hasAccepted(user.id))) return null
|
|
44
|
+
return user
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/** A stored token as the account's token list shows it, without the secret. */
|
|
48
|
+
export const toAccessToken = (key: {
|
|
49
|
+
id: string
|
|
50
|
+
name: string | null
|
|
51
|
+
start: string | null
|
|
52
|
+
createdAt: Date
|
|
53
|
+
expiresAt: Date | null
|
|
54
|
+
lastRequest: Date | null
|
|
55
|
+
}): CloudAccessToken => ({
|
|
56
|
+
id: key.id,
|
|
57
|
+
name: key.name ?? '',
|
|
58
|
+
start: key.start,
|
|
59
|
+
createdAt: new Date(key.createdAt).toISOString(),
|
|
60
|
+
expiresAt: key.expiresAt ? new Date(key.expiresAt).toISOString() : null,
|
|
61
|
+
lastUsedAt: key.lastRequest ? new Date(key.lastRequest).toISOString() : null
|
|
62
|
+
})
|
|
@@ -1,29 +1,30 @@
|
|
|
1
|
-
import
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
import {
|
|
2
|
+
isKnownAuthenticationProvider,
|
|
3
|
+
type CloudAuthenticationMethod,
|
|
4
|
+
type CloudSocialProvider
|
|
4
5
|
} from '#cloud/contract/account'
|
|
5
|
-
import {
|
|
6
|
+
import type { CloudServerConfig } from '#cloud/server/config'
|
|
6
7
|
|
|
7
|
-
import type { CloudAuthAdapter } from './adapter'
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
provider === 'credential' || provider === 'google' || provider === 'apple'
|
|
8
|
+
import type { CloudAuthAdapter, SocialLinkStart } from './adapter'
|
|
9
|
+
import { canRemoveSignInMethod, signInProviders } from './methods'
|
|
10
|
+
import { configuredSocialProviders } from './social-providers'
|
|
11
11
|
|
|
12
12
|
export function createAccountAuthenticationService(
|
|
13
13
|
auth: CloudAuthAdapter,
|
|
14
14
|
config: CloudServerConfig
|
|
15
15
|
) {
|
|
16
|
+
const providers = signInProviders(config)
|
|
16
17
|
return {
|
|
17
18
|
async methods(headers: Headers) {
|
|
18
19
|
const accounts = await auth.listAuthenticationMethods(headers)
|
|
19
20
|
const methods = accounts.flatMap((account): CloudAuthenticationMethod[] => {
|
|
20
|
-
if (!
|
|
21
|
+
if (!isKnownAuthenticationProvider(account.providerId)) return []
|
|
21
22
|
return [
|
|
22
23
|
{
|
|
23
24
|
id: account.id,
|
|
24
25
|
provider: account.providerId,
|
|
25
26
|
createdAt: account.createdAt.toISOString(),
|
|
26
|
-
canUnlink: accounts
|
|
27
|
+
canUnlink: canRemoveSignInMethod(account, accounts, providers)
|
|
27
28
|
}
|
|
28
29
|
]
|
|
29
30
|
})
|
|
@@ -42,8 +43,8 @@ export function createAccountAuthenticationService(
|
|
|
42
43
|
},
|
|
43
44
|
async startSocialLink(
|
|
44
45
|
headers: Headers,
|
|
45
|
-
input: { provider:
|
|
46
|
-
): Promise<
|
|
46
|
+
input: { provider: CloudSocialProvider; callbackURL: string }
|
|
47
|
+
): Promise<SocialLinkStart> {
|
|
47
48
|
if (!configuredSocialProviders(config).includes(input.provider)) {
|
|
48
49
|
throw new Error('Authentication provider is unavailable')
|
|
49
50
|
}
|
|
@@ -1,4 +1,9 @@
|
|
|
1
|
-
import
|
|
1
|
+
import {
|
|
2
|
+
isKnownSocialProvider,
|
|
3
|
+
type CloudAccountSession,
|
|
4
|
+
type CloudSignIn,
|
|
5
|
+
type CloudSignInMethod
|
|
6
|
+
} from '#cloud/contract'
|
|
2
7
|
import type { CloudDatabase } from '#cloud/server/db'
|
|
3
8
|
import { dateString } from '#cloud/server/sharing/contracts'
|
|
4
9
|
import type { BetterAuthPlugin } from 'better-auth'
|
|
@@ -47,7 +52,7 @@ export function signInMethod(
|
|
|
47
52
|
): CloudSignInMethod | null {
|
|
48
53
|
if (isAuthEndpoint(endpoint.path, CORE_AUTH_PATHS.callbackOAuth)) {
|
|
49
54
|
const provider = endpoint.params?.id
|
|
50
|
-
return provider
|
|
55
|
+
return provider && isKnownSocialProvider(provider) ? provider : 'other'
|
|
51
56
|
}
|
|
52
57
|
return methods.find(([path]) => isAuthEndpoint(endpoint.path, path))?.[1] ?? null
|
|
53
58
|
}
|
|
@@ -1,4 +1,10 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type {
|
|
2
|
+
CloudAccessToken,
|
|
3
|
+
CloudAccessTokenCreate,
|
|
4
|
+
CloudAccountSession,
|
|
5
|
+
CloudSignIn,
|
|
6
|
+
CloudSocialProvider
|
|
7
|
+
} from '#cloud/contract'
|
|
2
8
|
import type { CloudActor } from '#cloud/server/auth/session'
|
|
3
9
|
|
|
4
10
|
export type CloudMFAStatus = {
|
|
@@ -34,6 +40,12 @@ export type CloudAuthenticationMethodRecord = {
|
|
|
34
40
|
createdAt: Date
|
|
35
41
|
}
|
|
36
42
|
|
|
43
|
+
/**
|
|
44
|
+
* Where a link sends the browser, and the cookies that let the provider's callback match it to this
|
|
45
|
+
* request: the browser has to keep them, or the callback refuses the link.
|
|
46
|
+
*/
|
|
47
|
+
export type SocialLinkStart = { url: string; headers: Headers }
|
|
48
|
+
|
|
37
49
|
export interface CloudAuthAdapter {
|
|
38
50
|
handler(request: Request): Promise<Response>
|
|
39
51
|
resolveIdentity(headers: Headers): Promise<CloudIdentity | null>
|
|
@@ -43,6 +55,24 @@ export interface CloudAuthAdapter {
|
|
|
43
55
|
* terms: enough to leave, by downloading its documents and deleting the account.
|
|
44
56
|
*/
|
|
45
57
|
resolveAccountSession(headers: Headers): Promise<CloudActor | null>
|
|
58
|
+
/**
|
|
59
|
+
* Whether the signed-in session proved its account's second step, or the account has none.
|
|
60
|
+
* Neither resolver above accepts a session that has not: signing in through a linked account
|
|
61
|
+
* such as Google never asks for it.
|
|
62
|
+
*/
|
|
63
|
+
twoStepConfirmed(headers: Headers): Promise<boolean>
|
|
64
|
+
/**
|
|
65
|
+
* The account a personal access token stands for, from `Authorization: Bearer`, once it is held
|
|
66
|
+
* to what a session would be. Only the document API reads tokens.
|
|
67
|
+
*/
|
|
68
|
+
resolveAccessToken(headers: Headers): Promise<CloudActor | null>
|
|
69
|
+
listAccessTokens(headers: Headers): Promise<CloudAccessToken[] | null>
|
|
70
|
+
/** Makes a token for the signed-in account; answers the whole token, shown this once. */
|
|
71
|
+
createAccessToken(
|
|
72
|
+
headers: Headers,
|
|
73
|
+
input: CloudAccessTokenCreate
|
|
74
|
+
): Promise<{ token: string; accessToken: CloudAccessToken }>
|
|
75
|
+
revokeAccessToken(headers: Headers, id: string): Promise<void>
|
|
46
76
|
listAuthenticationMethods(headers: Headers): Promise<CloudAuthenticationMethodRecord[]>
|
|
47
77
|
changePassword(
|
|
48
78
|
headers: Headers,
|
|
@@ -50,8 +80,8 @@ export interface CloudAuthAdapter {
|
|
|
50
80
|
): Promise<void>
|
|
51
81
|
startSocialLink(
|
|
52
82
|
headers: Headers,
|
|
53
|
-
input: { provider:
|
|
54
|
-
): Promise<
|
|
83
|
+
input: { provider: CloudSocialProvider; callbackURL: string }
|
|
84
|
+
): Promise<SocialLinkStart>
|
|
55
85
|
unlinkAuthenticationMethod(headers: Headers, methodId: string): Promise<void>
|
|
56
86
|
banUser(headers: Headers, userId: string, reason?: string): Promise<void>
|
|
57
87
|
unbanUser(headers: Headers, userId: string): Promise<void>
|
|
@@ -72,6 +102,9 @@ export interface CloudAuthAdapter {
|
|
|
72
102
|
emailChangeAvailable: boolean
|
|
73
103
|
profile(headers: Headers): Promise<CloudAccountProfile | null>
|
|
74
104
|
updateProfile(headers: Headers, input: { name: string }): Promise<void>
|
|
105
|
+
/** The language Cloud writes to the account in, as the app says it uses. */
|
|
106
|
+
/** Takes the app's language tag; the server keeps the nearest language it writes in. */
|
|
107
|
+
setLocale(headers: Headers, locale: string): Promise<void>
|
|
75
108
|
/** Sends the confirmation to the new address and tells the old one which address it is. */
|
|
76
109
|
changeEmail(headers: Headers, input: { newEmail: string; callbackURL: string }): Promise<void>
|
|
77
110
|
sessions(headers: Headers): Promise<CloudAccountSession[] | null>
|
package/src/server/auth/email.ts
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
|
-
import type { TwoStepChange } from '#cloud/email'
|
|
1
|
+
import type { EmailLocale, TwoStepChange } from '#cloud/email'
|
|
2
|
+
import type { CloudDatabase } from '#cloud/server/db'
|
|
2
3
|
import type { TransactionalEmailService } from '#cloud/server/email'
|
|
3
4
|
import { sha256 } from '@noble/hashes/sha2.js'
|
|
4
5
|
import { bytesToHex, utf8ToBytes } from '@noble/hashes/utils.js'
|
|
6
|
+
import type { Transaction } from 'kysely'
|
|
5
7
|
|
|
6
8
|
export type AuthenticationEmailService = {
|
|
7
9
|
sendVerification(input: {
|
|
@@ -10,6 +12,8 @@ export type AuthenticationEmailService = {
|
|
|
10
12
|
url: string
|
|
11
13
|
token: string
|
|
12
14
|
purpose?: 'account' | 'change'
|
|
15
|
+
/** The account's own language, or null for none; nothing is looked up, as sign-up needs. */
|
|
16
|
+
locale?: EmailLocale | null
|
|
13
17
|
}): Promise<void>
|
|
14
18
|
sendPasswordReset(input: {
|
|
15
19
|
email: string
|
|
@@ -40,12 +44,17 @@ export type AuthenticationEmailService = {
|
|
|
40
44
|
system: string | null
|
|
41
45
|
desktop: boolean
|
|
42
46
|
}): Promise<void>
|
|
43
|
-
sendTwoStepChanged(
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
47
|
+
sendTwoStepChanged(
|
|
48
|
+
input: {
|
|
49
|
+
email: string
|
|
50
|
+
name: string
|
|
51
|
+
userId: string
|
|
52
|
+
change: TwoStepChange
|
|
53
|
+
/** For a removed sign-in method, which one. */
|
|
54
|
+
method?: string
|
|
55
|
+
},
|
|
56
|
+
transaction?: Transaction<CloudDatabase>
|
|
57
|
+
): Promise<void>
|
|
49
58
|
}
|
|
50
59
|
|
|
51
60
|
function tokenHash(value: string): string {
|
|
@@ -62,6 +71,7 @@ export function createAuthenticationEmailService(
|
|
|
62
71
|
idempotencyKey: `email-verification/${input.email.toLowerCase()}/${tokenHash(input.token)}`,
|
|
63
72
|
kind: 'email-verification',
|
|
64
73
|
recipientEmail: input.email,
|
|
74
|
+
recipientLocale: input.locale ?? null,
|
|
65
75
|
payload: { name: input.name, actionURL: input.url, purpose: input.purpose }
|
|
66
76
|
})
|
|
67
77
|
},
|
|
@@ -109,17 +119,22 @@ export function createAuthenticationEmailService(
|
|
|
109
119
|
}
|
|
110
120
|
})
|
|
111
121
|
},
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
122
|
+
// Queued in the transaction that made the change, so the change and its notice commit together.
|
|
123
|
+
async sendTwoStepChanged(input, transaction) {
|
|
124
|
+
await email.enqueue(
|
|
125
|
+
{
|
|
126
|
+
idempotencyKey: `two-step-changed/${input.userId}/${crypto.randomUUID()}`,
|
|
127
|
+
kind: 'two-step-changed',
|
|
128
|
+
recipientEmail: input.email,
|
|
129
|
+
payload: {
|
|
130
|
+
name: input.name,
|
|
131
|
+
change: input.change,
|
|
132
|
+
...(input.method && { method: input.method }),
|
|
133
|
+
actionURL: new URL('/account/security', publicURL).href
|
|
134
|
+
}
|
|
135
|
+
},
|
|
136
|
+
transaction
|
|
137
|
+
)
|
|
123
138
|
}
|
|
124
139
|
}
|
|
125
140
|
}
|
|
@@ -23,15 +23,19 @@ export const CORE_AUTH_PATHS: CorePaths<
|
|
|
23
23
|
| 'callbackOAuth'
|
|
24
24
|
| 'deleteUser'
|
|
25
25
|
| 'deleteUserCallback'
|
|
26
|
+
| 'linkSocialAccount'
|
|
26
27
|
| 'requestPasswordReset'
|
|
27
28
|
| 'sendVerificationEmail'
|
|
28
29
|
| 'signInEmail'
|
|
29
30
|
| 'signUpEmail'
|
|
31
|
+
| 'unlinkAccount'
|
|
30
32
|
| 'verifyEmail'
|
|
31
33
|
> = {
|
|
32
34
|
callbackOAuth: '/callback/:id',
|
|
33
35
|
deleteUser: '/delete-user',
|
|
34
36
|
deleteUserCallback: '/delete-user/callback',
|
|
37
|
+
linkSocialAccount: '/link-social',
|
|
38
|
+
unlinkAccount: '/unlink-account',
|
|
35
39
|
requestPasswordReset: '/request-password-reset',
|
|
36
40
|
sendVerificationEmail: '/send-verification-email',
|
|
37
41
|
signInEmail: '/sign-in/email',
|