Skip to content

Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.

fix(billing): reconcile unchanged and temporary subscription grants

Timothy Yin759048facd42
diff --git a/apps/cloud/app/components/CloudPaymentsPanel.vue b/apps/cloud/app/components/CloudPaymentsPanel.vue
index 2daeed54..18f9f1cc 100644
--- a/apps/cloud/app/components/CloudPaymentsPanel.vue
+++ b/apps/cloud/app/components/CloudPaymentsPanel.vue
@@ -14,7 +14,10 @@ async function load() {
const result = await $fetch('/api/billing/payments', {
query: { workspaceId: id },
})
- if (alive && current === generation) state.value = result
+ if (alive && current === generation) {
+ state.value = result
+ error.value = ''
+ }
} catch {
if (alive && current === generation)
error.value = t('cloud.payments.failed')
diff --git a/packages/platform/src/activation.ts b/packages/platform/src/activation.ts
index 597cadf8..726a57eb 100644
--- a/packages/platform/src/activation.ts
+++ b/packages/platform/src/activation.ts
@@ -295,7 +295,7 @@ export async function redeemActivation(
.bind(code.id, eventId),
db
.prepare(
- `INSERT INTO platform_workspace_plans(workspace_id,plan_id,starts_at,expires_at,source,billing_interval) SELECT ?,?,?,?,'activation',NULL WHERE EXISTS(SELECT 1 FROM platform_activation_redemptions WHERE claim_id=?) ON CONFLICT(workspace_id) DO UPDATE SET plan_id=excluded.plan_id,starts_at=excluded.starts_at,expires_at=excluded.expires_at,source='activation',billing_interval=NULL,payment_subscription_id=NULL,revision=platform_workspace_plans.revision+1`,
+ `INSERT INTO platform_workspace_plans(workspace_id,plan_id,starts_at,expires_at,source,billing_interval) SELECT ?,?,?,?,'activation',NULL WHERE EXISTS(SELECT 1 FROM platform_activation_redemptions WHERE claim_id=?) ON CONFLICT(workspace_id) DO UPDATE SET plan_id=excluded.plan_id,starts_at=excluded.starts_at,expires_at=excluded.expires_at,source='activation',billing_interval=NULL,revision=platform_workspace_plans.revision+1`,
)
.bind(
workspaceId,
diff --git a/packages/platform/src/payments.ts b/packages/platform/src/payments.ts
index e137ff33..3e7a730d 100644
--- a/packages/platform/src/payments.ts
+++ b/packages/platform/src/payments.ts
@@ -786,8 +786,49 @@ async function synchronizePayment(
'past_due',
].includes(s.status)
const until =
- s.status === 'past_due' ? Math.min(end, known?.period_end ?? 0) : end
+ s.status === 'past_due'
+ ? Math.min(end, known?.period_end ?? Math.min(start, now))
+ : end
const active = entitled && until > now
+ const anchor =
+ known && known.plan_id === planId ? known.quota_anchor : start
+ const assignmentNeedsWrite =
+ canAssign &&
+ (prior?.source !== (active ? 'payment' : 'expired_default') ||
+ (active &&
+ (prior.plan_id !== planId ||
+ prior.starts_at !== anchor ||
+ prior.expires_at !== until ||
+ prior.billing_interval !== interval)))
+ // A reconciliation heartbeat is not a new payment or a new entitlement revision.
+ // Still restore a linked paid subscription after a temporary grant expires.
+ if (
+ known &&
+ updated === known.provider_updated_at &&
+ known.status === s.status &&
+ known.product_id === objectId(s.product) &&
+ known.plan_id === planId &&
+ known.interval === interval &&
+ known.period_start === start &&
+ known.period_end === until &&
+ !assignmentNeedsWrite
+ ) {
+ await db
+ .prepare(
+ 'UPDATE platform_payment_subscriptions SET checked_at=?,next_check_at=?,error=? WHERE id=? AND EXISTS(SELECT 1 FROM platform_payment_locks WHERE workspace_id=? AND token=? AND expires_at>?)',
+ )
+ .bind(
+ now,
+ Math.max(now + 60000, Math.min(now + 900000, until)),
+ canAssign ? null : 'payment_grant_superseded',
+ subscriptionId,
+ checkout.workspace_id,
+ token,
+ now,
+ )
+ .run()
+ return 'done'
+ }
const eventId = 'creem:' + event.id
const fence =
'EXISTS(SELECT 1 FROM platform_payment_locks WHERE workspace_id=? AND token=? AND expires_at>?)'
@@ -801,8 +842,6 @@ async function synchronizePayment(
subscriptionId,
environment: 'test',
}
- const anchor =
- known && known.plan_id === planId ? known.quota_anchor : start
const statements = [
db
.prepare(
diff --git a/tests/platform-payments.test.ts b/tests/platform-payments.test.ts
index b729cfb1..8372d408 100644
--- a/tests/platform-payments.test.ts
+++ b/tests/platform-payments.test.ts
@@ -1,3 +1,7 @@
+import {
+ activationHash,
+ redeemActivation,
+} from '../packages/platform/src/activation.ts'
import {
accountExemption,
DEFAULT_EXEMPTIONS,
@@ -593,7 +597,7 @@ test('Manual grants supersede late renewals; expiry reconciliation can safely re
)
await f.db
.prepare(
- "UPDATE platform_workspace_plans SET plan_id='free',source='manual',payment_subscription_id=NULL,revision=revision+1 WHERE workspace_id=1",
+ "UPDATE platform_workspace_plans SET plan_id='free',source='manual',revision=revision+1 WHERE workspace_id=1",
)
.run()
await (
@@ -960,3 +964,155 @@ test('Owned account erasure removes dependent payment rows only after cancellati
await f.mf.dispose()
}
})
+
+test('Unchanged reconciliation does not churn grants, and an expiring activation preserves paid subscription recovery', async () => {
+ const f = await fixture()
+ try {
+ await createPaymentCheckout(
+ f.db,
+ root,
+ 1,
+ f.input,
+ 'https://app.chronoframe.art',
+ f.transport,
+ f.now,
+ )
+ const sub = await f.complete()
+ await (
+ await f.event(
+ 'evt_initial_link',
+ 'checkout.completed',
+ f.checkouts.get('chk_1'),
+ )
+ ).receive()
+ await processPaymentEvents(f.db, root, f.transport, f.now)
+ const before = await f.db
+ .prepare(
+ 'SELECT revision FROM platform_workspace_plans WHERE workspace_id=1',
+ )
+ .first<any>()
+ const count = await f.db
+ .prepare('SELECT COUNT(*) n FROM platform_subscription_events')
+ .first<any>()
+ const subBefore = await f.db
+ .prepare('SELECT revision FROM platform_payment_subscriptions')
+ .first<any>()
+ await reconcilePayments(f.db, root, f.transport, f.now + 1000000)
+ assert.equal(
+ (
+ await f.db
+ .prepare(
+ 'SELECT revision FROM platform_workspace_plans WHERE workspace_id=1',
+ )
+ .first<any>()
+ ).revision,
+ before.revision,
+ )
+ assert.equal(
+ (
+ await f.db
+ .prepare('SELECT COUNT(*) n FROM platform_subscription_events')
+ .first<any>()
+ ).n,
+ count.n,
+ )
+ assert.equal(
+ (
+ await f.db
+ .prepare('SELECT revision FROM platform_payment_subscriptions')
+ .first<any>()
+ ).revision,
+ subBefore.revision,
+ )
+ await f.db
+ .prepare(
+ "INSERT INTO platform_activation_codes(id,code_hash,display,batch_id,plan_id,duration_unit,duration_value,created_at,created_by) VALUES('temporary',?,'TEMP','batch','free','days',1,?,1)",
+ )
+ .bind(await activationHash('TEMPORARY'), f.now)
+ .run()
+ await redeemActivation(
+ f.db,
+ 1,
+ 1,
+ {
+ code: 'TEMPORARY',
+ requestId: crypto.randomUUID(),
+ revision: before.revision,
+ },
+ f.now + 1000001,
+ )
+ assert.equal(
+ (
+ await f.db
+ .prepare(
+ 'SELECT payment_subscription_id FROM platform_workspace_plans WHERE workspace_id=1',
+ )
+ .first<any>()
+ ).payment_subscription_id,
+ sub.id,
+ )
+ await (
+ await f.event('evt_while_activation', 'subscription.paid', sub)
+ ).receive()
+ await processPaymentEvents(f.db, root, f.transport, f.now + 1000002)
+ assert.equal(
+ (await resolveSubscription(f.db, 1, f.now + 1000002)).subscription.source,
+ 'activation',
+ )
+ const expiry = (await resolveSubscription(f.db, 1, f.now + 1000002))
+ .subscription.expiresAt!
+ await reconcileSubscriptions(f.db, expiry + 1)
+ await reconcilePayments(f.db, root, f.transport, expiry + 1)
+ const restored = await resolveSubscription(f.db, 1, expiry + 1)
+ assert.equal(restored.id, 'pro')
+ assert.equal(restored.subscription.source, 'payment')
+ } finally {
+ await f.mf.dispose()
+ }
+})
+
+test('First past-due confirmation stores a real boundary without inventing a paid entitlement', async () => {
+ const f = await fixture()
+ try {
+ await createPaymentCheckout(
+ f.db,
+ root,
+ 1,
+ f.input,
+ 'https://app.chronoframe.art',
+ f.transport,
+ f.now,
+ )
+ const sub = await f.complete()
+ sub.status = 'past_due'
+ await (
+ await f.event(
+ 'evt_first_due',
+ 'checkout.completed',
+ f.checkouts.get('chk_1'),
+ )
+ ).receive()
+ await processPaymentEvents(f.db, root, f.transport, f.now)
+ assert.equal((await resolveSubscription(f.db, 1, f.now)).id, 'free')
+ const stored = await f.db
+ .prepare('SELECT period_end FROM platform_payment_subscriptions')
+ .first<any>()
+ assert.ok(
+ stored.period_end > Date.UTC(2020, 0, 1) && stored.period_end <= f.now,
+ )
+ await reconcilePayments(f.db, root, f.transport, f.now + 120000)
+ assert.equal(
+ (await resolveSubscription(f.db, 1, f.now + 120000)).id,
+ 'free',
+ )
+ sub.status = 'active'
+ sub.updated_at = new Date(f.now + 120001).toISOString()
+ await (
+ await f.event('evt_due_paid', 'subscription.paid', sub, f.now + 120001)
+ ).receive()
+ await processPaymentEvents(f.db, root, f.transport, f.now + 120001)
+ assert.equal((await resolveSubscription(f.db, 1, f.now + 120001)).id, 'pro')
+ } finally {
+ await f.mf.dispose()
+ }
+})