Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.
TypeScript albumsexif-extractiongeocodinglive-photomotion-photophoto-galleryphoto-sharingwebgl-viewer
fix(billing): open sandbox subscriptions to all workspaces
Timothy Yin60b908c1458f
diff --git a/packages/platform/src/payments.ts b/packages/platform/src/payments.tsindex c14cb95e..9a0eec53 100644--- a/packages/platform/src/payments.ts+++ b/packages/platform/src/payments.ts@@ -100,7 +100,7 @@ export async function paymentSecrets(export async function paymentSettings(db: PlatformD1) {const row = await db.prepare(- 'SELECT enabled,environment,workspace_ids_json,revision,catalog_revision,auto_sync,payload_retention_days,credentials_ciphertext IS NOT NULL AS configured FROM platform_payment_settings WHERE id=1',+ 'SELECT enabled,environment,revision,catalog_revision,auto_sync,payload_retention_days,credentials_ciphertext IS NOT NULL AS configured FROM platform_payment_settings WHERE id=1',).first<any>()return {@@ -109,7 +109,6 @@ export async function paymentSettings(db: PlatformD1) {catalogRevision: Number(row.catalog_revision),payloadRetentionDays: Number(row.payload_retention_days),environment: 'test' as const,- workspaceIds: JSON.parse(row.workspace_ids_json) as number[],revision: Number(row.revision),configured: !!row.configured,}@@ -269,9 +268,7 @@ export async function paymentStatus(.bind(workspaceId).first<any>()const offers =- settings.enabled &&- settings.configured &&- settings.workspaceIds.includes(workspaceId)+ settings.enabled && settings.configured? await allRows<any>(db.prepare("SELECT m.plan_id,m.interval FROM platform_payment_products m JOIN platform_plans p ON p.id=m.plan_id WHERE m.enabled=1 AND p.active=1 AND p.listed=1 AND p.currency=m.currency AND m.price=CASE WHEN m.interval=1 THEN p.monthly_price ELSE p.quarterly_price END AND ((SELECT auto_sync FROM platform_payment_settings WHERE id=1)=0 OR EXISTS(SELECT 1 FROM platform_payment_product_sync j WHERE j.plan_id=p.id AND j.interval=m.interval AND j.state='synced' AND j.desired_revision=p.revision AND j.product_id=m.product_id AND j.catalog_revision=(SELECT catalog_revision FROM platform_payment_settings WHERE id=1)))",@@ -366,11 +363,7 @@ export async function createPaymentCheckout()fail(400, 'payment_checkout_invalid')const settings = await paymentSettings(db)- if (- !settings.enabled ||- !settings.configured ||- !settings.workspaceIds.includes(input.workspaceId)- )+ if (!settings.enabled || !settings.configured)fail(403, 'payment_checkout_disabled')const token = await acquireWorkspace(db, input.workspaceId, now)try {diff --git a/tests/platform-payments.test.ts b/tests/platform-payments.test.tsindex 042a74f6..905969c7 100644--- a/tests/platform-payments.test.ts+++ b/tests/platform-payments.test.ts@@ -267,7 +267,7 @@ test('Payment credentials are authenticated-encrypted, test-only, workspace-admiassert.ok(!stored.credentials_ciphertext.includes(credentials.apiKey))assert.deepEqual(await paymentSecrets(f.db, root), credentials)await assert.rejects(paymentSecrets(f.db, 'different-root-key-'.repeat(4)))- assert.deepEqual((await paymentSettings(f.db)).workspaceIds, [1])+ assert.equal('workspaceIds' in (await paymentSettings(f.db)), false)assert.equal((await paymentStatus(f.db, 1, 1)).offers.length, 2)await assert.rejects(createPaymentCheckout(@@ -304,9 +304,31 @@ test('Payment credentials are authenticated-encrypted, test-only, workspace-admi{ code: 'payment_product_mismatch' },)assert.equal(f.calls.filter((v) => v === 'POST /v1/checkouts').length, 0)+ f.setPrice(1200)+ // A legacy list containing only workspace 1 must not restrict workspace 2.+ assert.equal((await paymentStatus(f.db, 2, 2)).offers.length, 2)+ await createPaymentCheckout(+ f.db,+ root,+ 2,+ { ...f.input, workspaceId: 2, requestId: 'outside_old_list' },+ 'https://app.chronoframe.art',+ f.transport,+ )await f.db.prepare("UPDATE platform_payment_settings SET workspace_ids_json='[]'").run()+ assert.equal((await paymentStatus(f.db, 1, 1)).offers.length, 2)+ await createPaymentCheckout(+ f.db,+ root,+ 1,+ f.input,+ 'https://app.chronoframe.art',+ f.transport,+ )+ await f.db.prepare('UPDATE platform_payment_settings SET enabled=0').run()+ assert.equal((await paymentStatus(f.db, 1, 1)).offers.length, 0)await assert.rejects(createPaymentCheckout(f.db,