@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,134 @@
|
|
|
1
|
+
import {
|
|
2
|
+
communityThumbnailPath,
|
|
3
|
+
type CommunityDocument,
|
|
4
|
+
type CommunityDownload,
|
|
5
|
+
type CommunityVersion,
|
|
6
|
+
type DocumentVersion
|
|
7
|
+
} from '#cloud/contract'
|
|
8
|
+
import { isBannedNow, userIdText, type CloudDatabase } from '#cloud/server/db'
|
|
9
|
+
import { DocumentNotFoundError, type DocumentService } from '#cloud/server/documents'
|
|
10
|
+
import type { DocumentVersionService } from '#cloud/server/documents/versions'
|
|
11
|
+
import type { ObjectStore } from '#cloud/server/objects'
|
|
12
|
+
import type { Kysely } from 'kysely'
|
|
13
|
+
|
|
14
|
+
import { extractFigThumbnailFromReader } from '@open-pencil/fig'
|
|
15
|
+
|
|
16
|
+
const communityVersion = (version: DocumentVersion): CommunityVersion => ({
|
|
17
|
+
id: version.id,
|
|
18
|
+
name: version.name ?? '',
|
|
19
|
+
description: version.description || null,
|
|
20
|
+
createdAt: version.createdAt,
|
|
21
|
+
current: version.current
|
|
22
|
+
})
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* The deployment's community gallery: the documents of the workspace its config names, which
|
|
26
|
+
* anyone may open read-only without signing in or a link. Nothing marks a document as published;
|
|
27
|
+
* saving it to the workspace publishes it and moving it out takes it down. A document the
|
|
28
|
+
* workspace's members could not open either — deleted, taken down by an administrator, never
|
|
29
|
+
* saved, or made by a banned account — is not in the gallery.
|
|
30
|
+
*/
|
|
31
|
+
export function createCommunityService(
|
|
32
|
+
database: Kysely<CloudDatabase>,
|
|
33
|
+
objects: ObjectStore,
|
|
34
|
+
documents: Pick<DocumentService, 'downloadShared' | 'imageLinksShared'>,
|
|
35
|
+
versions: Pick<DocumentVersionService, 'namedSharedIn' | 'downloadNamedShared'>,
|
|
36
|
+
workspaceId: string | null
|
|
37
|
+
) {
|
|
38
|
+
function published() {
|
|
39
|
+
return database
|
|
40
|
+
.selectFrom('document')
|
|
41
|
+
.innerJoin('documentRevision', 'documentRevision.id', 'document.currentRevisionId')
|
|
42
|
+
.innerJoin('storageObject', 'storageObject.id', 'documentRevision.storageObjectId')
|
|
43
|
+
.select([
|
|
44
|
+
'document.id',
|
|
45
|
+
'document.name',
|
|
46
|
+
'document.kind',
|
|
47
|
+
'document.updatedAt',
|
|
48
|
+
'document.currentRevisionId as revisionId',
|
|
49
|
+
'storageObject.objectKey',
|
|
50
|
+
'storageObject.byteSize'
|
|
51
|
+
])
|
|
52
|
+
.where('document.workspaceId', '=', workspaceId ?? '')
|
|
53
|
+
.where('document.deletedAt', 'is', null)
|
|
54
|
+
.where('document.disabledAt', 'is', null)
|
|
55
|
+
.where((expression) =>
|
|
56
|
+
expression.not(
|
|
57
|
+
expression.exists(
|
|
58
|
+
expression
|
|
59
|
+
.selectFrom('user')
|
|
60
|
+
.select('user.id')
|
|
61
|
+
.whereRef(userIdText, '=', 'document.createdBy')
|
|
62
|
+
.where(isBannedNow)
|
|
63
|
+
)
|
|
64
|
+
)
|
|
65
|
+
)
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
/** A document of the gallery, or not found for any other, so nothing outside it shows. */
|
|
69
|
+
async function find(documentId: string) {
|
|
70
|
+
if (!workspaceId) throw new DocumentNotFoundError()
|
|
71
|
+
const row = await published().where('document.id', '=', documentId).executeTakeFirst()
|
|
72
|
+
if (!row?.revisionId) throw new DocumentNotFoundError()
|
|
73
|
+
return { ...row, revisionId: row.revisionId }
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
return {
|
|
77
|
+
/** Whether the deployment has a gallery at all. */
|
|
78
|
+
enabled: workspaceId !== null,
|
|
79
|
+
|
|
80
|
+
/** The gallery's documents, most recently changed first, each with its named versions. */
|
|
81
|
+
async list(): Promise<CommunityDocument[]> {
|
|
82
|
+
if (!workspaceId) return []
|
|
83
|
+
const rows = (await published().orderBy('document.updatedAt', 'desc').execute()).flatMap(
|
|
84
|
+
({ revisionId, ...row }) => (revisionId ? [{ ...row, revisionId }] : [])
|
|
85
|
+
)
|
|
86
|
+
const named = await versions.namedSharedIn(
|
|
87
|
+
workspaceId,
|
|
88
|
+
rows.map((row) => ({ id: row.id, currentRevisionId: row.revisionId }))
|
|
89
|
+
)
|
|
90
|
+
return rows.map((row) => ({
|
|
91
|
+
id: row.id,
|
|
92
|
+
name: row.name,
|
|
93
|
+
kind: row.kind,
|
|
94
|
+
updatedAt: new Date(row.updatedAt).toISOString(),
|
|
95
|
+
revisionId: row.revisionId,
|
|
96
|
+
thumbnailPath: communityThumbnailPath(row.id, row.revisionId),
|
|
97
|
+
versions: (named.get(row.id) ?? []).map(communityVersion)
|
|
98
|
+
}))
|
|
99
|
+
},
|
|
100
|
+
|
|
101
|
+
/** A gallery document as it is now, or one of its named versions, with where to download it. */
|
|
102
|
+
async download(documentId: string, versionId?: string): Promise<CommunityDownload> {
|
|
103
|
+
await find(documentId)
|
|
104
|
+
if (!versionId) return { document: await documents.downloadShared(documentId), version: null }
|
|
105
|
+
const named = await versions.downloadNamedShared(documentId, versionId)
|
|
106
|
+
return { document: named.document, version: communityVersion(named.version) }
|
|
107
|
+
},
|
|
108
|
+
|
|
109
|
+
/** Links for the images a gallery document's live room names. */
|
|
110
|
+
async imageLinks(documentId: string, checksums: string[]) {
|
|
111
|
+
await find(documentId)
|
|
112
|
+
return documents.imageLinksShared(documentId, checksums)
|
|
113
|
+
},
|
|
114
|
+
|
|
115
|
+
/**
|
|
116
|
+
* The thumbnail a gallery document's stored file carries, read from storage in ranges, for
|
|
117
|
+
* the revision it is now; null when that revision is not current any more or has none.
|
|
118
|
+
*/
|
|
119
|
+
async thumbnail(documentId: string, revisionId: string): Promise<Uint8Array | null> {
|
|
120
|
+
const row = await find(documentId)
|
|
121
|
+
if (row.revisionId !== revisionId) return null
|
|
122
|
+
return extractFigThumbnailFromReader({
|
|
123
|
+
size: Number(row.byteSize),
|
|
124
|
+
read: async (start, endExclusive) => {
|
|
125
|
+
const bytes = await objects.readRange(row.objectKey, start, endExclusive)
|
|
126
|
+
if (!bytes) throw new DocumentNotFoundError()
|
|
127
|
+
return bytes
|
|
128
|
+
}
|
|
129
|
+
})
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
export type CommunityService = ReturnType<typeof createCommunityService>
|
|
@@ -2,13 +2,14 @@ import { staticEntitlementsFromTOML } from '#cloud/server/policy/static'
|
|
|
2
2
|
import { parse as parseTOML } from 'smol-toml'
|
|
3
3
|
import * as v from 'valibot'
|
|
4
4
|
|
|
5
|
+
import { DAY_MS } from '@open-pencil/std/timing'
|
|
6
|
+
|
|
7
|
+
import { parseCloudServerConfig, type CloudServerConfig } from './schema'
|
|
5
8
|
import {
|
|
6
9
|
cloudDeploymentConfigSchema,
|
|
7
|
-
parseCloudServerConfig,
|
|
8
10
|
type CloudDeploymentConfig,
|
|
9
|
-
type CloudSecretReference
|
|
10
|
-
|
|
11
|
-
} from './schema'
|
|
11
|
+
type CloudSecretReference
|
|
12
|
+
} from './toml/schema'
|
|
12
13
|
|
|
13
14
|
export type CloudEnvironment = Readonly<Record<string, string | undefined>>
|
|
14
15
|
|
|
@@ -41,14 +42,24 @@ function staticEntitlements(config: CloudDeploymentConfig) {
|
|
|
41
42
|
return staticEntitlementsFromTOML(config.entitlements)
|
|
42
43
|
}
|
|
43
44
|
|
|
45
|
+
function defaultEntitlements(config: CloudDeploymentConfig) {
|
|
46
|
+
if (config.entitlements?.source !== 'database') return undefined
|
|
47
|
+
return staticEntitlementsFromTOML(config.entitlements)
|
|
48
|
+
}
|
|
49
|
+
|
|
44
50
|
function emailConfig(config: CloudDeploymentConfig, environment: CloudEnvironment) {
|
|
45
51
|
if (config.email.transport === 'none') return { emailTransport: 'none' as const }
|
|
46
52
|
if (config.email.transport === 'cloudflare') {
|
|
47
|
-
return {
|
|
53
|
+
return {
|
|
54
|
+
emailTransport: 'cloudflare' as const,
|
|
55
|
+
emailFrom: config.email.from,
|
|
56
|
+
emailReplyTo: config.email.reply_to
|
|
57
|
+
}
|
|
48
58
|
}
|
|
49
59
|
return {
|
|
50
60
|
emailTransport: 'smtp' as const,
|
|
51
61
|
emailFrom: config.email.from,
|
|
62
|
+
emailReplyTo: config.email.reply_to,
|
|
52
63
|
smtpHost: config.email.smtp.host,
|
|
53
64
|
smtpPort: config.email.smtp.port,
|
|
54
65
|
smtpSecure: config.email.smtp.secure,
|
|
@@ -60,6 +71,7 @@ function emailConfig(config: CloudDeploymentConfig, environment: CloudEnvironmen
|
|
|
60
71
|
function authenticationConfig(config: CloudDeploymentConfig, environment: CloudEnvironment) {
|
|
61
72
|
const google = config.authentication.providers.google
|
|
62
73
|
const apple = config.authentication.providers.apple
|
|
74
|
+
const github = config.authentication.providers.github
|
|
63
75
|
return {
|
|
64
76
|
googleClientId: google ? configuredText(environment, google.client_id) : undefined,
|
|
65
77
|
googleClientSecret: google ? requiredSecret(environment, google.client_secret) : undefined,
|
|
@@ -67,7 +79,9 @@ function authenticationConfig(config: CloudDeploymentConfig, environment: CloudE
|
|
|
67
79
|
appleTeamId: apple?.team_id,
|
|
68
80
|
appleKeyId: apple?.key_id,
|
|
69
81
|
applePrivateKey: apple ? requiredSecret(environment, apple.private_key) : undefined,
|
|
70
|
-
appleAppBundleIdentifier: apple?.app_bundle_identifier
|
|
82
|
+
appleAppBundleIdentifier: apple?.app_bundle_identifier,
|
|
83
|
+
githubClientId: github ? configuredText(environment, github.client_id) : undefined,
|
|
84
|
+
githubClientSecret: github ? requiredSecret(environment, github.client_secret) : undefined
|
|
71
85
|
}
|
|
72
86
|
}
|
|
73
87
|
|
|
@@ -83,8 +97,8 @@ function workerConfig(config: CloudDeploymentConfig) {
|
|
|
83
97
|
cleanupBatchSize: cleanup?.batch_size,
|
|
84
98
|
cleanupIntervalMs: cleanup?.interval_ms,
|
|
85
99
|
cleanupLeaseDurationMs: cleanup?.lease_ms,
|
|
86
|
-
documentRetentionMs: config.documents.retention_days *
|
|
87
|
-
documentPurgeGraceMs: config.documents.purge_grace_days *
|
|
100
|
+
documentRetentionMs: config.documents.retention_days * DAY_MS,
|
|
101
|
+
documentPurgeGraceMs: config.documents.purge_grace_days * DAY_MS
|
|
88
102
|
}
|
|
89
103
|
}
|
|
90
104
|
|
|
@@ -97,7 +111,7 @@ function serviceConfig(config: CloudDeploymentConfig, environment: CloudEnvironm
|
|
|
97
111
|
servicesTokenLifetimeSeconds: config.services
|
|
98
112
|
? config.services.token_lifetime_minutes * 60
|
|
99
113
|
: undefined,
|
|
100
|
-
|
|
114
|
+
billingEndpoint: config.billing?.endpoint,
|
|
101
115
|
internalServiceToken: config.internal_api
|
|
102
116
|
? requiredSecret(environment, config.internal_api.service_token)
|
|
103
117
|
: undefined
|
|
@@ -123,7 +137,8 @@ function errorTrackingConfig(config: CloudDeploymentConfig, environment: CloudEn
|
|
|
123
137
|
return {
|
|
124
138
|
provider: tracking.provider,
|
|
125
139
|
host: tracking.host,
|
|
126
|
-
projectAPIKey: configuredText(environment, tracking.project_api_key)
|
|
140
|
+
projectAPIKey: configuredText(environment, tracking.project_api_key),
|
|
141
|
+
includeIds: tracking.include_ids
|
|
127
142
|
}
|
|
128
143
|
}
|
|
129
144
|
|
|
@@ -148,6 +163,7 @@ export function parseCloudDeploymentConfig(
|
|
|
148
163
|
trustedOrigins: config.deployment.trusted_origins,
|
|
149
164
|
localEditor: config.deployment.local_editor,
|
|
150
165
|
listingMinimumEditorVersion: config.deployment.listing?.minimum_editor_version,
|
|
166
|
+
minimumEditorVersion: config.deployment.minimum_editor_version,
|
|
151
167
|
databaseURL: requiredSecret(environment, config.database.url),
|
|
152
168
|
authSecret: requiredSecret(environment, config.authentication.secret),
|
|
153
169
|
enrollmentMode: config.authentication.enrollment.mode,
|
|
@@ -192,10 +208,19 @@ export function parseCloudDeploymentConfig(
|
|
|
192
208
|
s3DeletedPrefix: config.object_storage.deleted_prefix,
|
|
193
209
|
relayURL: config.collaboration.relay_url,
|
|
194
210
|
staticEntitlements: staticEntitlements(config),
|
|
211
|
+
defaultEntitlements: defaultEntitlements(config),
|
|
195
212
|
...emailConfig(config, environment),
|
|
196
213
|
...workerConfig(config),
|
|
197
214
|
...serviceConfig(config, environment),
|
|
198
215
|
legal: legalConfig(config),
|
|
216
|
+
community: config.community
|
|
217
|
+
? { workspaceId: config.community.workspace, tourDocumentId: config.community.tour }
|
|
218
|
+
: undefined,
|
|
219
|
+
branding: config.deployment.branding && {
|
|
220
|
+
name: config.deployment.branding.name,
|
|
221
|
+
logoURL: config.deployment.branding.logo_url,
|
|
222
|
+
helpURL: config.deployment.branding.help_url
|
|
223
|
+
},
|
|
199
224
|
errorTracking: errorTrackingConfig(config, environment),
|
|
200
225
|
technicalLimits: technicalLimits(config)
|
|
201
226
|
})
|
|
@@ -9,12 +9,12 @@ export {
|
|
|
9
9
|
type CloudDeploymentConfig,
|
|
10
10
|
type CloudDeploymentInput,
|
|
11
11
|
type CloudSecretReference
|
|
12
|
-
} from './schema'
|
|
12
|
+
} from './toml/schema'
|
|
13
13
|
export { CLOUD_PROTOCOL_MAX_UPLOAD_BYTES } from '#cloud/contract'
|
|
14
14
|
export {
|
|
15
15
|
CLOUD_DEFAULT_MAX_COLLABORATION_MESSAGE_BYTES,
|
|
16
16
|
CLOUD_DEFAULT_MAX_CONNECTIONS_PER_ROOM,
|
|
17
17
|
type CloudTechnicalLimits
|
|
18
18
|
} from './limits'
|
|
19
|
-
export { cloudDiscoveryFromConfig
|
|
19
|
+
export { cloudDiscoveryFromConfig } from './public'
|
|
20
20
|
export { CloudConfigError, parseCloudServerConfig, type CloudServerConfig } from './schema'
|
|
@@ -1,18 +1,28 @@
|
|
|
1
1
|
import {
|
|
2
|
+
CLOUD_BILLING_CONTRACT_VERSION,
|
|
3
|
+
type BillingFreePlan,
|
|
2
4
|
CLOUD_SERVICES_CONTRACT_VERSION,
|
|
3
5
|
CLOUD_PROTOCOL_VERSION,
|
|
4
6
|
parseCloudDiscovery,
|
|
5
7
|
type CloudDiscovery
|
|
6
8
|
} from '#cloud/contract'
|
|
9
|
+
import { configuredSocialProviders } from '#cloud/server/auth/social-providers'
|
|
7
10
|
import { withoutTrailingSlash } from 'ufo'
|
|
8
11
|
|
|
9
12
|
import type { CloudServerConfig } from './schema'
|
|
10
13
|
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
14
|
+
/**
|
|
15
|
+
* The free plan billing compares its plans with: what an account takes before billing stores its
|
|
16
|
+
* own, as the deployment's default entitlements say. Services without an allowance have no monthly
|
|
17
|
+
* limit, as the services token says of them too.
|
|
18
|
+
*/
|
|
19
|
+
function freePlan(config: CloudServerConfig): BillingFreePlan {
|
|
20
|
+
const { storage, services } = config.defaultEntitlements ?? {}
|
|
21
|
+
return {
|
|
22
|
+
storageBytes: storage?.maximumBytes ?? null,
|
|
23
|
+
services: services?.enabled ?? false,
|
|
24
|
+
monthlyCredits: services?.monthlyCreditAllowance ?? null
|
|
25
|
+
}
|
|
16
26
|
}
|
|
17
27
|
|
|
18
28
|
export function cloudDiscoveryFromConfig(config: CloudServerConfig): CloudDiscovery {
|
|
@@ -58,10 +68,19 @@ export function cloudDiscoveryFromConfig(config: CloudServerConfig): CloudDiscov
|
|
|
58
68
|
listing: config.listingMinimumEditorVersion
|
|
59
69
|
? { minimumEditorVersion: config.listingMinimumEditorVersion }
|
|
60
70
|
: undefined,
|
|
71
|
+
minimumEditorVersion: config.minimumEditorVersion,
|
|
61
72
|
services: config.servicesEndpoint
|
|
62
73
|
? { endpoint: config.servicesEndpoint, contractVersion: CLOUD_SERVICES_CONTRACT_VERSION }
|
|
63
74
|
: undefined,
|
|
64
|
-
billing: config.
|
|
75
|
+
billing: config.billingEndpoint
|
|
76
|
+
? {
|
|
77
|
+
endpoint: config.billingEndpoint,
|
|
78
|
+
contractVersion: CLOUD_BILLING_CONTRACT_VERSION,
|
|
79
|
+
freePlan: freePlan(config)
|
|
80
|
+
}
|
|
81
|
+
: undefined,
|
|
82
|
+
community: config.community,
|
|
83
|
+
branding: config.branding,
|
|
65
84
|
legal: config.legal
|
|
66
85
|
})
|
|
67
86
|
}
|