Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
🐛 Pin checkout to the pay wall currency and disable Adaptive Pricing
Luke Vellacd401ef3cd43
diff --git a/apps/web/src/features/billing/actions.ts b/apps/web/src/features/billing/actions.tsindex 8aecbcf61..289cfcf20 100644--- a/apps/web/src/features/billing/actions.ts+++ b/apps/web/src/features/billing/actions.ts@@ -1,5 +1,6 @@"use server";+import type { Stripe } from "@rallly/billing";import { displayedCurrencies, getProPricing } from "@rallly/billing";import { absoluteUrl } from "@rallly/utils/absolute-url";import { refresh } from "next/cache";@@ -27,6 +28,7 @@ import { getStripe } from "@/features/billing/service";import {canChangeBillingInterval,isEarlySupporter,+ resolveCheckoutCurrency,resolvePriceSet,} from "@/features/billing/utils";import { getActiveSpaceForUser } from "@/features/space/data";@@ -89,8 +91,12 @@ export const upgradeToProAction = authActionClientconst stripe = getStripe();let customerId = ctx.user.customerId;+ let customerCurrency: string | null = null;- if (!customerId) {+ if (customerId) {+ const customer = await stripe.customers.retrieve(customerId);+ customerCurrency = customer.deleted ? null : (customer.currency ?? null);+ } else {const customer = await stripe.customers.create({email: ctx.user.email,@@ -115,7 +121,15 @@ export const upgradeToProAction = authActionClientnonprofitGrantedAt ? await ensureNonprofitCoupon() : null,);- const checkoutSession = await stripe.checkout.sessions.create({+ const checkoutCurrency = resolveCheckoutCurrency({+ requestedCurrency: currency,+ customerCurrency,+ });++ // adaptive_pricing is missing from the pinned stripe-node types.+ const sessionParams: Stripe.Checkout.SessionCreateParams & {+ adaptive_pricing: { enabled: boolean };+ } = {success_url: absoluteUrl(returnPath ?? "/settings/billing"),cancel_url: absoluteUrl(returnPath ?? "/settings/billing"),customer: customerId,@@ -124,9 +138,13 @@ export const upgradeToProAction = authActionClientaddress: "auto",},mode: "subscription",- // No currency hint: the pay wall price is indicative. Stripe picks the- // currency from the customer's billing history or their location, and- // rejects any hint that disagrees with a customer's existing currency.+ // Pin the pay wall currency so checkout, subscription and invoices all+ // match it. A customer who already has a currency keeps it: Stripe+ // rejects a hint that disagrees with it.+ currency: checkoutCurrency,+ // Adaptive Pricing would present a converted local amount (CHF) while+ // the subscription and invoices stay in the price currency (USD).+ adaptive_pricing: { enabled: false },...discount.session,billing_address_collection: "auto",tax_id_collection: {@@ -161,7 +179,10 @@ export const upgradeToProAction = authActionClient...discount.recovery,},},- });+ };++ const checkoutSession =+ await stripe.checkout.sessions.create(sessionParams);if (!checkoutSession.url) {throw new AppError({diff --git a/apps/web/src/features/billing/utils.test.ts b/apps/web/src/features/billing/utils.test.tsindex a3b15963b..6557bceb2 100644--- a/apps/web/src/features/billing/utils.test.ts+++ b/apps/web/src/features/billing/utils.test.ts@@ -2,6 +2,7 @@ import { afterEach, describe, expect, it, vi } from "vitest";import {formatMinorUnitAmount,isEarlySupporter,+ resolveCheckoutCurrency,resolvePriceSet,} from "./utils";@@ -121,3 +122,28 @@ describe("formatMinorUnitAmount", () => {).toBe("¥5,600");});});++describe("resolveCheckoutCurrency", () => {+ it("pins the requested currency for a customer with no currency yet", () => {+ expect(+ resolveCheckoutCurrency({+ requestedCurrency: "eur",+ customerCurrency: null,+ }),+ ).toBe("eur");+ expect(resolveCheckoutCurrency({ requestedCurrency: "eur" })).toBe("eur");+ });++ it("omits the hint for a customer who already has a currency", () => {+ expect(+ resolveCheckoutCurrency({+ requestedCurrency: "eur",+ customerCurrency: "usd",+ }),+ ).toBeUndefined();+ });++ it("omits the hint when none was requested", () => {+ expect(resolveCheckoutCurrency({ customerCurrency: null })).toBeUndefined();+ });+});diff --git a/apps/web/src/features/billing/utils.ts b/apps/web/src/features/billing/utils.tsindex 699174846..878c44c55 100644--- a/apps/web/src/features/billing/utils.ts+++ b/apps/web/src/features/billing/utils.ts@@ -28,6 +28,21 @@ export function isStripeResourceMissingError(error: unknown) {return isStripeErrorCode(error, "resource_missing");}+/**+ * The currency to pin a checkout session to. Stripe rejects a hint that+ * disagrees with a customer's existing currency, so a customer who has+ * already been billed keeps theirs and gets no hint.+ */+export function resolveCheckoutCurrency({+ requestedCurrency,+ customerCurrency,+}: {+ requestedCurrency?: string;+ customerCurrency?: string | null;+}) {+ return customerCurrency ? undefined : requestedCurrency;+}+type PricingLike = Pick<PricingData, "monthly" | "yearly" | "earlySupporter">;/**