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.

feat(billing): support activation-code purchase mode

Timothy Yin9dfb84c28cf3
diff --git a/apps/cloud/app/components/CloudPricing.vue b/apps/cloud/app/components/CloudPricing.vue
index 7d03d744..4407b297 100644
--- a/apps/cloud/app/components/CloudPricing.vue
+++ b/apps/cloud/app/components/CloudPricing.vue
@@ -71,6 +71,11 @@ const action = (plan: any) =>
const payment = computed(() => payments?.data.value),
paying = ref(''),
paymentError = ref('')
+const redeemOnly = computed(
+ () =>
+ data.value?.purchaseMethod === 'activation_code' ||
+ (props.portal && payment.value?.purchaseMethod === 'activation_code'),
+)
let mounted = true
onBeforeUnmount(() => {
mounted = false
@@ -163,7 +168,7 @@ async function checkout(plan: any) {
/>
<p class="cf-field-hint">
{{
- portal && payment?.environment === 'test'
+ portal && !redeemOnly && payment?.environment === 'test'
? $t('cloud.payments.testHelp')
: $t('cloud.billing.purchaseHelp')
}}
@@ -257,7 +262,17 @@ async function checkout(plan: any) {
}}
</p>
<CfButton
- v-if="portal && !payment && payments?.error.value"
+ v-if="redeemOnly"
+ as-child
+ :variant="plan.featured ? 'default' : 'secondary'"
+ ><NuxtLink
+ :to="links.redeem"
+ :external="!portal"
+ >{{ $t('cloud.billing.redeem') }}</NuxtLink
+ ></CfButton
+ >
+ <CfButton
+ v-else-if="portal && !payment && payments?.error.value"
variant="secondary"
@click="payments?.refresh()"
>{{ $t('cloud.messages.retry') }}</CfButton
diff --git a/packages/platform/migrations/0027_purchase_method.sql b/packages/platform/migrations/0027_purchase_method.sql
new file mode 100644
index 00000000..bcd7c5b9
--- /dev/null
+++ b/packages/platform/migrations/0027_purchase_method.sql
@@ -0,0 +1 @@
+ALTER TABLE platform_payment_settings ADD COLUMN purchase_method TEXT NOT NULL DEFAULT 'payment' CHECK(purchase_method IN('payment','activation_code'));
diff --git a/packages/platform/src/billing.ts b/packages/platform/src/billing.ts
index 61f84bf0..8f6c83c5 100644
--- a/packages/platform/src/billing.ts
+++ b/packages/platform/src/billing.ts
@@ -5,6 +5,7 @@ import {
SubscriptionError,
} from './subscriptions.ts'
import { workspaceEntitlements, validatePolicy } from './entitlements.ts'
+import { paymentSettings } from './payments.ts'
export const CURRENCIES = [
'USD',
'CNY',
@@ -65,8 +66,12 @@ export async function pricingCatalog(db: PlatformD1) {
const settings = await db
.prepare('SELECT new_plan_id FROM platform_billing_settings WHERE id=1')
.first<{ new_plan_id: string }>()
+ const payment = await paymentSettings(db)
return {
- paymentAvailable: false,
+ paymentAvailable: payment.enabled && payment.purchaseMethod === 'payment',
+ purchaseMethod: payment.enabled
+ ? payment.purchaseMethod
+ : 'activation_code',
newPlanId: settings?.new_plan_id ?? 'free',
plans: rows.map(
({ policy_json, monthly_price, quarterly_price, featured, ...row }) => ({
diff --git a/packages/platform/src/payments.ts b/packages/platform/src/payments.ts
index 9a0eec53..3691ffd3 100644
--- a/packages/platform/src/payments.ts
+++ b/packages/platform/src/payments.ts
@@ -100,11 +100,12 @@ export async function paymentSecrets(
export async function paymentSettings(db: PlatformD1) {
const row = await db
.prepare(
- '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',
+ 'SELECT enabled,purchase_method,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 {
enabled: !!row.enabled,
+ purchaseMethod: row.purchase_method as 'payment' | 'activation_code',
autoSync: !!row.auto_sync,
catalogRevision: Number(row.catalog_revision),
payloadRetentionDays: Number(row.payload_retention_days),
@@ -268,7 +269,9 @@ export async function paymentStatus(
.bind(workspaceId)
.first<any>()
const offers =
- settings.enabled && settings.configured
+ settings.enabled &&
+ settings.purchaseMethod === 'payment' &&
+ 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)))",
@@ -277,6 +280,9 @@ export async function paymentStatus(
: []
return {
environment: 'test',
+ purchaseMethod: settings.enabled
+ ? settings.purchaseMethod
+ : 'activation_code',
enabled: offers.length > 0,
canManage: membership.role === 'admin',
offers,
@@ -363,7 +369,11 @@ export async function createPaymentCheckout(
)
fail(400, 'payment_checkout_invalid')
const settings = await paymentSettings(db)
- if (!settings.enabled || !settings.configured)
+ if (
+ !settings.enabled ||
+ settings.purchaseMethod !== 'payment' ||
+ !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.ts
index 905969c7..2aa09737 100644
--- a/tests/platform-payments.test.ts
+++ b/tests/platform-payments.test.ts
@@ -1,3 +1,4 @@
+import { pricingCatalog } from '../packages/platform/src/billing.ts'
import {
paymentEventPage,
paymentEventPayload,
@@ -2547,3 +2548,43 @@ test('A late portal repurchase cannot replace a newer independently purchased su
await f.mf.dispose()
}
})
+
+test('Disabled payments and activation-code mode expose redemption and reject checkout without contacting a provider', async () => {
+ const f = await fixture()
+ try {
+ for (const [enabled, method, effective] of [
+ [0, 'payment', 'activation_code'],
+ [1, 'activation_code', 'activation_code'],
+ [1, 'payment', 'payment'],
+ ] as const) {
+ await f.db
+ .prepare(
+ 'UPDATE platform_payment_settings SET enabled=?,purchase_method=? WHERE id=1',
+ )
+ .bind(enabled, method)
+ .run()
+ const catalog = await pricingCatalog(f.db)
+ assert.equal(catalog.purchaseMethod, effective)
+ const status = await paymentStatus(f.db, 1, 1)
+ assert.equal(status.purchaseMethod, effective)
+ if (effective === 'activation_code') {
+ assert.equal(status.offers.length, 0)
+ const count = f.calls.length
+ await assert.rejects(
+ createPaymentCheckout(
+ f.db,
+ root,
+ 1,
+ f.input,
+ 'https://app.chronoframe.art',
+ f.transport,
+ ),
+ { code: 'payment_checkout_disabled' },
+ )
+ assert.equal(f.calls.length, count)
+ } else assert.equal(status.offers.length, 2)
+ }
+ } finally {
+ await f.mf.dispose()
+ }
+})