Merge pull request #445 from ever-works/feat/add-currency-localization-support

feat: add multi-currency support for payment providers

Author: Innocent-Akim

app/[locale]/config.tsx

@@ -3,21 +3,47 @@
 import type { Config } from '@/lib/content';
 import { createContext, useContext, useMemo } from 'react';
 import { getAuthConfig } from '@/lib/auth/config';
-import { defaultPricingConfig } from '@/lib/types';
+import { defaultPricingConfig, getDefaultPricingConfigWithCurrency } from '@/lib/types';
+import { useCurrencyContext } from '@/components/context/currency-provider';
+import { useSelectedCheckoutProvider } from '@/hooks/use-selected-checkout-provider';
+import { usePaymentProvider } from '@/lib/utils/payment-provider';
 
 const ConfigContext = createContext<Config>({});
 
 // Initialize auth config once during module load
 const initialAuthConfig = getAuthConfig();
 
 export function ConfigProvider({ config, children }: { config: Config; children: React.ReactNode }) {
+	// Get user's currency from currency context
+	// CurrencyProvider must be a parent of ConfigProvider (which it is in providers.tsx)
+	const { currency, isLoading: currencyLoading } = useCurrencyContext();
+
+	// Get user's selected checkout provider from Settings
+	const { getActiveProvider } = useSelectedCheckoutProvider();
+
+	// Determine payment provider: User selection takes precedence over config
+	const paymentProvider = usePaymentProvider(getActiveProvider, config.pricing);
+
 	const enhancedConfig = useMemo(() => {
-        const pricing = config.pricing ?? defaultPricingConfig;
-        const configWithPricing = { ...config, pricing };
-		return { ...configWithPricing,
-             authConfig: initialAuthConfig, 
-         };
-	}, [config]);
+		//
+		let pricing = config.pricing;
+
+		if (!pricing && !currencyLoading) {
+			// If no pricing in config, generate currency-aware default config
+			pricing = getDefaultPricingConfigWithCurrency(currency, paymentProvider);
+		} else if (!pricing) {
+			// If currency is still loading, use default config
+			pricing = defaultPricingConfig;
+		} else if (!currencyLoading && currency) {
+			// If config has pricing but we want to enrich it with currency-aware price IDs
+			// We can optionally enhance the existing config with currency-specific IDs
+			// For now, we keep the config as-is since it might come from content/config.yml
+			// The currency-aware price IDs will be resolved at checkout time via getStripePriceConfig/getLemonSqueezyPriceConfig
+		}
+
+		const configWithPricing = { ...config, pricing };
+		return { ...configWithPricing, authConfig: initialAuthConfig };
+	}, [config, currency, currencyLoading, paymentProvider]);
 
 	return <ConfigContext.Provider value={enhancedConfig}>{children}</ConfigContext.Provider>;
 }

app/api/polar/webhook/utils.ts

