@taskforcehq/taskforce 0.3.307 → 0.3.308

package/dist/server/routes/billing.js

@@ -24,6 +24,9 @@ function parsePricingType(raw) {
         return value;
     return null;
 }
+function parsePricingAudience(raw) {
+    return String(raw || '').trim().toLowerCase() === 'campaign' ? 'campaign' : 'public';
+}
 function readTableVersionStats(core, tableName) {
     const db = core.getDatabaseAdapter();
     const tenantId = core.getTenantId();
@@ -52,6 +55,16 @@ function buildPublicPricingCacheVersion(core) {
     const prices = readTableVersionStats(core, 'billing_price_mappings');
     const features = readTableVersionStats(core, 'plan_feature_matrix');
     const featureCatalogOverrides = readTableVersionStats(core, 'plan_feature_catalog_overrides');
+    const siteSettings = typeof core.getGlobalSettings === 'function'
+        ? (core.getGlobalSettings().site || {})
+        : {};
+    const pricingPageTitle = typeof siteSettings.pricingPageTitle === 'string'
+        ? siteSettings.pricingPageTitle.trim()
+        : '';
+    const pricingPageDescription = typeof siteSettings.pricingPageDescription === 'string'
+        ? siteSettings.pricingPageDescription.trim()
+        : '';
+    const pricingPageShowPublicDescriptions = siteSettings.pricingPageShowPublicDescriptions === true ? '1' : '0';
     return [
         catalog.count,
         catalog.maxUpdatedAt,
@@ -62,11 +75,16 @@ function buildPublicPricingCacheVersion(core) {
         features.count,
         features.maxUpdatedAt,
         featureCatalogOverrides.count,
-        featureCatalogOverrides.maxUpdatedAt
+        featureCatalogOverrides.maxUpdatedAt,
+        pricingPageTitle,
+        pricingPageDescription,
+        pricingPageShowPublicDescriptions
     ].join('|');
 }
-function buildFreePricingSyntheticId(planVersionId, interval) {
-    return `free:${planVersionId}:${interval}`;
+function buildFreePricingSyntheticId(planVersionId, interval, pricingAudience = 'public') {
+    return pricingAudience === 'campaign'
+        ? `free:${planVersionId}:${interval}:campaign`
+        : `free:${planVersionId}:${interval}`;
 }
 function isoFromUnixSeconds(raw) {
     const value = Number(raw);
@@ -435,15 +453,17 @@ function resolveStripePriceIdForPlanVersion(core, planVersionIdRaw, intervalRaw)
         WHERE tenant_id = ?
           AND plan_version_id = ?
           AND billing_interval = ?
+          AND COALESCE(pricing_audience, 'public') = 'public'
           AND active = 1
           AND COALESCE(pricing_type, 'stripe') = 'stripe'
         LIMIT 1
     `).get(tenantId, planVersionId, interval);
     return row?.stripe_price_id ? String(row.stripe_price_id) : null;
 }
-function resolveActivePricingForPlanVersion(core, planVersionIdRaw, intervalRaw) {
+function resolveActivePricingForPlanVersion(core, planVersionIdRaw, intervalRaw, pricingAudienceRaw = 'public') {
     const planVersionId = String(planVersionIdRaw || '').trim();
     const interval = parseInterval(intervalRaw);
+    const pricingAudience = parsePricingAudience(pricingAudienceRaw);
     if (!planVersionId || !interval)
         return null;
     const db = core.getDatabaseAdapter();
@@ -454,9 +474,10 @@ function resolveActivePricingForPlanVersion(core, planVersionIdRaw, intervalRaw)
         WHERE tenant_id = ?
           AND plan_version_id = ?
           AND billing_interval = ?
+          AND COALESCE(pricing_audience, 'public') = ?
           AND active = 1
         LIMIT 1
-    `).get(tenantId, planVersionId, interval);
+    `).get(tenantId, planVersionId, interval, pricingAudience);
     if (!row)
         return null;
     const pricingType = parsePricingType(row.pricing_type) || 'stripe';
@@ -476,6 +497,7 @@ function resolvePlanVersionIdForPriceIdFallback(core, priceIdRaw) {
         FROM billing_price_mappings
         WHERE tenant_id = ?
           AND stripe_price_id = ?
+          AND COALESCE(pricing_audience, 'public') = 'public'
           AND active = 1
         ORDER BY plan_version_id ASC
     `).all(tenantId, priceId);
@@ -1195,9 +1217,9 @@ async function importStripePrices(core) {
             }
             db.prepare(`
                 INSERT INTO billing_price_mappings (
-                    tenant_id, plan_version_id, billing_interval, stripe_price_id, active, unit_amount, currency, created_at, updated_at
-                ) VALUES (?, ?, ?, ?, 1, ?, ?, ?, ?)
-                ON CONFLICT (tenant_id, plan_version_id, billing_interval, stripe_price_id) DO UPDATE SET
+                    tenant_id, plan_version_id, billing_interval, pricing_audience, stripe_price_id, active, unit_amount, currency, created_at, updated_at
+                ) VALUES (?, ?, ?, 'public', ?, 1, ?, ?, ?, ?)
+                ON CONFLICT (tenant_id, plan_version_id, billing_interval, pricing_audience, stripe_price_id) DO UPDATE SET
                     active = 1,
                     unit_amount = excluded.unit_amount,
                     currency = excluded.currency,
@@ -1216,7 +1238,7 @@ async function importStripePrices(core) {
     const existing = db.prepare(`
         SELECT stripe_price_id, pricing_type
         FROM billing_price_mappings
-        WHERE tenant_id = ? AND active = 1
+        WHERE tenant_id = ? AND active = 1 AND COALESCE(pricing_audience, 'public') = 'public'
     `).all(tenantId);
     for (const row of existing) {
         const priceId = String(row.stripe_price_id || '').trim();
@@ -1232,7 +1254,7 @@ async function importStripePrices(core) {
         db.prepare(`
             UPDATE billing_price_mappings
             SET active = 0, updated_at = ?
-            WHERE tenant_id = ? AND stripe_price_id = ?
+            WHERE tenant_id = ? AND stripe_price_id = ? AND COALESCE(pricing_audience, 'public') = 'public'
         `).run(now, tenantId, priceId);
         summary.deactivated += 1;
     }
@@ -1382,10 +1404,10 @@ export function registerBillingRoutes(deps) {
         const db = core.getDatabaseAdapter();
         const tenantId = core.getTenantId();
         const rows = db.prepare(`
-            SELECT plan_version_id, billing_interval, stripe_price_id, pricing_type, active, unit_amount, currency, created_at, updated_at
+            SELECT plan_version_id, billing_interval, COALESCE(pricing_audience, 'public') AS pricing_audience, stripe_price_id, pricing_type, active, unit_amount, currency, created_at, updated_at
             FROM billing_price_mappings
             WHERE tenant_id = ?
-            ORDER BY plan_version_id ASC, billing_interval ASC, stripe_price_id ASC
+            ORDER BY plan_version_id ASC, billing_interval ASC, pricing_audience ASC, stripe_price_id ASC
         `).all(tenantId);
         if (rows.length === 0) {
             console.warn(`[Taskforce] Cloud billing returned no price mappings for tenant=${tenantId}.`);
@@ -1425,6 +1447,7 @@ export function registerBillingRoutes(deps) {
         const body = await parseJsonBody(req);
         const planVersionId = String(body?.planVersionId || '').trim();
         const interval = parseInterval(body?.interval);
+        const pricingAudience = parsePricingAudience(body?.pricingAudience);
         const pricingType = parsePricingType(body?.pricingType) || 'stripe';
         const stripePriceId = String(body?.stripePriceId || '').trim();
         const setActive = body?.active === false ? false : true;
@@ -1454,7 +1477,7 @@ export function registerBillingRoutes(deps) {
         try {
             const now = new Date().toISOString();
             const targetStripePriceId = pricingType === 'free'
-                ? buildFreePricingSyntheticId(planVersionId, interval)
+                ? buildFreePricingSyntheticId(planVersionId, interval, pricingAudience)
                 : stripePriceId;
             let unitAmount = 0;
             let currency = null;
@@ -1483,9 +1506,10 @@ export function registerBillingRoutes(deps) {
                     WHERE tenant_id = ?
                       AND stripe_price_id = ?
                       AND active = 1
+                      AND COALESCE(pricing_audience, 'public') = ?
                       AND plan_version_id <> ?
                     LIMIT 1
-                `).get(tenantId, stripePriceId, planVersionId);
+                `).get(tenantId, stripePriceId, pricingAudience, planVersionId);
                 if (conflictingMapping?.plan_version_id) {
                     res.writeHead(409, { 'Content-Type': 'application/json' });
                     res.end(JSON.stringify({
@@ -1498,11 +1522,11 @@ export function registerBillingRoutes(deps) {
                 currency = stripePrice.currency || null;
             }
             const beforeRows = db.prepare(`
-                SELECT plan_version_id, billing_interval, stripe_price_id, pricing_type, active, unit_amount, currency
+                SELECT plan_version_id, billing_interval, COALESCE(pricing_audience, 'public') AS pricing_audience, stripe_price_id, pricing_type, active, unit_amount, currency
                 FROM billing_price_mappings
-                WHERE tenant_id = ? AND plan_version_id = ? AND billing_interval = ?
+                WHERE tenant_id = ? AND plan_version_id = ? AND billing_interval = ? AND COALESCE(pricing_audience, 'public') = ?
                 ORDER BY stripe_price_id ASC
-            `).all(tenantId, planVersionId, interval);
+            `).all(tenantId, planVersionId, interval, pricingAudience);
             if (setActive) {
                 db.prepare(`
                     UPDATE billing_price_mappings
@@ -1510,36 +1534,38 @@ export function registerBillingRoutes(deps) {
                     WHERE tenant_id = ?
                       AND plan_version_id = ?
                       AND billing_interval = ?
+                      AND COALESCE(pricing_audience, 'public') = ?
                       AND stripe_price_id <> ?
                       AND active = 1
-                `).run(now, tenantId, planVersionId, interval, targetStripePriceId);
+                `).run(now, tenantId, planVersionId, interval, pricingAudience, targetStripePriceId);
             }
             db.prepare(`
                 INSERT INTO billing_price_mappings (
-                    tenant_id, plan_version_id, billing_interval, stripe_price_id, pricing_type, active, unit_amount, currency, created_at, updated_at
-                ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-                ON CONFLICT (tenant_id, plan_version_id, billing_interval, stripe_price_id) DO UPDATE SET
+                    tenant_id, plan_version_id, billing_interval, pricing_audience, stripe_price_id, pricing_type, active, unit_amount, currency, created_at, updated_at
+                ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+                ON CONFLICT (tenant_id, plan_version_id, billing_interval, pricing_audience, stripe_price_id) DO UPDATE SET
                     pricing_type = excluded.pricing_type,
                     active = excluded.active,
                     unit_amount = excluded.unit_amount,
                     currency = excluded.currency,
                     updated_at = excluded.updated_at
-            `).run(tenantId, planVersionId, interval, targetStripePriceId, pricingType, setActive ? 1 : 0, unitAmount, currency, now, now);
+            `).run(tenantId, planVersionId, interval, pricingAudience, targetStripePriceId, pricingType, setActive ? 1 : 0, unitAmount, currency, now, now);
             const mapping = db.prepare(`
-                SELECT plan_version_id, billing_interval, stripe_price_id, pricing_type, active, unit_amount, currency, created_at, updated_at
+                SELECT plan_version_id, billing_interval, COALESCE(pricing_audience, 'public') AS pricing_audience, stripe_price_id, pricing_type, active, unit_amount, currency, created_at, updated_at
                 FROM billing_price_mappings
-                WHERE tenant_id = ? AND plan_version_id = ? AND billing_interval = ? AND stripe_price_id = ?
+                WHERE tenant_id = ? AND plan_version_id = ? AND billing_interval = ? AND COALESCE(pricing_audience, 'public') = ? AND stripe_price_id = ?
                 LIMIT 1
-            `).get(tenantId, planVersionId, interval, targetStripePriceId);
+            `).get(tenantId, planVersionId, interval, pricingAudience, targetStripePriceId);
             const afterRows = db.prepare(`
-                SELECT plan_version_id, billing_interval, stripe_price_id, pricing_type, active, unit_amount, currency
+                SELECT plan_version_id, billing_interval, COALESCE(pricing_audience, 'public') AS pricing_audience, stripe_price_id, pricing_type, active, unit_amount, currency
                 FROM billing_price_mappings
-                WHERE tenant_id = ? AND plan_version_id = ? AND billing_interval = ?
+                WHERE tenant_id = ? AND plan_version_id = ? AND billing_interval = ? AND COALESCE(pricing_audience, 'public') = ?
                 ORDER BY stripe_price_id ASC
-            `).all(tenantId, planVersionId, interval);
+            `).all(tenantId, planVersionId, interval, pricingAudience);
             auditAdminAction(req, 'billing-price-mapping-upsert', {
                 planVersionId,
                 interval,
+                pricingAudience,
                 pricingType,
                 stripePriceId: pricingType === 'free' ? null : stripePriceId,
                 active: setActive,
@@ -1566,6 +1592,7 @@ export function registerBillingRoutes(deps) {
         const body = await parseJsonBody(req);
         const planVersionId = String(body?.planVersionId || '').trim();
         const interval = parseInterval(body?.interval);
+        const pricingAudience = parsePricingAudience(body?.pricingAudience);
         const stripePriceId = String(body?.stripePriceId || '').trim();
         if (!planVersionId || !interval) {
             res.writeHead(400, { 'Content-Type': 'application/json' });
@@ -1576,31 +1603,32 @@ export function registerBillingRoutes(deps) {
         const tenantId = core.getTenantId();
         const now = new Date().toISOString();
         const beforeRows = db.prepare(`
-            SELECT plan_version_id, billing_interval, stripe_price_id, pricing_type, active, unit_amount, currency
+            SELECT plan_version_id, billing_interval, COALESCE(pricing_audience, 'public') AS pricing_audience, stripe_price_id, pricing_type, active, unit_amount, currency
             FROM billing_price_mappings
-            WHERE tenant_id = ? AND plan_version_id = ? AND billing_interval = ?
+            WHERE tenant_id = ? AND plan_version_id = ? AND billing_interval = ? AND COALESCE(pricing_audience, 'public') = ?
             ORDER BY stripe_price_id ASC
-        `).all(tenantId, planVersionId, interval);
+        `).all(tenantId, planVersionId, interval, pricingAudience);
         const result = stripePriceId
             ? db.prepare(`
                 UPDATE billing_price_mappings
                 SET active = 0, updated_at = ?
-                WHERE tenant_id = ? AND plan_version_id = ? AND billing_interval = ? AND stripe_price_id = ?
-            `).run(now, tenantId, planVersionId, interval, stripePriceId)
+                WHERE tenant_id = ? AND plan_version_id = ? AND billing_interval = ? AND COALESCE(pricing_audience, 'public') = ? AND stripe_price_id = ?
+            `).run(now, tenantId, planVersionId, interval, pricingAudience, stripePriceId)
             : db.prepare(`
                 UPDATE billing_price_mappings
                 SET active = 0, updated_at = ?
-                WHERE tenant_id = ? AND plan_version_id = ? AND billing_interval = ?
-            `).run(now, tenantId, planVersionId, interval);
+                WHERE tenant_id = ? AND plan_version_id = ? AND billing_interval = ? AND COALESCE(pricing_audience, 'public') = ?
+            `).run(now, tenantId, planVersionId, interval, pricingAudience);
         const afterRows = db.prepare(`
-            SELECT plan_version_id, billing_interval, stripe_price_id, pricing_type, active, unit_amount, currency
+            SELECT plan_version_id, billing_interval, COALESCE(pricing_audience, 'public') AS pricing_audience, stripe_price_id, pricing_type, active, unit_amount, currency
             FROM billing_price_mappings
-            WHERE tenant_id = ? AND plan_version_id = ? AND billing_interval = ?
+            WHERE tenant_id = ? AND plan_version_id = ? AND billing_interval = ? AND COALESCE(pricing_audience, 'public') = ?
             ORDER BY stripe_price_id ASC
-        `).all(tenantId, planVersionId, interval);
+        `).all(tenantId, planVersionId, interval, pricingAudience);
         auditAdminAction(req, 'billing-price-mapping-deactivate', {
             planVersionId,
             interval,
+            pricingAudience,
             stripePriceId: stripePriceId || null,
             changedRows: Number(result?.changes || 0),
             before: beforeRows,
@@ -1800,12 +1828,13 @@ export function registerBillingRoutes(deps) {
         const body = await parseJsonBody(req);
         const interval = parseInterval(body?.interval);
         const planVersionId = String(body?.planVersionId || '').trim();
+        const pricingAudience = parsePricingAudience(body?.pricingAudience);
         if (!interval || !planVersionId) {
             res.writeHead(400, { 'Content-Type': 'application/json' });
             res.end(JSON.stringify({ error: 'planVersionId and interval are required.' }));
             return;
         }
-        const pricing = resolveActivePricingForPlanVersion(core, planVersionId, interval);
+        const pricing = resolveActivePricingForPlanVersion(core, planVersionId, interval, pricingAudience);
         if (!pricing) {
             res.writeHead(400, { 'Content-Type': 'application/json' });
             res.end(JSON.stringify({ error: 'No active pricing mapping found for requested plan/interval.' }));
@@ -1984,14 +2013,16 @@ export function registerBillingRoutes(deps) {
                 checkout: 'cancel',
                 planId: String(planId || ''),
                 planVersionId,
-                interval
+                interval,
+                pricingAudience
             });
             const successParams = new URLSearchParams({
                 screen: 'plans',
                 checkout: 'success',
                 planId: String(planId || ''),
                 planVersionId,
-                interval
+                interval,
+                pricingAudience
             });
             const session = await stripe.checkout.sessions.create({
                 mode: 'subscription',
@@ -2007,7 +2038,8 @@ export function registerBillingRoutes(deps) {
                         userId,
                         tenantId: core.getTenantId(),
                         planVersionId,
-                        billingInterval: interval
+                        billingInterval: interval,
+                        pricingAudience
                     }
                 },
                 billing_address_collection: config.billingAddress,
@@ -2017,7 +2049,8 @@ export function registerBillingRoutes(deps) {
                     userId,
                     tenantId: core.getTenantId(),
                     planVersionId,
-                    billingInterval: interval
+                    billingInterval: interval,
+                    pricingAudience
                 }
             });
             const checkoutEffectiveUntil = isoFromUnixSeconds(session.expires_at);
@@ -2562,6 +2595,7 @@ export function registerBillingRoutes(deps) {
             const pageDescription = typeof siteSettings.pricingPageDescription === 'string'
                 ? (siteSettings.pricingPageDescription.trim() || 'Manage your subscription and explore available features. Your current plan is highlighted below.')
                 : 'Manage your subscription and explore available features. Your current plan is highlighted below.';
+            const showPublicDescriptions = siteSettings.pricingPageShowPublicDescriptions === true;
             const cacheKey = `${tenantId}:${environment}`;
             const cacheVersion = buildPublicPricingCacheVersion(core);
             const cached = publicPricingCache.get(cacheKey);
@@ -2574,17 +2608,30 @@ export function registerBillingRoutes(deps) {
             const activePlans = core.listPlanCatalog().filter(p => p.status === 'active');
             // Get all active price mappings with their amounts
             const activePrices = db.prepare(`
-                SELECT plan_version_id, billing_interval, stripe_price_id, pricing_type, unit_amount, currency
+                SELECT plan_version_id, billing_interval, COALESCE(pricing_audience, 'public') AS pricing_audience, stripe_price_id, pricing_type, unit_amount, currency
                 FROM billing_price_mappings
-                WHERE tenant_id = ? AND active = 1
+                WHERE tenant_id = ? AND active = 1 AND COALESCE(pricing_audience, 'public') IN ('public', 'campaign')
             `).all(tenantId);
             const pricingByVersionAndInterval = new Map();
+            const buildPricingPayload = (price, interval) => {
+                if (!price)
+                    return null;
+                const pricingType = parsePricingType(price.pricing_type) || 'stripe';
+                return {
+                    pricingType,
+                    stripePriceId: pricingType === 'stripe' ? price.stripe_price_id : null,
+                    unitAmount: pricingType === 'free' ? 0 : price.unit_amount,
+                    currency: pricingType === 'free' ? null : price.currency,
+                    interval
+                };
+            };
             for (const price of activePrices) {
                 const planVersionId = String(price.plan_version_id || '').trim();
                 const interval = parseInterval(price.billing_interval);
+                const pricingAudience = parsePricingAudience(price.pricing_audience);
                 if (!planVersionId || !interval)
                     continue;
-                pricingByVersionAndInterval.set(`${planVersionId}:${interval}`, price);
+                pricingByVersionAndInterval.set(`${planVersionId}:${interval}:${pricingAudience}`, price);
             }
             const featureCatalog = core.listPlanFeatureCatalog();
             const featureCatalogByKey = new Map(featureCatalog.map((feature) => [feature.featureKey, feature]));
@@ -2596,8 +2643,10 @@ export function registerBillingRoutes(deps) {
                 if (!defaultVersion) {
                     return null; // Skip if no valid version exists (edge case)
                 }
-                const monthPrice = pricingByVersionAndInterval.get(`${defaultVersion.planVersionId}:month`);
-                const yearPrice = pricingByVersionAndInterval.get(`${defaultVersion.planVersionId}:year`);
+                const monthPrice = pricingByVersionAndInterval.get(`${defaultVersion.planVersionId}:month:public`);
+                const yearPrice = pricingByVersionAndInterval.get(`${defaultVersion.planVersionId}:year:public`);
+                const campaignMonthPrice = pricingByVersionAndInterval.get(`${defaultVersion.planVersionId}:month:campaign`);
+                const campaignYearPrice = pricingByVersionAndInterval.get(`${defaultVersion.planVersionId}:year:campaign`);
                 return {
                     planId: plan.planId,
                     displayName: plan.displayName,
@@ -2630,7 +2679,8 @@ export function registerBillingRoutes(deps) {
                             label: catalogEntry?.label ?? null,
                             description: catalogEntry?.description ?? null,
                             publicLabel: catalogEntry?.publicLabel ?? null,
-                            publicDescription: catalogEntry?.publicDescription ?? null
+                            publicDescription: catalogEntry?.publicDescription ?? null,
+                            publicDescriptionVisible: showPublicDescriptions
                         });
                         return acc;
                     }, [])
@@ -2654,20 +2704,12 @@ export function registerBillingRoutes(deps) {
                         return a.featureKey.localeCompare(b.featureKey);
                     }),
                     pricing: {
-                        month: monthPrice ? {
-                            pricingType: parsePricingType(monthPrice.pricing_type) || 'stripe',
-                            stripePriceId: (parsePricingType(monthPrice.pricing_type) || 'stripe') === 'stripe' ? monthPrice.stripe_price_id : null,
-                            unitAmount: (parsePricingType(monthPrice.pricing_type) || 'stripe') === 'free' ? 0 : monthPrice.unit_amount,
-                            currency: (parsePricingType(monthPrice.pricing_type) || 'stripe') === 'free' ? null : monthPrice.currency,
-                            interval: 'month'
-                        } : null,
-                        year: yearPrice ? {
-                            pricingType: parsePricingType(yearPrice.pricing_type) || 'stripe',
-                            stripePriceId: (parsePricingType(yearPrice.pricing_type) || 'stripe') === 'stripe' ? yearPrice.stripe_price_id : null,
-                            unitAmount: (parsePricingType(yearPrice.pricing_type) || 'stripe') === 'free' ? 0 : yearPrice.unit_amount,
-                            currency: (parsePricingType(yearPrice.pricing_type) || 'stripe') === 'free' ? null : yearPrice.currency,
-                            interval: 'year'
-                        } : null
+                        month: buildPricingPayload(monthPrice, 'month'),
+                        year: buildPricingPayload(yearPrice, 'year')
+                    },
+                    campaignPricing: {
+                        month: buildPricingPayload(campaignMonthPrice, 'month'),
+                        year: buildPricingPayload(campaignYearPrice, 'year')
                     }
                 };
             }).filter(Boolean);