@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
|
@@ -8,9 +8,13 @@ import {
|
|
|
8
8
|
parseCloudUnlinkAuthenticationMethod,
|
|
9
9
|
parseCloudEmailChange,
|
|
10
10
|
parseCloudProfileUpdate,
|
|
11
|
+
parseCloudLocaleUpdate,
|
|
11
12
|
parseCloudPictureUpload,
|
|
12
13
|
CLOUD_PICTURE_MAX_BYTES,
|
|
13
|
-
parseCloudSessionRevoke
|
|
14
|
+
parseCloudSessionRevoke,
|
|
15
|
+
parseCloudAccountDelete,
|
|
16
|
+
parseCloudTermsAcceptance,
|
|
17
|
+
type CloudAccountStatus
|
|
14
18
|
} from '#cloud/contract'
|
|
15
19
|
import type { CloudAPIEnvironment } from '#cloud/server/api'
|
|
16
20
|
import {
|
|
@@ -28,6 +32,8 @@ import { bodyLimit } from 'hono/body-limit'
|
|
|
28
32
|
import { toUint8Array } from 'js-base64'
|
|
29
33
|
|
|
30
34
|
import { createAccountActions } from './actions'
|
|
35
|
+
import type { AccountDeletionService } from './deletion'
|
|
36
|
+
import type { TermsService } from './terms'
|
|
31
37
|
|
|
32
38
|
/** Room for a Base64 picture and the JSON around it. */
|
|
33
39
|
const PICTURE_BODY_BYTES = Math.ceil(CLOUD_PICTURE_MAX_BYTES / 3) * 4 + 1024
|
|
@@ -38,9 +44,13 @@ export type AccountRouteDependencies = {
|
|
|
38
44
|
pictures: UserPictureService
|
|
39
45
|
enrollment: EnrollmentService
|
|
40
46
|
workspaces: WorkspaceService
|
|
47
|
+
deletion: AccountDeletionService
|
|
48
|
+
terms: TermsService
|
|
41
49
|
resolveIdentity: CloudIdentityResolver
|
|
42
50
|
resolveSession: CloudSessionResolver
|
|
43
51
|
requireActiveSession: MiddlewareHandler<CloudAPIEnvironment>
|
|
52
|
+
/** Lets an account with terms to accept reach what leaving needs; see `resolveAccountSession`. */
|
|
53
|
+
requireAccountSession: MiddlewareHandler<CloudAPIEnvironment>
|
|
44
54
|
authenticatedMutationLimiter: MiddlewareHandler<CloudAPIEnvironment>
|
|
45
55
|
}
|
|
46
56
|
|
|
@@ -56,244 +66,309 @@ export function createAccountRoutes(services: AccountRouteDependencies) {
|
|
|
56
66
|
const accountAuthentication = createAccountAuthenticationService(services.auth, services.config)
|
|
57
67
|
const { accountAction, activeAccountAction, verifiedMFAAction } =
|
|
58
68
|
createAccountActions(resolveSession)
|
|
59
|
-
return
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
69
|
+
return (
|
|
70
|
+
new Hono<CloudAPIEnvironment>()
|
|
71
|
+
.get('/api/account/status', async (context) => {
|
|
72
|
+
const identity = await resolveIdentity(context.req.raw)
|
|
73
|
+
if (!identity) return context.json({ error: { code: 'unauthorized' as const } }, 401)
|
|
74
|
+
let enrollmentStatus = await enrollment.statusForEmail(identity.email)
|
|
75
|
+
if (services.config.enrollmentMode === 'approval' && !enrollmentStatus) {
|
|
76
|
+
await enrollment.request({ email: identity.email, name: identity.name })
|
|
77
|
+
enrollmentStatus = 'pending'
|
|
78
|
+
}
|
|
79
|
+
// Waiting or declined, from enrollment; null once the account may use the server.
|
|
80
|
+
const enrollmentState =
|
|
81
|
+
services.config.enrollmentMode !== 'approval' || enrollmentStatus === 'approved'
|
|
82
|
+
? null
|
|
83
|
+
: (enrollmentStatus ?? 'pending')
|
|
84
|
+
// Terms come after approval: an account still waiting has nothing to accept yet.
|
|
85
|
+
let state: CloudAccountStatus['state'] = enrollmentState ?? 'active'
|
|
86
|
+
if (!enrollmentState && !(await services.terms.hasAccepted(identity.userId)))
|
|
87
|
+
state = 'terms'
|
|
88
|
+
if (state === 'active') await workspaces.ensurePersonal(identity)
|
|
89
|
+
return context.json({ user: identity, state })
|
|
90
|
+
})
|
|
91
|
+
.post('/api/account/terms', validatedJSON(parseCloudTermsAcceptance), async (context) => {
|
|
92
|
+
const identity = await resolveIdentity(context.req.raw)
|
|
93
|
+
if (!identity) return context.json({ error: { code: 'unauthorized' as const } }, 401)
|
|
94
|
+
if (!services.terms.requiredVersion) {
|
|
95
|
+
return context.json({ error: { code: 'not_found' as const } }, 404)
|
|
96
|
+
}
|
|
97
|
+
// Accepting is for the version shown; one that changed meanwhile is read again first.
|
|
98
|
+
if (!(await services.terms.accept(identity.userId, context.req.valid('json').version))) {
|
|
99
|
+
return context.json({ error: { code: 'terms_changed' as const } }, 409)
|
|
100
|
+
}
|
|
101
|
+
return context.json({ ok: true as const })
|
|
102
|
+
})
|
|
103
|
+
.get('/api/account/mfa', async (context) => {
|
|
104
|
+
const actor = await resolveSession(context.req.raw)
|
|
105
|
+
if (!actor) return context.json({ error: { code: 'unauthorized' as const } }, 401)
|
|
106
|
+
const mfa = await services.auth.mfaStatus(context.req.raw.headers)
|
|
107
|
+
return mfa
|
|
108
|
+
? context.json({ mfa })
|
|
109
|
+
: context.json({ error: { code: 'unauthorized' as const } }, 401)
|
|
110
|
+
})
|
|
111
|
+
.post('/api/account/mfa/totp/enable', validatedJSON(parseCloudMFAEnable), async (context) => {
|
|
112
|
+
const result = await activeAccountAction(context, () =>
|
|
113
|
+
services.auth.enableTOTP(context.req.raw.headers, context.req.valid('json').password)
|
|
114
|
+
)
|
|
115
|
+
return result instanceof Response ? result : context.json(result)
|
|
116
|
+
})
|
|
117
|
+
.post('/api/account/mfa/totp/verify', validatedJSON(parseCloudMFAVerify), (context) =>
|
|
118
|
+
verifiedMFAAction(context, resolveSession, () =>
|
|
119
|
+
services.auth.verifyTOTP(context.req.raw.headers, context.req.valid('json').code)
|
|
120
|
+
)
|
|
86
121
|
)
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
services.auth.verifyTOTP(context.req.raw.headers, context.req.valid('json').code)
|
|
122
|
+
.post('/api/account/mfa/recovery/verify', validatedJSON(parseCloudMFAVerify), (context) =>
|
|
123
|
+
verifiedMFAAction(context, resolveIdentity, () =>
|
|
124
|
+
services.auth.verifyRecoveryCode(context.req.raw.headers, context.req.valid('json').code)
|
|
125
|
+
)
|
|
92
126
|
)
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
127
|
+
.post(
|
|
128
|
+
'/api/account/mfa/recovery/regenerate',
|
|
129
|
+
validatedJSON(parseCloudMFAEnable),
|
|
130
|
+
async (context) => {
|
|
131
|
+
const result = await activeAccountAction(context, () =>
|
|
132
|
+
services.auth.generateRecoveryCodes(
|
|
133
|
+
context.req.raw.headers,
|
|
134
|
+
context.req.valid('json').password
|
|
135
|
+
)
|
|
136
|
+
)
|
|
137
|
+
return result instanceof Response ? result : context.json({ backupCodes: result })
|
|
138
|
+
}
|
|
97
139
|
)
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
services.
|
|
105
|
-
context.req.raw.headers
|
|
106
|
-
|
|
140
|
+
.post(
|
|
141
|
+
'/api/account/mfa/totp/disable',
|
|
142
|
+
validatedJSON(parseCloudMFAEnable),
|
|
143
|
+
async (context) => {
|
|
144
|
+
const actor = await resolveSession(context.req.raw)
|
|
145
|
+
if (!actor) return context.json({ error: { code: 'unauthorized' as const } }, 401)
|
|
146
|
+
if (actor.deploymentRole === 'admin' && services.config.deploymentAdminMFARequired) {
|
|
147
|
+
const passkeys = await services.auth.listPasskeys(context.req.raw.headers)
|
|
148
|
+
if (passkeys.length === 0) {
|
|
149
|
+
return context.json({ error: { code: 'mfa_required' as const } }, 403)
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
const result = await accountAction(
|
|
153
|
+
() =>
|
|
154
|
+
services.auth.disableTOTP(
|
|
155
|
+
context.req.raw.headers,
|
|
156
|
+
context.req.valid('json').password
|
|
157
|
+
),
|
|
158
|
+
context
|
|
107
159
|
)
|
|
108
|
-
|
|
109
|
-
return result instanceof Response ? result : context.json({ backupCodes: result })
|
|
110
|
-
}
|
|
111
|
-
)
|
|
112
|
-
.post('/api/account/mfa/totp/disable', validatedJSON(parseCloudMFAEnable), async (context) => {
|
|
113
|
-
const actor = await resolveSession(context.req.raw)
|
|
114
|
-
if (!actor) return context.json({ error: { code: 'unauthorized' as const } }, 401)
|
|
115
|
-
if (actor.deploymentRole === 'admin' && services.config.deploymentAdminMFARequired) {
|
|
116
|
-
const passkeys = await services.auth.listPasskeys(context.req.raw.headers)
|
|
117
|
-
if (passkeys.length === 0) {
|
|
118
|
-
return context.json({ error: { code: 'mfa_required' as const } }, 403)
|
|
160
|
+
return result instanceof Response ? result : context.json({ ok: true as const })
|
|
119
161
|
}
|
|
120
|
-
}
|
|
121
|
-
const result = await accountAction(
|
|
122
|
-
() =>
|
|
123
|
-
services.auth.disableTOTP(context.req.raw.headers, context.req.valid('json').password),
|
|
124
|
-
context
|
|
125
162
|
)
|
|
126
|
-
|
|
127
|
-
})
|
|
128
|
-
.get('/api/account/mfa/passkeys', async (context) => {
|
|
129
|
-
const actor = await resolveSession(context.req.raw)
|
|
130
|
-
if (!actor) return context.json({ error: { code: 'unauthorized' as const } }, 401)
|
|
131
|
-
return context.json({ passkeys: await services.auth.listPasskeys(context.req.raw.headers) })
|
|
132
|
-
})
|
|
133
|
-
.post(
|
|
134
|
-
'/api/account/mfa/passkeys/delete',
|
|
135
|
-
validatedJSON(parseCloudPasskeyDelete),
|
|
136
|
-
async (context) => {
|
|
163
|
+
.get('/api/account/mfa/passkeys', async (context) => {
|
|
137
164
|
const actor = await resolveSession(context.req.raw)
|
|
138
165
|
if (!actor) return context.json({ error: { code: 'unauthorized' as const } }, 401)
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
166
|
+
return context.json({ passkeys: await services.auth.listPasskeys(context.req.raw.headers) })
|
|
167
|
+
})
|
|
168
|
+
.post(
|
|
169
|
+
'/api/account/mfa/passkeys/delete',
|
|
170
|
+
validatedJSON(parseCloudPasskeyDelete),
|
|
171
|
+
async (context) => {
|
|
172
|
+
const actor = await resolveSession(context.req.raw)
|
|
173
|
+
if (!actor) return context.json({ error: { code: 'unauthorized' as const } }, 401)
|
|
174
|
+
const { id } = context.req.valid('json')
|
|
175
|
+
if (actor.deploymentRole === 'admin' && services.config.deploymentAdminMFARequired) {
|
|
176
|
+
// An administrator keeps at least one second factor: TOTP or another passkey.
|
|
177
|
+
const status = await services.auth.mfaStatus(context.req.raw.headers)
|
|
178
|
+
const passkeys = await services.auth.listPasskeys(context.req.raw.headers)
|
|
179
|
+
const otherPasskeys = passkeys.filter((passkey) => passkey.id !== id)
|
|
180
|
+
if (!status?.totpEnabled && otherPasskeys.length === 0) {
|
|
181
|
+
return context.json({ error: { code: 'mfa_required' as const } }, 403)
|
|
182
|
+
}
|
|
147
183
|
}
|
|
184
|
+
const result = await accountAction(
|
|
185
|
+
() => services.auth.deletePasskey(context.req.raw.headers, id),
|
|
186
|
+
context
|
|
187
|
+
)
|
|
188
|
+
return result instanceof Response ? result : context.json({ ok: true as const })
|
|
189
|
+
}
|
|
190
|
+
)
|
|
191
|
+
.use('/api/account/authentication/*', requireActiveSession)
|
|
192
|
+
.use('/api/account/authentication/*', authenticatedMutationLimiter)
|
|
193
|
+
.post(
|
|
194
|
+
'/api/account/authentication/change-password',
|
|
195
|
+
validatedJSON(parseCloudPasswordChange),
|
|
196
|
+
async (context) => {
|
|
197
|
+
const result = await accountAction(
|
|
198
|
+
() =>
|
|
199
|
+
accountAuthentication.changePassword(
|
|
200
|
+
context.req.raw.headers,
|
|
201
|
+
context.req.valid('json')
|
|
202
|
+
),
|
|
203
|
+
context
|
|
204
|
+
)
|
|
205
|
+
return result instanceof Response ? result : context.json({ ok: true as const })
|
|
206
|
+
}
|
|
207
|
+
)
|
|
208
|
+
.post(
|
|
209
|
+
'/api/account/authentication/link-social',
|
|
210
|
+
validatedJSON(parseCloudSocialLink),
|
|
211
|
+
async (context) => {
|
|
212
|
+
const result = await accountAction(
|
|
213
|
+
() =>
|
|
214
|
+
accountAuthentication.startSocialLink(
|
|
215
|
+
context.req.raw.headers,
|
|
216
|
+
context.req.valid('json')
|
|
217
|
+
),
|
|
218
|
+
context
|
|
219
|
+
)
|
|
220
|
+
return result instanceof Response ? result : context.json({ url: result })
|
|
148
221
|
}
|
|
222
|
+
)
|
|
223
|
+
.post(
|
|
224
|
+
'/api/account/authentication/unlink',
|
|
225
|
+
validatedJSON(parseCloudUnlinkAuthenticationMethod),
|
|
226
|
+
async (context) => {
|
|
227
|
+
const result = await accountAction(
|
|
228
|
+
() =>
|
|
229
|
+
accountAuthentication.unlink(
|
|
230
|
+
context.req.raw.headers,
|
|
231
|
+
context.req.valid('json').methodId
|
|
232
|
+
),
|
|
233
|
+
context
|
|
234
|
+
)
|
|
235
|
+
return result instanceof Response ? result : context.json({ ok: true as const })
|
|
236
|
+
}
|
|
237
|
+
)
|
|
238
|
+
.use('/api/account/profile', requireActiveSession)
|
|
239
|
+
.use('/api/account/profile/*', requireActiveSession)
|
|
240
|
+
.use('/api/account/sessions', requireActiveSession)
|
|
241
|
+
.use('/api/account/sessions/*', requireActiveSession)
|
|
242
|
+
.use('/api/account/sign-ins', requireActiveSession)
|
|
243
|
+
.use('/api/account/deletion', services.requireAccountSession)
|
|
244
|
+
.use('/api/account/delete', services.requireAccountSession)
|
|
245
|
+
.use('/api/account/delete', authenticatedMutationLimiter)
|
|
246
|
+
.use('/api/account/profile', authenticatedMutationLimiter)
|
|
247
|
+
// An account awaiting approval or the terms is written to too, so any signed-in one may.
|
|
248
|
+
.use('/api/account/locale', async (context, next) => {
|
|
249
|
+
const actor = await resolveIdentity(context.req.raw)
|
|
250
|
+
if (!actor) return context.json({ error: { code: 'unauthorized' as const } }, 401)
|
|
251
|
+
context.set('actor', actor)
|
|
252
|
+
return next()
|
|
253
|
+
})
|
|
254
|
+
.use('/api/account/locale', authenticatedMutationLimiter)
|
|
255
|
+
.use('/api/account/profile/*', authenticatedMutationLimiter)
|
|
256
|
+
.use('/api/account/sessions/*', authenticatedMutationLimiter)
|
|
257
|
+
.get('/api/account/profile', async (context) => {
|
|
258
|
+
const profile = await services.auth.profile(context.req.raw.headers)
|
|
259
|
+
if (!profile) return context.json({ error: { code: 'unauthorized' as const } }, 401)
|
|
260
|
+
return context.json({
|
|
261
|
+
profile: {
|
|
262
|
+
...profile,
|
|
263
|
+
createdAt: profile.createdAt.toISOString(),
|
|
264
|
+
emailChangeAvailable: services.auth.emailChangeAvailable
|
|
265
|
+
}
|
|
266
|
+
})
|
|
267
|
+
})
|
|
268
|
+
.post('/api/account/profile', validatedJSON(parseCloudProfileUpdate), async (context) => {
|
|
149
269
|
const result = await accountAction(
|
|
150
|
-
() => services.auth.
|
|
270
|
+
() => services.auth.updateProfile(context.req.raw.headers, context.req.valid('json')),
|
|
151
271
|
context
|
|
152
272
|
)
|
|
153
273
|
return result instanceof Response ? result : context.json({ ok: true as const })
|
|
154
|
-
}
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
.use('/api/account/authentication/*', authenticatedMutationLimiter)
|
|
158
|
-
.post(
|
|
159
|
-
'/api/account/authentication/change-password',
|
|
160
|
-
validatedJSON(parseCloudPasswordChange),
|
|
161
|
-
async (context) => {
|
|
274
|
+
})
|
|
275
|
+
// The app says which language it uses after signing in and whenever the person changes it.
|
|
276
|
+
.put('/api/account/locale', validatedJSON(parseCloudLocaleUpdate), async (context) => {
|
|
162
277
|
const result = await accountAction(
|
|
163
|
-
() =>
|
|
164
|
-
accountAuthentication.changePassword(
|
|
165
|
-
context.req.raw.headers,
|
|
166
|
-
context.req.valid('json')
|
|
167
|
-
),
|
|
278
|
+
() => services.auth.setLocale(context.req.raw.headers, context.req.valid('json').locale),
|
|
168
279
|
context
|
|
169
280
|
)
|
|
170
281
|
return result instanceof Response ? result : context.json({ ok: true as const })
|
|
171
|
-
}
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
282
|
+
})
|
|
283
|
+
.put(
|
|
284
|
+
'/api/account/profile/picture',
|
|
285
|
+
bodyLimit({
|
|
286
|
+
maxSize: PICTURE_BODY_BYTES,
|
|
287
|
+
onError: (context) => context.json({ error: { code: 'picture_invalid' as const } }, 413)
|
|
288
|
+
}),
|
|
289
|
+
validatedJSON(parseCloudPictureUpload),
|
|
290
|
+
async (context) => {
|
|
291
|
+
const bytes = toUint8Array(context.req.valid('json').data)
|
|
292
|
+
try {
|
|
293
|
+
const image = await services.pictures.upload(context.get('actor').userId, bytes)
|
|
294
|
+
return context.json({ image })
|
|
295
|
+
} catch (error) {
|
|
296
|
+
if (!(error instanceof PictureInvalidError)) throw error
|
|
297
|
+
return context.json({ error: { code: 'picture_invalid' as const } }, 400)
|
|
298
|
+
}
|
|
299
|
+
}
|
|
300
|
+
)
|
|
301
|
+
.delete('/api/account/profile/picture', async (context) => {
|
|
302
|
+
await services.pictures.remove(context.get('actor').userId)
|
|
303
|
+
return context.json({ ok: true as const })
|
|
304
|
+
})
|
|
305
|
+
.post('/api/account/profile/email', validatedJSON(parseCloudEmailChange), async (context) => {
|
|
177
306
|
const result = await accountAction(
|
|
178
307
|
() =>
|
|
179
|
-
accountAuthentication.
|
|
180
|
-
context.req.raw.headers,
|
|
181
|
-
context.req.valid('json')
|
|
182
|
-
),
|
|
308
|
+
accountAuthentication.changeEmail(context.req.raw.headers, context.req.valid('json')),
|
|
183
309
|
context
|
|
184
310
|
)
|
|
185
|
-
return result instanceof Response ? result : context.json({
|
|
186
|
-
}
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
311
|
+
return result instanceof Response ? result : context.json({ ok: true as const })
|
|
312
|
+
})
|
|
313
|
+
.get('/api/account/sessions', async (context) => {
|
|
314
|
+
const sessions = await services.auth.sessions(context.req.raw.headers)
|
|
315
|
+
if (!sessions) return context.json({ error: { code: 'unauthorized' as const } }, 401)
|
|
316
|
+
return context.json({ sessions })
|
|
317
|
+
})
|
|
318
|
+
.post(
|
|
319
|
+
'/api/account/sessions/revoke',
|
|
320
|
+
validatedJSON(parseCloudSessionRevoke),
|
|
321
|
+
async (context) => {
|
|
322
|
+
const result = await accountAction(
|
|
323
|
+
() =>
|
|
324
|
+
services.auth.revokeSession(
|
|
325
|
+
context.req.raw.headers,
|
|
326
|
+
context.req.valid('json').sessionId
|
|
327
|
+
),
|
|
328
|
+
context
|
|
329
|
+
)
|
|
330
|
+
return result instanceof Response ? result : context.json({ ok: true as const })
|
|
331
|
+
}
|
|
332
|
+
)
|
|
333
|
+
.post('/api/account/sessions/revoke-others', async (context) => {
|
|
192
334
|
const result = await accountAction(
|
|
193
|
-
() =>
|
|
194
|
-
accountAuthentication.unlink(
|
|
195
|
-
context.req.raw.headers,
|
|
196
|
-
context.req.valid('json').methodId
|
|
197
|
-
),
|
|
335
|
+
() => services.auth.revokeOtherSessions(context.req.raw.headers),
|
|
198
336
|
context
|
|
199
337
|
)
|
|
200
338
|
return result instanceof Response ? result : context.json({ ok: true as const })
|
|
201
|
-
}
|
|
202
|
-
)
|
|
203
|
-
.use('/api/account/profile', requireActiveSession)
|
|
204
|
-
.use('/api/account/profile/*', requireActiveSession)
|
|
205
|
-
.use('/api/account/sessions', requireActiveSession)
|
|
206
|
-
.use('/api/account/sessions/*', requireActiveSession)
|
|
207
|
-
.use('/api/account/sign-ins', requireActiveSession)
|
|
208
|
-
.use('/api/account/profile', authenticatedMutationLimiter)
|
|
209
|
-
.use('/api/account/profile/*', authenticatedMutationLimiter)
|
|
210
|
-
.use('/api/account/sessions/*', authenticatedMutationLimiter)
|
|
211
|
-
.get('/api/account/profile', async (context) => {
|
|
212
|
-
const profile = await services.auth.profile(context.req.raw.headers)
|
|
213
|
-
if (!profile) return context.json({ error: { code: 'unauthorized' as const } }, 401)
|
|
214
|
-
return context.json({
|
|
215
|
-
profile: {
|
|
216
|
-
...profile,
|
|
217
|
-
createdAt: profile.createdAt.toISOString(),
|
|
218
|
-
emailChangeAvailable: services.auth.emailChangeAvailable
|
|
219
|
-
}
|
|
220
339
|
})
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
)
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
'/api/account/profile/picture',
|
|
231
|
-
bodyLimit({
|
|
232
|
-
maxSize: PICTURE_BODY_BYTES,
|
|
233
|
-
onError: (context) => context.json({ error: { code: 'picture_invalid' as const } }, 413)
|
|
234
|
-
}),
|
|
235
|
-
validatedJSON(parseCloudPictureUpload),
|
|
236
|
-
async (context) => {
|
|
237
|
-
const bytes = toUint8Array(context.req.valid('json').data)
|
|
238
|
-
try {
|
|
239
|
-
const image = await services.pictures.upload(context.get('actor').userId, bytes)
|
|
240
|
-
return context.json({ image })
|
|
241
|
-
} catch (error) {
|
|
242
|
-
if (!(error instanceof PictureInvalidError)) throw error
|
|
243
|
-
return context.json({ error: { code: 'picture_invalid' as const } }, 400)
|
|
244
|
-
}
|
|
245
|
-
}
|
|
246
|
-
)
|
|
247
|
-
.delete('/api/account/profile/picture', async (context) => {
|
|
248
|
-
await services.pictures.remove(context.get('actor').userId)
|
|
249
|
-
return context.json({ ok: true as const })
|
|
250
|
-
})
|
|
251
|
-
.post('/api/account/profile/email', validatedJSON(parseCloudEmailChange), async (context) => {
|
|
252
|
-
const result = await accountAction(
|
|
253
|
-
() => accountAuthentication.changeEmail(context.req.raw.headers, context.req.valid('json')),
|
|
254
|
-
context
|
|
255
|
-
)
|
|
256
|
-
return result instanceof Response ? result : context.json({ ok: true as const })
|
|
257
|
-
})
|
|
258
|
-
.get('/api/account/sessions', async (context) => {
|
|
259
|
-
const sessions = await services.auth.sessions(context.req.raw.headers)
|
|
260
|
-
if (!sessions) return context.json({ error: { code: 'unauthorized' as const } }, 401)
|
|
261
|
-
return context.json({ sessions })
|
|
262
|
-
})
|
|
263
|
-
.post(
|
|
264
|
-
'/api/account/sessions/revoke',
|
|
265
|
-
validatedJSON(parseCloudSessionRevoke),
|
|
266
|
-
async (context) => {
|
|
340
|
+
.get('/api/account/sign-ins', async (context) => {
|
|
341
|
+
const signIns = await services.auth.signIns(context.req.raw.headers)
|
|
342
|
+
if (!signIns) return context.json({ error: { code: 'unauthorized' as const } }, 401)
|
|
343
|
+
return context.json({ signIns })
|
|
344
|
+
})
|
|
345
|
+
.get('/api/account/deletion', async (context) => {
|
|
346
|
+
return context.json({ deletion: await services.deletion.plan(context.get('actor').userId) })
|
|
347
|
+
})
|
|
348
|
+
.post('/api/account/delete', validatedJSON(parseCloudAccountDelete), async (context) => {
|
|
267
349
|
const result = await accountAction(
|
|
268
350
|
() =>
|
|
269
|
-
services.auth.
|
|
351
|
+
services.auth.deleteAccount(
|
|
270
352
|
context.req.raw.headers,
|
|
271
|
-
context.req.valid('json').
|
|
353
|
+
context.req.valid('json').password
|
|
272
354
|
),
|
|
273
355
|
context
|
|
274
356
|
)
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
(
|
|
281
|
-
|
|
282
|
-
)
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
.get('/api/account/authentication', async (context) => {
|
|
291
|
-
const result = await accountAction(
|
|
292
|
-
() => accountAuthentication.methods(context.req.raw.headers),
|
|
293
|
-
context
|
|
294
|
-
)
|
|
295
|
-
return result instanceof Response ? result : context.json(result)
|
|
296
|
-
})
|
|
357
|
+
if (result instanceof Response) return result
|
|
358
|
+
// The session is gone with the account; the cookie that named it goes too.
|
|
359
|
+
for (const cookie of result.getSetCookie()) {
|
|
360
|
+
context.header('Set-Cookie', cookie, { append: true })
|
|
361
|
+
}
|
|
362
|
+
return context.json({ ok: true as const })
|
|
363
|
+
})
|
|
364
|
+
.get('/api/account/authentication', async (context) => {
|
|
365
|
+
const result = await accountAction(
|
|
366
|
+
() => accountAuthentication.methods(context.req.raw.headers),
|
|
367
|
+
context
|
|
368
|
+
)
|
|
369
|
+
return result instanceof Response ? result : context.json(result)
|
|
370
|
+
})
|
|
371
|
+
)
|
|
297
372
|
}
|
|
298
373
|
|
|
299
374
|
/** The account routes' types, for the portal's typed client. */
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import type { CloudServerConfig } from '#cloud/server/config'
|
|
2
|
+
import type { CloudDatabase } from '#cloud/server/db'
|
|
3
|
+
import type { Kysely } from 'kysely'
|
|
4
|
+
|
|
5
|
+
/** Whether an account accepted the deployment's current terms, and recording that it did. */
|
|
6
|
+
export type TermsService = {
|
|
7
|
+
/** The version accounts accept, when the deployment requires acceptance. */
|
|
8
|
+
readonly requiredVersion: string | undefined
|
|
9
|
+
/** True when nothing is required, or the account accepted the current version. */
|
|
10
|
+
hasAccepted(userId: string): Promise<boolean>
|
|
11
|
+
/** Records acceptance of the current version; false when `version` is not the current one. */
|
|
12
|
+
accept(userId: string, version: string): Promise<boolean>
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
export function createTermsService(
|
|
16
|
+
database: Kysely<CloudDatabase>,
|
|
17
|
+
config: CloudServerConfig
|
|
18
|
+
): TermsService {
|
|
19
|
+
const requiredVersion = config.legal?.requireAcceptance ? config.legal.termsVersion : undefined
|
|
20
|
+
return {
|
|
21
|
+
requiredVersion,
|
|
22
|
+
async hasAccepted(userId) {
|
|
23
|
+
if (!requiredVersion) return true
|
|
24
|
+
const row = await database
|
|
25
|
+
.selectFrom('termsAcceptance')
|
|
26
|
+
.select('userId')
|
|
27
|
+
.where('userId', '=', userId)
|
|
28
|
+
.where('version', '=', requiredVersion)
|
|
29
|
+
.executeTakeFirst()
|
|
30
|
+
return row !== undefined
|
|
31
|
+
},
|
|
32
|
+
async accept(userId, version) {
|
|
33
|
+
if (!requiredVersion || version !== requiredVersion) return false
|
|
34
|
+
await database
|
|
35
|
+
.insertInto('termsAcceptance')
|
|
36
|
+
.values({ userId, version, acceptedAt: new Date() })
|
|
37
|
+
.onConflict((conflict) => conflict.columns(['userId', 'version']).doNothing())
|
|
38
|
+
.execute()
|
|
39
|
+
return true
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import { parseCloudAccessTokenCreate, parseCloudAccessTokenRevoke } from '#cloud/contract'
|
|
2
|
+
import type { CloudAPIEnvironment } from '#cloud/server/api'
|
|
3
|
+
import type { CloudAuthAdapter, CloudSessionResolver } from '#cloud/server/auth'
|
|
4
|
+
import { validatedJSON } from '#cloud/server/validation'
|
|
5
|
+
import { Hono, type MiddlewareHandler } from 'hono'
|
|
6
|
+
|
|
7
|
+
import { createAccountActions } from './actions'
|
|
8
|
+
|
|
9
|
+
export type AccessTokenRouteDependencies = {
|
|
10
|
+
auth: CloudAuthAdapter
|
|
11
|
+
resolveSession: CloudSessionResolver
|
|
12
|
+
/** A session's, never a token's: account routes resolve sessions alone. */
|
|
13
|
+
requireActiveSession: MiddlewareHandler<CloudAPIEnvironment>
|
|
14
|
+
authenticatedMutationLimiter: MiddlewareHandler<CloudAPIEnvironment>
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
/**
|
|
18
|
+
* The account's personal access tokens: listed, made, and revoked from a signed-in session only,
|
|
19
|
+
* so a token never sees or makes others. Making one needs a recent sign-in.
|
|
20
|
+
*/
|
|
21
|
+
export function createAccessTokenRoutes(services: AccessTokenRouteDependencies) {
|
|
22
|
+
const { accountAction } = createAccountActions(services.resolveSession)
|
|
23
|
+
return new Hono<CloudAPIEnvironment>()
|
|
24
|
+
.use('/api/account/tokens', services.requireActiveSession)
|
|
25
|
+
.use('/api/account/tokens/*', services.requireActiveSession)
|
|
26
|
+
.use('/api/account/tokens/*', services.authenticatedMutationLimiter)
|
|
27
|
+
.get('/api/account/tokens', async (context) => {
|
|
28
|
+
const tokens = await services.auth.listAccessTokens(context.req.raw.headers)
|
|
29
|
+
if (!tokens) return context.json({ error: { code: 'unauthorized' as const } }, 401)
|
|
30
|
+
return context.json({ tokens })
|
|
31
|
+
})
|
|
32
|
+
.post(
|
|
33
|
+
'/api/account/tokens/create',
|
|
34
|
+
validatedJSON(parseCloudAccessTokenCreate),
|
|
35
|
+
async (context) => {
|
|
36
|
+
const result = await accountAction(
|
|
37
|
+
() => services.auth.createAccessToken(context.req.raw.headers, context.req.valid('json')),
|
|
38
|
+
context
|
|
39
|
+
)
|
|
40
|
+
return result instanceof Response ? result : context.json(result, 201)
|
|
41
|
+
}
|
|
42
|
+
)
|
|
43
|
+
.post(
|
|
44
|
+
'/api/account/tokens/revoke',
|
|
45
|
+
validatedJSON(parseCloudAccessTokenRevoke),
|
|
46
|
+
async (context) => {
|
|
47
|
+
const result = await accountAction(
|
|
48
|
+
() =>
|
|
49
|
+
services.auth.revokeAccessToken(context.req.raw.headers, context.req.valid('json').id),
|
|
50
|
+
context
|
|
51
|
+
)
|
|
52
|
+
return result instanceof Response ? result : context.json({ ok: true as const })
|
|
53
|
+
}
|
|
54
|
+
)
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
export type CloudAccessTokenRoutes = ReturnType<typeof createAccessTokenRoutes>
|