@@ -42,9 +42,7 @@ export const PLAN_FEATURES: Record<string, string[]> = {
 /**
  * Normalizes email config to ensure all values are strings
  */
-export function normalizeEmailConfig(
-	config: Awaited<ReturnType<typeof getEmailConfig>>
-): EmailConfig {
+export function normalizeEmailConfig(config: Awaited<ReturnType<typeof getEmailConfig>>): EmailConfig {
 	const supportEmail =
 		typeof config.supportEmail === 'string' && config.supportEmail.trim() !== ''
 			? config.supportEmail
@@ -77,14 +75,9 @@ export function createEmailData<T extends Record<string, any>>(
  */
 export function extractSubscriptionInfo(data: PolarWebhookData) {
 	const productId = data.product?.id || data.product_id || '';
-	const planName = productId ? getPlanName(productId) : DEFAULT_PLAN_NAME;
-	const amount = formatAmount(
-		data.price?.amount || data.amount || 0,
-		data.currency || DEFAULT_CURRENCY
-	);
-	const billingPeriod = getBillingPeriod(
-		data.price?.recurring?.interval || data.interval || DEFAULT_INTERVAL
-	);
+	const planName = productId ? getPlanName(productId) || DEFAULT_PLAN_NAME : DEFAULT_PLAN_NAME;
+	const amount = formatAmount(data.price?.amount || data.amount || 0, data.currency || DEFAULT_CURRENCY);
+	const billingPeriod = getBillingPeriod(data.price?.recurring?.interval || data.interval || DEFAULT_INTERVAL);
 
 	return { productId, planName, amount, billingPeriod };
 }
@@ -94,13 +87,10 @@ export function extractSubscriptionInfo(data: PolarWebhookData) {
  */
 export function extractNestedSubscriptionInfo(data: PolarWebhookData) {
 	const subscription = data.subscription;
-	const productId =
-		subscription?.product?.id || subscription?.product_id || data.product?.id || data.product_id;
-	const planName = productId ? getPlanName(productId) : DEFAULT_PLAN_NAME;
+	const productId = subscription?.product?.id || subscription?.product_id || data.product?.id || data.product_id;
+	const planName = productId ? getPlanName(productId) || DEFAULT_PLAN_NAME : DEFAULT_PLAN_NAME;
 	const billingPeriod = subscription
-		? getBillingPeriod(
-				subscription.price?.recurring?.interval || subscription.interval || DEFAULT_INTERVAL
-			)
+		? getBillingPeriod(subscription.price?.recurring?.interval || subscription.interval || DEFAULT_INTERVAL)
 		: DEFAULT_INTERVAL;
 
 	return { productId, planName, billingPeriod, subscription };
@@ -123,7 +113,7 @@ export function validateWebhookPayload(body: unknown): body is PolarWebhookEvent
 	}
 
 	const event = body as Record<string, unknown>;
-	
+
 	// Must have type and data
 	if (typeof event.type !== 'string' || event.data === null || typeof event.data !== 'object') {
 		return false;

app/api/stripe/webhook/route.ts

@@ -315,7 +315,7 @@ async function handleSubscriptionCreated(data: any) {
 
 		// Extract subscription information
 		const priceId = data.items?.data?.[0]?.price?.id;
-		const planName = getPlanName(priceId);
+		const planName = getPlanName(priceId) || 'Premium Plan';
 		const amount = formatAmount(data.items?.data?.[0]?.price?.unit_amount || 0, data.currency);
 		const billingPeriod = getBillingPeriod(data.items?.data?.[0]?.price?.recurring?.interval);
 		const emailConfig = await getEmailConfig();		
@@ -361,7 +361,7 @@ async function handleSubscriptionUpdated(data: any) {
 
 		// Extract subscription information
 		const priceId = data.items?.data?.[0]?.price?.id;
-		const planName = getPlanName(priceId);
+		const planName = getPlanName(priceId) || 'Premium Plan';
 		const amount = formatAmount(data.items?.data?.[0]?.price?.unit_amount || 0, data.currency);
 		const billingPeriod = getBillingPeriod(data.items?.data?.[0]?.price?.recurring?.interval);
 
@@ -409,7 +409,7 @@ async function handleSubscriptionCancelled(data: any) {
 		await webhookSubscriptionService.handleSubscriptionCancelled(data);
 		const customerInfo = extractCustomerInfo(data);
 		const priceId = data.items?.data?.[0]?.price?.id;
-		const planName = getPlanName(priceId);
+		const planName = getPlanName(priceId) || 'Premium Plan';
 		const amount = formatAmount(data.items?.data?.[0]?.price?.unit_amount || 0, data.currency);
 		const billingPeriod = getBillingPeriod(data.items?.data?.[0]?.price?.recurring?.interval);
 
@@ -461,7 +461,7 @@ async function handleSubscriptionPaymentSucceeded(data: any) {
 		// Extract payment information
 		const amount = formatAmount(data.amount_paid, data.currency);
 		const subscription = data.subscription;
-		const planName = subscription ? getPlanName(subscription.items?.data?.[0]?.price?.id) : 'Premium Plan';
+		const planName = subscription ? (getPlanName(subscription.items?.data?.[0]?.price?.id) || 'Premium Plan') : 'Premium Plan';
 		const billingPeriod = subscription
 			? getBillingPeriod(subscription.items?.data?.[0]?.price?.recurring?.interval)
 			: 'month';
@@ -508,7 +508,7 @@ async function handleSubscriptionPaymentFailed(data: any) {
 		// Extract payment information
 		const amount = formatAmount(data.amount_due, data.currency);
 		const subscription = data.subscription;
-		const planName = subscription ? getPlanName(subscription.items?.data?.[0]?.price?.id) : 'Premium Plan';
+		const planName = subscription ? (getPlanName(subscription.items?.data?.[0]?.price?.id) || 'Premium Plan') : 'Premium Plan';
 		const billingPeriod = subscription
 			? getBillingPeriod(subscription.items?.data?.[0]?.price?.recurring?.interval)
 			: 'month';
@@ -555,7 +555,7 @@ async function handleSubscriptionTrialEnding(data: any) {
 
 		// Extract subscription information
 		const priceId = data.items?.data?.[0]?.price?.id;
-		const planName = getPlanName(priceId);
+		const planName = getPlanName(priceId) || 'Premium Plan';
 		const amount = formatAmount(data.items?.data?.[0]?.price?.unit_amount || 0, data.currency);
 		const billingPeriod = getBillingPeriod(data.items?.data?.[0]?.price?.recurring?.interval);
 

app/api/user/currency/route.ts

@@ -2,50 +2,7 @@ import { NextRequest, NextResponse } from 'next/server';
 import { z } from 'zod';
 import { auth } from '@/lib/auth';
 import { getUserCurrency, updateUserCurrency } from '@/lib/services/currency.service';
-
-// Whitelist of supported ISO 4217 currency codes
-const SUPPORTED_CURRENCIES = [
-	'USD',
-	'EUR',
-	'GBP',
-	'JPY',
-	'CNY',
-	'CAD',
-	'AUD',
-	'CHF',
-	'INR',
-	'BRL',
-	'MXN',
-	'KRW',
-	'RUB',
-	'TRY',
-	'ZAR',
-	'SGD',
-	'HKD',
-	'NOK',
-	'SEK',
-	'DKK',
-	'PLN',
-	'CZK',
-	'HUF',
-	'NZD',
-	'THB',
-	'ILS',
-	'CLP',
-	'PHP',
-	'AED',
-	'SAR',
-	'MYR',
-	'IDR',
-	'VND',
-	'BGN',
-	'RON',
-	// HRK removed - Croatia adopted EUR on January 1, 2023
-	'ISK',
-	'BWP',
-	'COP',
-	'PEN'
-] as const;
+import { SUPPORTED_CURRENCIES } from '@/lib/config/billing';
 
 const currencyUpdateSchema = z.object({
 	currency: z
@@ -92,7 +49,14 @@ export async function PUT(request: NextRequest) {
 			return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
 		}
 
-		const body = await request.json();
+		// Parse and validate JSON body
+		let body: unknown;
+		try {
+			body = await request.json();
+		} catch (parseError) {
+			console.error('[API] Invalid JSON in currency update request:', parseError);
+			return NextResponse.json({ error: 'Invalid JSON payload' }, { status: 400 });
+		}
 
 		// Validate request body with Zod schema
 		const validationResult = currencyUpdateSchema.safeParse(body);

hooks/use-auto-renewal.ts

@@ -7,6 +7,7 @@ import { serverClient, apiUtils } from '@/lib/api/server-api-client';
 import { useConfig } from '@/app/[locale]/config';
 import { PaymentProvider } from '@/lib/constants';
 import { useSelectedCheckoutProvider } from './use-selected-checkout-provider';
+import { usePaymentProvider } from '@/lib/utils/payment-provider';
 
 export interface AutoRenewalStatus {
 	subscriptionId: string;
@@ -208,23 +209,8 @@ export function useAutoRenewal(options: UseAutoRenewalOptions): UseAutoRenewalRe
 
 	const { getActiveProvider } = useSelectedCheckoutProvider();
 
-	/**
-	 * Determine payment provider with priority:
-	 * 1. User's selected provider from Settings
-	 * 2. Config default provider
-	 * 3. Fallback to Stripe
-	 */
-	const paymentProvider = useMemo(() => {
-		const userSelectedProvider = getActiveProvider();
-
-		// Map from CheckoutProvider type to PaymentProvider enum
-		if (userSelectedProvider === 'stripe') return PaymentProvider.STRIPE;
-		if (userSelectedProvider === 'lemonsqueezy') return PaymentProvider.LEMONSQUEEZY;
-		if (userSelectedProvider === 'polar') return PaymentProvider.POLAR;
-
-		// Fallback to config default if no user selection or provider not configured
-		return config.pricing?.provider || PaymentProvider.STRIPE;
-	}, [getActiveProvider, config.pricing?.provider]);
+	// Determine payment provider: User selection takes precedence over config
+	const paymentProvider = usePaymentProvider(getActiveProvider, config.pricing);
 
 	// ===================== Query =====================
 

hooks/use-create-checkout.ts

@@ -1,10 +1,12 @@
 'use client';
 import { apiUtils, serverClient } from '@/lib/api/server-api-client';
-import { PaymentInterval } from '@/lib/constants';
+import { PaymentInterval, PaymentPlan } from '@/lib/constants';
 import { PricingConfig, PricingPlans } from '@/lib/content';
 import { getQueryClient } from '@/lib/query-client';
 import { useMutation } from '@tanstack/react-query';
 import { useRouter } from 'next/navigation';
+import { useCurrencyContext } from '@/components/context/currency-provider';
+import { getStripePriceConfig } from '@/lib/config/billing/stripe.config';
 
 export interface SubscriptionFormProps {
 	selectedPlan?: PricingPlans;
@@ -64,8 +66,32 @@ class CheckoutSessionError extends Error {
 	}
 }
 
+/**
+ * Validates and maps plan.id to a valid plan name for billing configs
+ * @param planId - The plan ID to validate
+ * @returns The validated plan name ('free' | 'standard' | 'premium')
+ * @throws CheckoutSessionError if planId is not a valid PaymentPlan
+ */
+function validateAndMapPlanName(planId: string): 'free' | 'standard' | 'premium' {
+	const validPlans: Record<string, 'free' | 'standard' | 'premium'> = {
+		[PaymentPlan.FREE]: 'free',
+		[PaymentPlan.STANDARD]: 'standard',
+		[PaymentPlan.PREMIUM]: 'premium'
+	};
+
+	const planName = validPlans[planId];
+	if (!planName) {
+		throw new CheckoutSessionError(
+			`Invalid plan ID: "${planId}". Expected one of: ${Object.values(PaymentPlan).join(', ')}`
+		);
+	}
+
+	return planName;
+}
+
 export const useCreateCheckoutSession = () => {
 	const router = useRouter();
+	const { currency } = useCurrencyContext();
 
 	const invalidateQueries = async () => {
 		const queryClient = getQueryClient();
@@ -95,7 +121,23 @@ export const useCreateCheckoutSession = () => {
 				);
 			}
 
-			const priceId = billingInterval === PaymentInterval.YEARLY ? plan.annualPriceId : plan.stripePriceId;
+			// Get currency-aware price ID using multi-currency configs
+			// Map plan.id to plan name for billing configs with explicit validation
+			const planName = validateAndMapPlanName(plan.id);
+			const interval = billingInterval === PaymentInterval.YEARLY ? 'yearly' : 'monthly';
+
+			// Try to get currency-aware price ID
+			const currencyPriceConfig = getStripePriceConfig(planName, currency, interval);
+
+			// Use currency-aware price ID if available, otherwise fallback to plan's price ID
+			let priceId: string | undefined;
+			if (currencyPriceConfig?.priceId) {
+				priceId = currencyPriceConfig.priceId;
+			} else {
+				// Fallback to plan's configured price ID
+				priceId = billingInterval === PaymentInterval.YEARLY ? plan.annualPriceId : plan.stripePriceId;
+			}
+
 			if (!priceId) {
 				throw new CheckoutSessionError('Invalid price ID');
 			}