@open-pencil/cloud 0.17.0-beta.2 → 0.17.0-beta.5
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 +3 -2
- package/dist/bin/server.mjs +1 -1
- package/dist/bin/server.mjs.map +1 -1
- package/dist/bin/{ai-relay.mjs → services.mjs} +9 -9
- package/dist/bin/services.mjs.map +1 -0
- package/dist/client.d.ts +525 -66
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +1257 -654
- package/dist/client.js.map +1 -1
- package/dist/contract.d.ts +2 -2
- package/dist/contract.js +2 -2
- package/dist/contract2.js +1028 -481
- package/dist/contract2.js.map +1 -1
- package/dist/email.d.ts +1780 -31
- package/dist/email.d.ts.map +1 -1
- package/dist/email.js +3556 -325
- package/dist/email.js.map +1 -1
- package/dist/errors.d.ts +2 -0
- package/dist/errors.js +48 -0
- package/dist/errors.js.map +1 -0
- package/dist/index.d.ts +929 -72
- package/dist/index.d.ts.map +1 -1
- package/dist/index2.d.ts +35 -0
- package/dist/index2.d.ts.map +1 -0
- package/dist/listen.mjs +802 -927
- package/dist/listen.mjs.map +1 -1
- package/dist/runtime-cloudflare.d.ts +89 -0
- package/dist/runtime-cloudflare.d.ts.map +1 -0
- package/dist/runtime-cloudflare.js +15667 -0
- package/dist/runtime-cloudflare.js.map +1 -0
- package/dist/runtime-node.d.mts +7166 -3101
- 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 +6525 -2205
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +12500 -7613
- package/dist/server.js.map +1 -1
- package/dist/server.mjs +8625 -2878
- package/dist/server.mjs.map +1 -1
- package/dist/server2.mjs +101 -79
- package/dist/server2.mjs.map +1 -1
- package/package.json +27 -9
- package/src/admin/api/routes.ts +59 -0
- package/src/admin/audit/service.ts +27 -8
- package/src/admin/documents/service.ts +431 -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 +153 -0
- package/src/admin/schema.ts +6 -0
- package/src/client/api.ts +28 -461
- package/src/client/auth/client.ts +22 -3
- package/src/client/auth/navigation.ts +6 -5
- package/src/client/billing.ts +80 -0
- package/src/client/community.ts +40 -0
- package/src/client/discovery.ts +35 -9
- package/src/client/documents.ts +160 -0
- package/src/client/index.ts +14 -7
- package/src/client/portal/account.ts +79 -2
- package/src/client/portal/administration.ts +56 -0
- package/src/client/portal/request.ts +2 -0
- package/src/client/response.ts +21 -0
- package/src/client/schema.ts +8 -0
- package/src/client/services.ts +118 -0
- package/src/client/sharing.ts +262 -0
- package/src/client/versions.ts +104 -0
- package/src/contract/account.ts +108 -2
- package/src/contract/admin/index.ts +67 -3
- package/src/contract/billing.ts +166 -0
- package/src/contract/collaboration.ts +11 -1
- package/src/contract/community.ts +60 -0
- package/src/contract/discovery.ts +83 -4
- package/src/contract/documents.ts +27 -0
- package/src/contract/entitlements.ts +12 -2
- package/src/contract/index.ts +114 -39
- package/src/contract/links.ts +57 -4
- package/src/contract/locale.ts +27 -0
- package/src/contract/portal.ts +12 -1
- package/src/contract/relay.ts +6 -0
- package/src/contract/reports.ts +42 -0
- package/src/contract/routes.ts +10 -0
- package/src/contract/services.ts +235 -0
- package/src/contract/sharing.ts +3 -9
- package/src/email/i18n.ts +174 -0
- package/src/email/index.ts +13 -2
- package/src/email/locales/ar.json +141 -0
- package/src/email/locales/de.json +141 -0
- package/src/email/locales/es.json +141 -0
- package/src/email/locales/fr.json +141 -0
- package/src/email/locales/it.json +141 -0
- package/src/email/locales/ja.json +141 -0
- package/src/email/locales/pl.json +141 -0
- package/src/email/locales/pt-br.json +141 -0
- package/src/email/locales/ru.json +141 -0
- package/src/email/locales/zh-cn.json +141 -0
- package/src/email/messages.ts +200 -0
- package/src/email/render.ts +138 -246
- package/src/email/samples.ts +115 -0
- package/src/email/schema.ts +79 -5
- package/src/email/templates/BrandEmail.vue +54 -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/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 +32 -0
- package/src/email/templates/WaitlistConfirmation.vue +29 -0
- package/src/email/templates/WorkspaceInvitation.vue +28 -0
- package/src/email/templates/brand.ts +9 -61
- package/src/email/templates/localization.ts +17 -0
- package/src/errors/index.ts +6 -0
- package/src/errors/posthog.ts +80 -0
- package/src/global.d.ts +7 -0
- package/src/runtime/cloudflare/environment.ts +22 -11
- 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 +69 -15
- package/src/runtime/cloudflare/tsconfig.json +2 -1
- package/src/runtime/cloudflare/worker.ts +46 -13
- package/src/runtime/node/application.ts +5 -3
- package/src/runtime/node/bootstrap.ts +15 -4
- package/src/runtime/node/cleanup.ts +20 -3
- package/src/runtime/node/email/transport.ts +13 -10
- package/src/runtime/node/entitlements/main.ts +14 -11
- package/src/runtime/node/index.ts +1 -1
- package/src/runtime/node/main.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 +50 -16
- package/src/runtime/node/{ai-relay → services}/main.ts +7 -7
- 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 +15 -30
- package/src/runtime/s3/objects.ts +41 -1
- package/src/runtime/site/community.ts +101 -0
- package/src/runtime/site/server.ts +49 -6
- package/src/server/account/actions.ts +5 -0
- package/src/server/account/deletion.ts +304 -0
- package/src/server/account/routes.ts +281 -206
- package/src/server/account/terms.ts +42 -0
- package/src/server/account/tokens.ts +57 -0
- package/src/server/api/router.ts +32 -5
- package/src/server/api/types.ts +2 -0
- package/src/server/app/checks.ts +84 -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 +114 -0
- package/src/server/app/services.ts +185 -0
- package/src/server/auth/access-control.ts +63 -0
- package/src/server/auth/access-tokens.ts +62 -0
- package/src/server/auth/adapter.ts +32 -1
- package/src/server/auth/email.ts +4 -1
- package/src/server/auth/endpoints.ts +5 -1
- package/src/server/auth/enrollment.ts +116 -0
- package/src/server/auth/factory.ts +116 -132
- package/src/server/auth/index.ts +10 -1
- package/src/server/auth/logger.ts +23 -0
- package/src/server/auth/mfa-assurance.ts +51 -0
- package/src/server/auth/passwords.ts +43 -0
- package/src/server/auth/session.ts +2 -0
- package/src/server/billing/index.ts +6 -0
- package/src/server/billing/routes.ts +27 -0
- package/src/server/billing/tokens.ts +37 -0
- package/src/server/cleanup/configured.ts +27 -7
- package/src/server/cleanup/documents.ts +165 -71
- package/src/server/cleanup/revisions.ts +16 -5
- package/src/server/cleanup/uploads.ts +8 -2
- package/src/server/cleanup/worker.ts +15 -3
- package/src/server/collaboration/relay/connection.ts +4 -3
- package/src/server/collaboration/relay/documents.ts +13 -10
- package/src/server/collaboration/relay/hub.ts +77 -122
- package/src/server/collaboration/relay/log.ts +5 -2
- package/src/server/collaboration/relay/room.ts +154 -0
- package/src/server/collaboration/service.ts +48 -33
- 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 +41 -9
- package/src/server/config/index.ts +1 -1
- package/src/server/config/public.ts +11 -4
- package/src/server/config/schema.ts +91 -277
- package/src/server/config/toml/schema.ts +307 -0
- package/src/server/db/expressions.ts +15 -1
- package/src/server/db/index.ts +1 -0
- package/src/server/db/migrate.ts +46 -116
- 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/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/schema.ts +96 -0
- package/src/server/db/tables.ts +82 -4
- package/src/server/db/users.ts +22 -0
- 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/index.ts +1 -1
- package/src/server/documents/limits.ts +14 -8
- package/src/server/documents/purge.ts +75 -0
- package/src/server/documents/repository.ts +2 -0
- package/src/server/documents/routes.ts +26 -0
- package/src/server/documents/service.ts +30 -406
- package/src/server/documents/summary.ts +1 -0
- package/src/server/documents/trash.ts +203 -0
- package/src/server/documents/uploads.ts +450 -0
- package/src/server/documents/versions/checkpoint.ts +2 -1
- package/src/server/documents/versions/history.ts +11 -7
- package/src/server/documents/versions/service.ts +94 -28
- package/src/server/email/invitations.ts +1 -0
- package/src/server/email/service.ts +31 -4
- package/src/server/email/types.ts +12 -0
- package/src/server/errors/index.ts +51 -16
- package/src/server/index.ts +52 -16
- package/src/server/internal/index.ts +3 -3
- package/src/server/internal/routes.ts +7 -10
- 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/invitations/types.ts +5 -1
- package/src/server/logging.ts +76 -0
- package/src/server/objects/types.ts +5 -0
- package/src/server/pictures/service.ts +2 -1
- package/src/server/policy/configured.ts +9 -3
- package/src/server/policy/database.ts +52 -27
- package/src/server/policy/index.ts +2 -1
- package/src/server/policy/keys.ts +5 -2
- package/src/server/policy/policy.ts +40 -12
- package/src/server/policy/schema.ts +2 -2
- package/src/server/policy/service.ts +78 -56
- package/src/server/policy/static.ts +5 -5
- package/src/server/policy/storage.ts +33 -0
- package/src/server/policy/workspace.ts +41 -0
- package/src/server/quota/index.ts +6 -0
- package/src/server/quota/notices.ts +121 -0
- package/src/server/quota/reconcile.ts +2 -0
- package/src/server/quota/storage.ts +74 -31
- package/src/server/rate-limit/cleanup.ts +17 -5
- package/src/server/rate-limit/middleware.ts +6 -2
- package/src/server/reports/index.ts +9 -0
- package/src/server/reports/replies.ts +55 -0
- package/src/server/reports/routes.ts +39 -0
- package/src/server/reports/service.ts +145 -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 -23
- package/src/server/sharing/grants/service.ts +11 -18
- package/src/server/sharing/http.ts +4 -0
- package/src/server/sharing/invitations/service.ts +35 -15
- package/src/server/sharing/policy.ts +9 -14
- package/src/server/sharing/routes.ts +0 -16
- package/src/server/sharing/service.ts +1 -17
- package/src/server/validation.ts +4 -0
- package/src/server/workspaces/index.ts +1 -0
- package/src/server/workspaces/members.ts +91 -52
- package/src/server/workspaces/repository.ts +2 -1
- package/src/server/workspaces/routes.ts +4 -0
- package/src/{ai-relay → services}/app.ts +46 -44
- package/src/{ai-relay → services}/config.ts +26 -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 +35 -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/client/ai.ts +0 -96
- package/src/contract/ai.ts +0 -150
- 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/ai/errors.ts +0 -7
- package/src/server/ai/index.ts +0 -4
- package/src/server/ai/routes.ts +0 -43
- package/src/server/app.ts +0 -379
- 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/028_collaboration_updates.ts +0 -84
- package/src/server/db/migrations/helpers.ts +0 -78
- /package/dist/bin/{ai-relay.d.mts → services.d.mts} +0 -0
|
@@ -1,7 +1,14 @@
|
|
|
1
1
|
import { createEnrollmentService, type EnrollmentService } from '#cloud/admin/enrollment/service'
|
|
2
|
+
import {
|
|
3
|
+
CLOUD_ACCESS_TOKEN_MAX_DAYS,
|
|
4
|
+
CLOUD_ACCESS_TOKEN_NAME_MAX_LENGTH,
|
|
5
|
+
CLOUD_ACCESS_TOKEN_PREFIX
|
|
6
|
+
} from '#cloud/contract'
|
|
7
|
+
import { createTermsService } from '#cloud/server/account/terms'
|
|
2
8
|
import type { CloudServerConfig } from '#cloud/server/config'
|
|
3
9
|
import type { CloudDatabase } from '#cloud/server/db'
|
|
4
10
|
import { createUserPictures, providerPictures } from '#cloud/server/pictures'
|
|
11
|
+
import { apiKey } from '@better-auth/api-key'
|
|
5
12
|
import { passkey } from '@better-auth/passkey'
|
|
6
13
|
import { APIError, betterAuth } from 'better-auth'
|
|
7
14
|
import { getMigrations } from 'better-auth/db/migration'
|
|
@@ -15,65 +22,34 @@ import {
|
|
|
15
22
|
} from 'better-auth/plugins'
|
|
16
23
|
import type { Kysely } from 'kysely'
|
|
17
24
|
|
|
25
|
+
import { accessTokenAccount, bearerAccessToken, toAccessToken } from './access-tokens'
|
|
18
26
|
import { accountActivity, createSignInActivity } from './activity'
|
|
19
27
|
import type { CloudAuthAdapter } from './adapter'
|
|
20
28
|
import type { AuthenticationEmailService } from './email'
|
|
21
29
|
import { AUTH_BASE_PATH, CORE_AUTH_PATHS, authRequestPath } from './endpoints'
|
|
22
|
-
import {
|
|
30
|
+
import { enrollmentOptions } from './enrollment'
|
|
31
|
+
import { betterAuthLogger } from './logger'
|
|
32
|
+
import {
|
|
33
|
+
createMFAAssuranceService,
|
|
34
|
+
recordResponseAssurance,
|
|
35
|
+
verifySecondFactor
|
|
36
|
+
} from './mfa-assurance'
|
|
37
|
+
import { passwordOptions } from './passwords'
|
|
23
38
|
import { APPLE_AUDIENCE, socialProviders } from './social-providers'
|
|
24
39
|
|
|
25
40
|
const BETTER_AUTH_SCHEMA_VERSION = '1.7.7+mfa.1'
|
|
41
|
+
const DAY_SECONDS = 24 * 60 * 60
|
|
26
42
|
const ACCOUNT_SECURITY_FRESH_AGE_SECONDS = 10 * 60
|
|
27
43
|
|
|
28
|
-
async function recordResponseAssurance(
|
|
29
|
-
response: Response,
|
|
30
|
-
method: 'totp' | 'recovery-code' | 'passkey',
|
|
31
|
-
database: Kysely<CloudDatabase>,
|
|
32
|
-
assurance: ReturnType<typeof createMFAAssuranceService>
|
|
33
|
-
): Promise<void> {
|
|
34
|
-
const signedToken = response.headers.get('set-auth-token')
|
|
35
|
-
const token = signedToken?.split('.', 1)[0]
|
|
36
|
-
if (!token) return
|
|
37
|
-
const session = await database
|
|
38
|
-
.selectFrom('session')
|
|
39
|
-
.select(['id', 'userId'])
|
|
40
|
-
.where('token', '=', token)
|
|
41
|
-
.executeTakeFirst()
|
|
42
|
-
if (session) await assurance.record({ sessionId: session.id, userId: session.userId, method })
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
async function verifySecondFactor(
|
|
46
|
-
auth: { handler(request: Request): Promise<Response> },
|
|
47
|
-
config: CloudServerConfig,
|
|
48
|
-
database: Kysely<CloudDatabase>,
|
|
49
|
-
assurance: ReturnType<typeof createMFAAssuranceService>,
|
|
50
|
-
headers: Headers,
|
|
51
|
-
code: string,
|
|
52
|
-
method: 'totp' | 'recovery-code',
|
|
53
|
-
/** The two-step plugin's endpoint that checks this kind of code. */
|
|
54
|
-
endpoint: { path: string }
|
|
55
|
-
): Promise<Response> {
|
|
56
|
-
const response = await auth.handler(
|
|
57
|
-
new Request(new URL(authRequestPath(endpoint.path), config.publicURL), {
|
|
58
|
-
method: 'POST',
|
|
59
|
-
headers: new Headers({
|
|
60
|
-
...Object.fromEntries(headers),
|
|
61
|
-
'Content-Type': 'application/json'
|
|
62
|
-
}),
|
|
63
|
-
body: JSON.stringify({ code, trustDevice: false })
|
|
64
|
-
})
|
|
65
|
-
)
|
|
66
|
-
if (!response.ok) throw APIError.fromStatus(response.status as 401)
|
|
67
|
-
await recordResponseAssurance(response, method, database, assurance)
|
|
68
|
-
return response
|
|
69
|
-
}
|
|
70
|
-
|
|
71
44
|
export type CloudAuthRuntimeOptions = {
|
|
72
45
|
email?: AuthenticationEmailService
|
|
73
46
|
runInBackground?: (promise: Promise<unknown>) => void
|
|
74
47
|
/**
|
|
75
|
-
* Whether Better Auth checks the database schema when it starts
|
|
76
|
-
*
|
|
48
|
+
* Whether Better Auth checks the database schema when it starts, off unless asked for. The check
|
|
49
|
+
* runs in the background and nothing waits for it, so an adapter made briefly, as for one
|
|
50
|
+
* request, for migrating, or in a test, would leave it querying a database being closed;
|
|
51
|
+
* `migrateCloudDatabase` has already checked the recorded version. A server's long-lived
|
|
52
|
+
* adapter turns it on.
|
|
77
53
|
*/
|
|
78
54
|
validateSchema?: boolean
|
|
79
55
|
}
|
|
@@ -86,6 +62,7 @@ export function createBetterAuthAdapter(
|
|
|
86
62
|
): CloudAuthAdapter {
|
|
87
63
|
const authenticationEmail = runtime.email
|
|
88
64
|
const assurance = createMFAAssuranceService(database, config)
|
|
65
|
+
const terms = createTermsService(database, config)
|
|
89
66
|
const activity = createSignInActivity(database, authenticationEmail)
|
|
90
67
|
// A new address is confirmed through a link sent to it, so changing one needs email delivery.
|
|
91
68
|
const emailChangeAvailable = Boolean(config.emailPasswordEnabled && authenticationEmail)
|
|
@@ -110,17 +87,35 @@ export function createBetterAuthAdapter(
|
|
|
110
87
|
validateClient: (clientId) => clientId.startsWith('openpencil-desktop:')
|
|
111
88
|
})
|
|
112
89
|
const administration = admin()
|
|
90
|
+
// Personal access tokens. Cloud reads them itself (`resolveAccessToken`), for the document API
|
|
91
|
+
// alone, so they never become sessions; Cloud's own limiters count their requests.
|
|
92
|
+
const accessTokens = apiKey({
|
|
93
|
+
defaultPrefix: CLOUD_ACCESS_TOKEN_PREFIX,
|
|
94
|
+
requireName: true,
|
|
95
|
+
maximumNameLength: CLOUD_ACCESS_TOKEN_NAME_MAX_LENGTH,
|
|
96
|
+
startingCharactersConfig: { charactersLength: CLOUD_ACCESS_TOKEN_PREFIX.length + 4 },
|
|
97
|
+
keyExpiration: { minExpiresIn: 1, maxExpiresIn: CLOUD_ACCESS_TOKEN_MAX_DAYS },
|
|
98
|
+
rateLimit: { enabled: false },
|
|
99
|
+
enableSessionForAPIKeys: false
|
|
100
|
+
})
|
|
113
101
|
const auth = betterAuth({
|
|
114
102
|
appName: 'OpenPencil Cloud',
|
|
103
|
+
logger: betterAuthLogger,
|
|
115
104
|
baseURL: config.publicURL,
|
|
116
105
|
basePath: AUTH_BASE_PATH,
|
|
117
106
|
// Clients never reach Better Auth's own administration, which `/api/admin` replaces with MFA,
|
|
118
|
-
// origin, last-administrator, and audit checks, nor the
|
|
107
|
+
// origin, last-administrator, and audit checks, nor the endpoints Cloud's policy manages
|
|
119
108
|
// through its account routes; the server still calls them itself.
|
|
120
109
|
disabledPaths: [
|
|
121
110
|
...Object.values(administration.endpoints).map((endpoint) => endpoint.path),
|
|
111
|
+
// Tokens are made, listed, and revoked through `/api/account/tokens`, with a fresh session.
|
|
112
|
+
...Object.values(accessTokens.endpoints).map((endpoint) => endpoint.path),
|
|
122
113
|
passkeys.endpoints.deletePasskey.path,
|
|
123
|
-
twoStep.endpoints.disableTwoFactor.path
|
|
114
|
+
twoStep.endpoints.disableTwoFactor.path,
|
|
115
|
+
// Accounts are deleted through `/api/account/delete`, which an account awaiting approval
|
|
116
|
+
// cannot reach either.
|
|
117
|
+
CORE_AUTH_PATHS.deleteUser,
|
|
118
|
+
CORE_AUTH_PATHS.deleteUserCallback
|
|
124
119
|
],
|
|
125
120
|
secret: config.authSecret,
|
|
126
121
|
database: {
|
|
@@ -141,7 +136,7 @@ export function createBetterAuthAdapter(
|
|
|
141
136
|
},
|
|
142
137
|
session: { freshAge: ACCOUNT_SECURITY_FRESH_AGE_SECONDS },
|
|
143
138
|
advanced: {
|
|
144
|
-
database: { generateId: 'uuid', validateSchema: runtime.validateSchema },
|
|
139
|
+
database: { generateId: 'uuid', validateSchema: runtime.validateSchema ?? false },
|
|
145
140
|
ipAddress: {
|
|
146
141
|
ipAddressHeaders: config.authTrustedIPHeaders,
|
|
147
142
|
trustedProxies: config.authTrustedProxies
|
|
@@ -164,86 +159,8 @@ export function createBetterAuthAdapter(
|
|
|
164
159
|
[CORE_AUTH_PATHS.sendVerificationEmail]: { window: 60, max: 3 }
|
|
165
160
|
}
|
|
166
161
|
},
|
|
167
|
-
emailAndPassword: config
|
|
168
|
-
|
|
169
|
-
enabled: true,
|
|
170
|
-
disableSignUp: !config.emailPasswordSignUpEnabled,
|
|
171
|
-
requireEmailVerification: true,
|
|
172
|
-
minPasswordLength: config.emailPasswordMinimumLength,
|
|
173
|
-
maxPasswordLength: config.emailPasswordMaximumLength,
|
|
174
|
-
autoSignIn: false,
|
|
175
|
-
resetPasswordTokenExpiresIn: config.passwordResetExpiresIn,
|
|
176
|
-
revokeSessionsOnPasswordReset: true,
|
|
177
|
-
sendResetPassword: authenticationEmail
|
|
178
|
-
? ({ user, url, token }) =>
|
|
179
|
-
authenticationEmail.sendPasswordReset({
|
|
180
|
-
email: user.email,
|
|
181
|
-
name: user.name,
|
|
182
|
-
url,
|
|
183
|
-
token
|
|
184
|
-
})
|
|
185
|
-
: undefined,
|
|
186
|
-
onPasswordReset: authenticationEmail
|
|
187
|
-
? ({ user }) =>
|
|
188
|
-
authenticationEmail.sendPasswordChanged({
|
|
189
|
-
email: user.email,
|
|
190
|
-
name: user.name,
|
|
191
|
-
userId: user.id,
|
|
192
|
-
url: config.publicURL
|
|
193
|
-
})
|
|
194
|
-
: undefined
|
|
195
|
-
}
|
|
196
|
-
: undefined,
|
|
197
|
-
emailVerification:
|
|
198
|
-
config.emailPasswordEnabled && authenticationEmail
|
|
199
|
-
? {
|
|
200
|
-
expiresIn: config.emailVerificationExpiresIn,
|
|
201
|
-
sendOnSignUp: true,
|
|
202
|
-
// Signing in unverified only says so; people ask for another link with Send again.
|
|
203
|
-
sendOnSignIn: false,
|
|
204
|
-
autoSignInAfterVerification: true,
|
|
205
|
-
// A change of address sends the link to the new address as `user.email`, on the
|
|
206
|
-
// account it already confirmed; a new account has not confirmed one yet. This runs
|
|
207
|
-
// inside sign-up's transaction, so it must not query the database itself.
|
|
208
|
-
sendVerificationEmail: ({ user, url, token }) =>
|
|
209
|
-
authenticationEmail.sendVerification({
|
|
210
|
-
email: user.email,
|
|
211
|
-
name: user.name,
|
|
212
|
-
url,
|
|
213
|
-
token,
|
|
214
|
-
purpose: user.emailVerified ? 'change' : 'account'
|
|
215
|
-
}),
|
|
216
|
-
afterEmailVerification: async (user) => {
|
|
217
|
-
await enrollment.followEmailChange(user.id, user.email)
|
|
218
|
-
if (config.enrollmentMode === 'approval') {
|
|
219
|
-
await enrollment.request({ email: user.email, name: user.name })
|
|
220
|
-
}
|
|
221
|
-
await enrollment.bindApprovedUser(user.email, user.id)
|
|
222
|
-
}
|
|
223
|
-
}
|
|
224
|
-
: undefined,
|
|
225
|
-
user: {
|
|
226
|
-
changeEmail: { enabled: emailChangeAvailable },
|
|
227
|
-
validateUserInfo: ({ source }) => {
|
|
228
|
-
if (source.action === 'create-user' && config.enrollmentMode === 'closed') {
|
|
229
|
-
return { error: 'enrollment_closed', errorDescription: 'Cloud enrollment is closed' }
|
|
230
|
-
}
|
|
231
|
-
return undefined
|
|
232
|
-
}
|
|
233
|
-
},
|
|
234
|
-
databaseHooks: {
|
|
235
|
-
user: {
|
|
236
|
-
create: {
|
|
237
|
-
after: async (user) => {
|
|
238
|
-
if (!user.emailVerified) return
|
|
239
|
-
if (config.enrollmentMode === 'approval') {
|
|
240
|
-
await enrollment.request({ email: user.email, name: user.name })
|
|
241
|
-
}
|
|
242
|
-
await enrollment.bindApprovedUser(user.email, user.id)
|
|
243
|
-
}
|
|
244
|
-
}
|
|
245
|
-
}
|
|
246
|
-
},
|
|
162
|
+
emailAndPassword: passwordOptions(config, authenticationEmail),
|
|
163
|
+
...enrollmentOptions(config, database, enrollment, authenticationEmail, emailChangeAvailable),
|
|
247
164
|
plugins: [
|
|
248
165
|
...(config.captchaProvider && config.captchaSecretKey
|
|
249
166
|
? [
|
|
@@ -272,7 +189,8 @@ export function createBetterAuthAdapter(
|
|
|
272
189
|
{ twoStep: twoStep.endpoints, passkeys: passkeys.endpoints, devices: devices.endpoints },
|
|
273
190
|
(user) => notifyTwoStep(user, 'passkey-added')
|
|
274
191
|
),
|
|
275
|
-
providerPictures(createUserPictures(database, { publicURL: config.publicURL }))
|
|
192
|
+
providerPictures(createUserPictures(database, { publicURL: config.publicURL })),
|
|
193
|
+
accessTokens
|
|
276
194
|
],
|
|
277
195
|
socialProviders: socialProviders(config),
|
|
278
196
|
trustedOrigins: [
|
|
@@ -331,8 +249,18 @@ export function createBetterAuthAdapter(
|
|
|
331
249
|
})
|
|
332
250
|
}
|
|
333
251
|
|
|
334
|
-
/**
|
|
252
|
+
/**
|
|
253
|
+
* The signed-in person while their account may use the server: not while it awaits approval, nor
|
|
254
|
+
* before it accepted the deployment's current terms when those are required.
|
|
255
|
+
*/
|
|
335
256
|
async function resolveSession(headers: Headers) {
|
|
257
|
+
const identity = await resolveAccountSession(headers)
|
|
258
|
+
if (!identity || !(await terms.hasAccepted(identity.userId))) return null
|
|
259
|
+
return identity
|
|
260
|
+
}
|
|
261
|
+
|
|
262
|
+
/** The signed-in person while their account is approved, before or after accepting the terms. */
|
|
263
|
+
async function resolveAccountSession(headers: Headers) {
|
|
336
264
|
const identity = await resolveIdentity(headers)
|
|
337
265
|
if (!identity) return null
|
|
338
266
|
if (config.enrollmentMode === 'approval' && !(await enrollment.isApproved(identity.email))) {
|
|
@@ -341,6 +269,24 @@ export function createBetterAuthAdapter(
|
|
|
341
269
|
return identity
|
|
342
270
|
}
|
|
343
271
|
|
|
272
|
+
/** The account a personal access token in `Authorization: Bearer` stands for. */
|
|
273
|
+
async function resolveAccessToken(headers: Headers) {
|
|
274
|
+
const key = bearerAccessToken(headers)
|
|
275
|
+
if (!key) return null
|
|
276
|
+
const verified = await auth.api.verifyApiKey({ body: { key } })
|
|
277
|
+
if (!verified.valid || !verified.key) return null
|
|
278
|
+
const context = { database, config, enrollment, terms }
|
|
279
|
+
const user = await accessTokenAccount(context, verified.key.referenceId)
|
|
280
|
+
if (!user) return null
|
|
281
|
+
return {
|
|
282
|
+
userId: user.id,
|
|
283
|
+
email: user.email,
|
|
284
|
+
name: user.name,
|
|
285
|
+
deploymentRole: deploymentRole(user),
|
|
286
|
+
credential: 'token' as const
|
|
287
|
+
}
|
|
288
|
+
}
|
|
289
|
+
|
|
344
290
|
/**
|
|
345
291
|
* The endpoints that read or change an account, which only an account that may use the server
|
|
346
292
|
* reaches; one awaiting approval still signs in and out. Better Auth checks the session inside
|
|
@@ -391,6 +337,29 @@ export function createBetterAuthAdapter(
|
|
|
391
337
|
},
|
|
392
338
|
resolveIdentity,
|
|
393
339
|
resolveSession,
|
|
340
|
+
resolveAccountSession,
|
|
341
|
+
resolveAccessToken,
|
|
342
|
+
async listAccessTokens(headers) {
|
|
343
|
+
const session = await currentSession(headers)
|
|
344
|
+
if (!session) return null
|
|
345
|
+
const { apiKeys } = await auth.api.listApiKeys({ headers })
|
|
346
|
+
return apiKeys.map(toAccessToken)
|
|
347
|
+
},
|
|
348
|
+
async createAccessToken(headers, input) {
|
|
349
|
+
// A token outlives the session that makes it, so making one needs a recent sign-in.
|
|
350
|
+
const session = await freshSession(headers)
|
|
351
|
+
const created = await auth.api.createApiKey({
|
|
352
|
+
body: {
|
|
353
|
+
name: input.name,
|
|
354
|
+
expiresIn: input.expiresInDays * DAY_SECONDS,
|
|
355
|
+
userId: session.user.id
|
|
356
|
+
}
|
|
357
|
+
})
|
|
358
|
+
return { token: created.key, accessToken: toAccessToken(created) }
|
|
359
|
+
},
|
|
360
|
+
async revokeAccessToken(headers, id) {
|
|
361
|
+
await auth.api.deleteApiKey({ headers, body: { keyId: id } })
|
|
362
|
+
},
|
|
394
363
|
async listAuthenticationMethods(headers) {
|
|
395
364
|
const accounts = await auth.api.listUserAccounts({ headers })
|
|
396
365
|
return accounts.map((account) => ({
|
|
@@ -428,6 +397,14 @@ export function createBetterAuthAdapter(
|
|
|
428
397
|
})
|
|
429
398
|
return response.url
|
|
430
399
|
},
|
|
400
|
+
async deleteAccount(headers, password) {
|
|
401
|
+
const { headers: answer } = await auth.api.deleteUser({
|
|
402
|
+
headers,
|
|
403
|
+
body: password ? { password } : {},
|
|
404
|
+
returnHeaders: true
|
|
405
|
+
})
|
|
406
|
+
return answer
|
|
407
|
+
},
|
|
431
408
|
async unlinkAuthenticationMethod(headers, methodId) {
|
|
432
409
|
await auth.api.unlinkAccount({ headers, body: { accountId: methodId } })
|
|
433
410
|
},
|
|
@@ -529,6 +506,9 @@ export function createBetterAuthAdapter(
|
|
|
529
506
|
async updateProfile(headers, input) {
|
|
530
507
|
await auth.api.updateUser({ headers, body: { name: input.name } })
|
|
531
508
|
},
|
|
509
|
+
async setLocale(headers, locale) {
|
|
510
|
+
await auth.api.updateUser({ headers, body: { locale } })
|
|
511
|
+
},
|
|
532
512
|
async changeEmail(headers, input) {
|
|
533
513
|
const session = await freshSession(headers)
|
|
534
514
|
if (session.user.email === input.newEmail) {
|
|
@@ -576,7 +556,11 @@ export function createBetterAuthAdapter(
|
|
|
576
556
|
},
|
|
577
557
|
schemaVersion: BETTER_AUTH_SCHEMA_VERSION,
|
|
578
558
|
async migrate() {
|
|
579
|
-
|
|
559
|
+
// The access token table is Cloud's migration `009_access_tokens`, built before this runs.
|
|
560
|
+
const migrations = await getMigrations({
|
|
561
|
+
...auth.options,
|
|
562
|
+
plugins: auth.options.plugins.filter((plugin) => plugin.id !== accessTokens.id)
|
|
563
|
+
})
|
|
580
564
|
await migrations.runMigrations()
|
|
581
565
|
}
|
|
582
566
|
}
|
package/src/server/auth/index.ts
CHANGED
|
@@ -14,4 +14,13 @@ export {
|
|
|
14
14
|
type CloudSessionResolver
|
|
15
15
|
} from './session'
|
|
16
16
|
export type { CloudIdentity } from './adapter'
|
|
17
|
-
export {
|
|
17
|
+
export {
|
|
18
|
+
accessControl,
|
|
19
|
+
accessStatements,
|
|
20
|
+
documentRoleCan,
|
|
21
|
+
documentRoles,
|
|
22
|
+
workspaceRoleCan,
|
|
23
|
+
workspaceRoles,
|
|
24
|
+
type AccessRequest,
|
|
25
|
+
type DocumentRole
|
|
26
|
+
} from './access-control'
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { writeJSONLine } from '#cloud/server/logging'
|
|
2
|
+
import type { BetterAuthOptions } from 'better-auth'
|
|
3
|
+
|
|
4
|
+
/** What the API-key plugin logs, as an error, for a token that is wrong, expired, or revoked. */
|
|
5
|
+
const REFUSED_TOKEN = 'Failed to validate API key'
|
|
6
|
+
|
|
7
|
+
/**
|
|
8
|
+
* Better Auth's log lines as Cloud's JSON lines. A refused personal access token is the caller's
|
|
9
|
+
* mistake, which the request answers with 401, so it is not logged as the server's error; nor is
|
|
10
|
+
* anything a log line's arguments carry beyond an error's name and message.
|
|
11
|
+
*/
|
|
12
|
+
export const betterAuthLogger: NonNullable<BetterAuthOptions['logger']> = {
|
|
13
|
+
log(level, message, ...args) {
|
|
14
|
+
if (level === 'debug' || message.startsWith(REFUSED_TOKEN)) return
|
|
15
|
+
const error = args.find((arg): arg is Error => arg instanceof Error)
|
|
16
|
+
writeJSONLine({
|
|
17
|
+
level,
|
|
18
|
+
message,
|
|
19
|
+
source: 'better-auth',
|
|
20
|
+
...(error && { error: { name: error.name, message: error.message } })
|
|
21
|
+
})
|
|
22
|
+
}
|
|
23
|
+
}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
import type { CloudMFAStatus } from '#cloud/server/auth/adapter'
|
|
2
2
|
import type { CloudServerConfig } from '#cloud/server/config'
|
|
3
3
|
import type { CloudDatabase } from '#cloud/server/db'
|
|
4
|
+
import { APIError } from 'better-auth'
|
|
4
5
|
import type { Kysely } from 'kysely'
|
|
5
6
|
|
|
7
|
+
import { authRequestPath } from './endpoints'
|
|
8
|
+
|
|
6
9
|
const ASSURANCE_MAX_AGE_MS = 12 * 60 * 60_000
|
|
7
10
|
|
|
8
11
|
export function createMFAAssuranceService(
|
|
@@ -53,3 +56,51 @@ export function createMFAAssuranceService(
|
|
|
53
56
|
}
|
|
54
57
|
|
|
55
58
|
export type MFAAssuranceService = ReturnType<typeof createMFAAssuranceService>
|
|
59
|
+
|
|
60
|
+
/** Records the second step a response just signed in with, against the session it started. */
|
|
61
|
+
export async function recordResponseAssurance(
|
|
62
|
+
response: Response,
|
|
63
|
+
method: 'totp' | 'recovery-code' | 'passkey',
|
|
64
|
+
database: Kysely<CloudDatabase>,
|
|
65
|
+
assurance: MFAAssuranceService
|
|
66
|
+
): Promise<void> {
|
|
67
|
+
const signedToken = response.headers.get('set-auth-token')
|
|
68
|
+
const token = signedToken?.split('.', 1)[0]
|
|
69
|
+
if (!token) return
|
|
70
|
+
const session = await database
|
|
71
|
+
.selectFrom('session')
|
|
72
|
+
.select(['id', 'userId'])
|
|
73
|
+
.where('token', '=', token)
|
|
74
|
+
.executeTakeFirst()
|
|
75
|
+
if (session) await assurance.record({ sessionId: session.id, userId: session.userId, method })
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
/**
|
|
79
|
+
* Checks a second-step code through the two-step plugin's own endpoint, and records the session's
|
|
80
|
+
* assurance when it passes.
|
|
81
|
+
*/
|
|
82
|
+
export async function verifySecondFactor(
|
|
83
|
+
auth: { handler(request: Request): Promise<Response> },
|
|
84
|
+
config: CloudServerConfig,
|
|
85
|
+
database: Kysely<CloudDatabase>,
|
|
86
|
+
assurance: MFAAssuranceService,
|
|
87
|
+
headers: Headers,
|
|
88
|
+
code: string,
|
|
89
|
+
method: 'totp' | 'recovery-code',
|
|
90
|
+
/** The two-step plugin's endpoint that checks this kind of code. */
|
|
91
|
+
endpoint: { path: string }
|
|
92
|
+
): Promise<Response> {
|
|
93
|
+
const response = await auth.handler(
|
|
94
|
+
new Request(new URL(authRequestPath(endpoint.path), config.publicURL), {
|
|
95
|
+
method: 'POST',
|
|
96
|
+
headers: new Headers({
|
|
97
|
+
...Object.fromEntries(headers),
|
|
98
|
+
'Content-Type': 'application/json'
|
|
99
|
+
}),
|
|
100
|
+
body: JSON.stringify({ code, trustDevice: false })
|
|
101
|
+
})
|
|
102
|
+
)
|
|
103
|
+
if (!response.ok) throw APIError.fromStatus(response.status as 401)
|
|
104
|
+
await recordResponseAssurance(response, method, database, assurance)
|
|
105
|
+
return response
|
|
106
|
+
}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import type { CloudServerConfig } from '#cloud/server/config'
|
|
2
|
+
import type { BetterAuthOptions } from 'better-auth'
|
|
3
|
+
|
|
4
|
+
import type { AuthenticationEmailService } from './email'
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Signing in with an email and password, when the deployment allows it: a verified address, the
|
|
8
|
+
* configured password lengths, and mail about resets when the deployment sends email.
|
|
9
|
+
*/
|
|
10
|
+
export function passwordOptions(
|
|
11
|
+
config: CloudServerConfig,
|
|
12
|
+
authenticationEmail: AuthenticationEmailService | undefined
|
|
13
|
+
): BetterAuthOptions['emailAndPassword'] {
|
|
14
|
+
if (!config.emailPasswordEnabled) return undefined
|
|
15
|
+
return {
|
|
16
|
+
enabled: true,
|
|
17
|
+
disableSignUp: !config.emailPasswordSignUpEnabled,
|
|
18
|
+
requireEmailVerification: true,
|
|
19
|
+
minPasswordLength: config.emailPasswordMinimumLength,
|
|
20
|
+
maxPasswordLength: config.emailPasswordMaximumLength,
|
|
21
|
+
autoSignIn: false,
|
|
22
|
+
resetPasswordTokenExpiresIn: config.passwordResetExpiresIn,
|
|
23
|
+
revokeSessionsOnPasswordReset: true,
|
|
24
|
+
sendResetPassword: authenticationEmail
|
|
25
|
+
? ({ user, url, token }) =>
|
|
26
|
+
authenticationEmail.sendPasswordReset({
|
|
27
|
+
email: user.email,
|
|
28
|
+
name: user.name,
|
|
29
|
+
url,
|
|
30
|
+
token
|
|
31
|
+
})
|
|
32
|
+
: undefined,
|
|
33
|
+
onPasswordReset: authenticationEmail
|
|
34
|
+
? ({ user }) =>
|
|
35
|
+
authenticationEmail.sendPasswordChanged({
|
|
36
|
+
email: user.email,
|
|
37
|
+
name: user.name,
|
|
38
|
+
userId: user.id,
|
|
39
|
+
url: config.publicURL
|
|
40
|
+
})
|
|
41
|
+
: undefined
|
|
42
|
+
}
|
|
43
|
+
}
|
|
@@ -5,6 +5,8 @@ export type CloudActor = {
|
|
|
5
5
|
email: string
|
|
6
6
|
name: string
|
|
7
7
|
deploymentRole?: 'user' | 'admin'
|
|
8
|
+
/** How the request proved who it is: a signed-in session, or a personal access token. */
|
|
9
|
+
credential?: 'session' | 'token'
|
|
8
10
|
}
|
|
9
11
|
|
|
10
12
|
export type CloudIdentityResolver = (request: Request) => Promise<CloudIdentity | null>
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import type { CloudActor } from '#cloud/server/auth'
|
|
2
|
+
import type { CloudDatabase } from '#cloud/server/db'
|
|
3
|
+
import { CLOUD_RATE_LIMITS, createRouteRateLimiter } from '#cloud/server/rate-limit'
|
|
4
|
+
import { Hono } from 'hono'
|
|
5
|
+
import type { Kysely } from 'kysely'
|
|
6
|
+
|
|
7
|
+
import type { BillingTokenService } from './tokens'
|
|
8
|
+
|
|
9
|
+
export type BillingRouteEnvironment = { Variables: { actor: CloudActor } }
|
|
10
|
+
|
|
11
|
+
/** Without a billing service, the deployment sells nothing and the token route is not found. */
|
|
12
|
+
export function createBillingRoutes(
|
|
13
|
+
service: BillingTokenService | undefined,
|
|
14
|
+
rateLimit?: { database: Kysely<CloudDatabase>; secret: string }
|
|
15
|
+
) {
|
|
16
|
+
const router = new Hono<BillingRouteEnvironment>()
|
|
17
|
+
if (service && rateLimit) {
|
|
18
|
+
router.use(
|
|
19
|
+
'/billing/token',
|
|
20
|
+
createRouteRateLimiter(rateLimit.database, rateLimit.secret, CLOUD_RATE_LIMITS.billingToken)
|
|
21
|
+
)
|
|
22
|
+
}
|
|
23
|
+
return router.post('/billing/token', async (context) => {
|
|
24
|
+
if (!service) return context.json({ error: { code: 'not_found' as const } }, 404)
|
|
25
|
+
return context.json(await service.issue(context.get('actor')))
|
|
26
|
+
})
|
|
27
|
+
}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { CLOUD_BILLING_TOKEN_AUDIENCE, type BillingToken } from '#cloud/contract'
|
|
2
|
+
import type { CloudActor } from '#cloud/server/auth'
|
|
3
|
+
import { SERVICES_SIGNING_ALGORITHM, type ServicesSigningKey } from '#cloud/server/services/keys'
|
|
4
|
+
import { SignJWT } from 'jose'
|
|
5
|
+
|
|
6
|
+
export type BillingTokenServiceOptions = {
|
|
7
|
+
/** The Cloud public URL, which billing checks as the token's `iss`. */
|
|
8
|
+
issuer: string
|
|
9
|
+
/** The services' key, whose public half Cloud publishes for billing to verify with. */
|
|
10
|
+
signingKey: ServicesSigningKey
|
|
11
|
+
lifetimeSeconds: number
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
export function createBillingTokenService(options: BillingTokenServiceOptions) {
|
|
15
|
+
const { privateKey, publicJWK } = options.signingKey
|
|
16
|
+
return {
|
|
17
|
+
/**
|
|
18
|
+
* Signs a token that lets the signed-in person buy or manage their own account's plan and
|
|
19
|
+
* credits with billing; nobody else's, since an account is the person.
|
|
20
|
+
*/
|
|
21
|
+
async issue(actor: CloudActor): Promise<BillingToken> {
|
|
22
|
+
const issuedAt = Math.floor(Date.now() / 1000)
|
|
23
|
+
const expiresAt = issuedAt + options.lifetimeSeconds
|
|
24
|
+
const token = await new SignJWT({ email: actor.email })
|
|
25
|
+
.setProtectedHeader({ alg: SERVICES_SIGNING_ALGORITHM, kid: publicJWK.kid, typ: 'JWT' })
|
|
26
|
+
.setIssuer(options.issuer)
|
|
27
|
+
.setAudience(CLOUD_BILLING_TOKEN_AUDIENCE)
|
|
28
|
+
.setSubject(actor.userId)
|
|
29
|
+
.setIssuedAt(issuedAt)
|
|
30
|
+
.setExpirationTime(expiresAt)
|
|
31
|
+
.sign(privateKey)
|
|
32
|
+
return { token, expiresAt: new Date(expiresAt * 1000).toISOString() }
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
export type BillingTokenService = ReturnType<typeof createBillingTokenService>
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
import type { CloudServerConfig } from '#cloud/server/config'
|
|
2
2
|
import type { CloudDatabase } from '#cloud/server/db'
|
|
3
|
+
import type { TransactionalEmailService } from '#cloud/server/email'
|
|
4
|
+
import type { CloudErrorReporter } from '#cloud/server/errors'
|
|
3
5
|
import type { ObjectStore } from '#cloud/server/objects'
|
|
4
6
|
import type { CloudPolicy } from '#cloud/server/policy/policy'
|
|
7
|
+
import { createStorageLimitNoticeService } from '#cloud/server/quota'
|
|
5
8
|
import { createRateLimitCleanupService } from '#cloud/server/rate-limit/cleanup'
|
|
6
9
|
import type { Kysely } from 'kysely'
|
|
7
10
|
|
|
@@ -10,21 +13,37 @@ import { createRevisionCompactionService } from './revisions'
|
|
|
10
13
|
import { createUploadCleanupService } from './uploads'
|
|
11
14
|
import type { CleanupPassOptions, CleanupServices } from './worker'
|
|
12
15
|
|
|
13
|
-
/**
|
|
16
|
+
/**
|
|
17
|
+
* Every cleanup service, over a deployment's database and bucket. Each reports what it couldn't
|
|
18
|
+
* clean through `reportError`, where a deployment tracks errors, and carries on with the rest.
|
|
19
|
+
* With `email`, a deployment that sends mail, it also tells accounts their storage is full.
|
|
20
|
+
*/
|
|
14
21
|
export function createCleanupServices(
|
|
15
|
-
config: Pick<CloudServerConfig, 'deployment'>,
|
|
22
|
+
config: Pick<CloudServerConfig, 'deployment' | 'publicURL' | 'billingEndpoint'>,
|
|
16
23
|
database: Kysely<CloudDatabase>,
|
|
17
24
|
objects: ObjectStore,
|
|
18
|
-
policy: CloudPolicy
|
|
25
|
+
policy: CloudPolicy,
|
|
26
|
+
reportError?: CloudErrorReporter,
|
|
27
|
+
email?: TransactionalEmailService
|
|
19
28
|
): CleanupServices {
|
|
20
29
|
return {
|
|
21
|
-
uploads: createUploadCleanupService(database, objects),
|
|
22
|
-
documents: createDocumentCleanupService(database, objects),
|
|
30
|
+
uploads: createUploadCleanupService(database, objects, reportError),
|
|
31
|
+
documents: createDocumentCleanupService(database, objects, { reportError }),
|
|
23
32
|
revisions: createRevisionCompactionService(database, objects, {
|
|
24
33
|
policy,
|
|
25
|
-
deploymentMode: config.deployment
|
|
34
|
+
deploymentMode: config.deployment,
|
|
35
|
+
reportError
|
|
26
36
|
}),
|
|
27
|
-
rateLimits: createRateLimitCleanupService(database)
|
|
37
|
+
rateLimits: createRateLimitCleanupService(database),
|
|
38
|
+
storageLimits: email
|
|
39
|
+
? createStorageLimitNoticeService(database, {
|
|
40
|
+
policy,
|
|
41
|
+
email,
|
|
42
|
+
publicURL: config.publicURL,
|
|
43
|
+
upgradable: config.billingEndpoint !== undefined,
|
|
44
|
+
deploymentMode: config.deployment
|
|
45
|
+
})
|
|
46
|
+
: undefined
|
|
28
47
|
}
|
|
29
48
|
}
|
|
30
49
|
|
|
@@ -33,6 +52,7 @@ export function cleanupPassOptions(config: CloudServerConfig): CleanupPassOption
|
|
|
33
52
|
return {
|
|
34
53
|
batchSize: config.cleanupBatchSize,
|
|
35
54
|
documentRetentionMs: config.documentRetentionMs,
|
|
55
|
+
documentPurgeGraceMs: config.documentPurgeGraceMs,
|
|
36
56
|
leaseDurationMs: config.cleanupLeaseDurationMs
|
|
37
57
|
}
|
|
38
58
|
}
|