Update app.js

app.js

@@ -83,34 +83,21 @@ function safeParseJSON(raw) {
 // ------------------------------
 // Expiry helper: getExpiryFromPlan
 // ------------------------------
-// Returns an object:
-// { expiresAtMs: <Number>, expiresAtIso: <String> }
-// Rules:
-// - If planObj.interval exists use that (weekly -> +7 days, monthly -> +30 days)
-// - Else fallback to matching plan id or code against WEEKLY_PLAN_IDS / MONTHLY_PLAN_IDS
-// - Always add EXTRA_FREE_MS (2 hours) to the computed expiry
-// - If no match, default to 30 days + 2 hours
 const EXTRA_FREE_MS = 2 * 60 * 60 * 1000; // 2 hours in ms
 
-// EDIT THESE SETS to include any numeric plan ids or plan codes you consider weekly/monthly
 const WEEKLY_PLAN_IDS = new Set([
-  // numeric ids
-  3311892, // demo, remove in prod
+  3311892,
   3305738,
-  // string plan codes (if your API sometimes returns the PLN_xxx code)
-  
   'PLN_ngz4l76whecrpkv',
-
-  'PLN_f7a3oagrpt47d5f', // demo, remove in prod
+  'PLN_f7a3oagrpt47d5f',
 ]);
 
 const MONTHLY_PLAN_IDS = new Set([
   3305739,
-    'PLN_584ck56g65xhkum', // replace/extend as needed
+  'PLN_584ck56g65xhkum',
 ]);
 
 function getExpiryFromPlan(planInput) {
-  // planInput may be: undefined | number | string | object { id, plan_code, interval }
   let interval = null;
   let planId = null;
   let planCode = null;
@@ -124,13 +111,11 @@ function getExpiryFromPlan(planInput) {
   } else if (typeof planInput === 'number') {
     planId = planInput;
   } else if (typeof planInput === 'string') {
-    // could be "PLN_xxx" or numeric string
     planCode = planInput;
     const asNum = Number(planInput);
     if (!Number.isNaN(asNum)) planId = asNum;
   }
 
-  // Prefer explicit interval if provided
   if (interval) {
     interval = String(interval).toLowerCase();
     if (interval.includes('week')) {
@@ -141,15 +126,12 @@ function getExpiryFromPlan(planInput) {
       const expires = Date.now() + 30 * 24 * 60 * 60 * 1000 + EXTRA_FREE_MS;
       return { expiresAtMs: expires, expiresAtIso: new Date(expires).toISOString() };
     }
-    // if 'hourly' or other intervals -- you can treat hourly as 7 days for weekly test example or handle explicitly
     if (interval.includes('hour')) {
-      // Treat hourly plans as weekly-like (example from your payload that used hourly). You can adjust.
       const expires = Date.now() + 7 * 24 * 60 * 60 * 1000 + EXTRA_FREE_MS;
       return { expiresAtMs: expires, expiresAtIso: new Date(expires).toISOString() };
     }
   }
 
-  // Fallback: check known id/code sets
   if (planId && WEEKLY_PLAN_IDS.has(planId)) {
     const expires = Date.now() + 7 * 24 * 60 * 60 * 1000 + EXTRA_FREE_MS;
     return { expiresAtMs: expires, expiresAtIso: new Date(expires).toISOString() };
@@ -167,27 +149,90 @@ function getExpiryFromPlan(planInput) {
     return { expiresAtMs: expires, expiresAtIso: new Date(expires).toISOString() };
   }
 
-  // Final fallback: default to 30 days + extra 2 hours
   const expires = Date.now() + 30 * 24 * 60 * 60 * 1000 + EXTRA_FREE_MS;
   return { expiresAtMs: expires, expiresAtIso: new Date(expires).toISOString() };
 }
 
-// Helper: find user doc reference in Firestore
-// Strategy:
-// 1) If metadata.userId exists and matches a doc ID, use that doc
-// 2) Try queries by email, uid, userId fields (most common naming)
-// Returns a DocumentReference or null
+// ------------------------------
+// Helper: get userId from stored slug mapping
+// ------------------------------
+async function getUserIdFromSlug(db, slug) {
+  if (!slug) return null;
+  try {
+    const doc = await db.collection('paystack-page-mappings').doc(slug).get();
+    if (!doc.exists) return null;
+    const data = doc.data();
+    return data?.userId || null;
+  } catch (e) {
+    console.error('Failed to read page mapping for slug:', slug, e);
+    return null;
+  }
+}
+
+// ------------------------------
+// Robust extractor for userId (tries metadata, custom_fields, customer metadata, slug mapping, email fallback)
+// ------------------------------
+async function extractUserIdFromPayload(data, db) {
+  // 1) direct metadata on data
+  const metadata = data.metadata || {};
+  if (metadata.userId || metadata.user_id) return { userId: metadata.userId || metadata.user_id, source: 'metadata' };
+
+  // 2) customer.metadata
+  const custMeta = data.customer?.metadata || {};
+  if (custMeta.userId || custMeta.user_id) return { userId: custMeta.userId || custMeta.user_id, source: 'customer.metadata' };
+
+  // 3) top-level custom_fields (array)
+  if (Array.isArray(data.custom_fields)) {
+    for (const f of data.custom_fields) {
+      const name = (f.variable_name || f.display_name || '').toString().toLowerCase();
+      if ((name.includes('user') || name.includes('user_id') || name.includes('userid')) && f.value) {
+        return { userId: f.value, source: 'custom_fields' };
+      }
+    }
+  }
+
+  // 4) metadata.custom_fields
+  if (metadata.custom_fields) {
+    if (Array.isArray(metadata.custom_fields)) {
+      for (const f of metadata.custom_fields) {
+        const name = (f.variable_name || f.display_name || '').toString().toLowerCase();
+        if (name.includes('user') && f.value) return { userId: f.value, source: 'metadata.custom_fields' };
+      }
+    } else if (typeof metadata.custom_fields === 'object') {
+      for (const k of Object.keys(metadata.custom_fields)) {
+        if (k.toLowerCase().includes('user')) return { userId: metadata.custom_fields[k], source: 'metadata.custom_fields_object' };
+      }
+    }
+  }
+
+  // 5) slug mapping fallback - many webhooks include data.slug
+  const slug = data.slug || data.page?.slug || (data.authorization?.reference && null);
+  if (slug) {
+    const mappedUserId = await getUserIdFromSlug(db, slug);
+    if (mappedUserId) return { userId: mappedUserId, source: 'slug_mapping' };
+  }
+
+  // 6) email fallback (return email so caller can search)
+  if (data.customer?.email) return { userId: data.customer.email, source: 'email' };
+
+  // nothing found
+  return { userId: null, source: null };
+}
+
+// Helper: find user doc reference in Firestore (tries doc id and queries by fields)
 async function findUserDocRef(db, { metadataUserId, email }) {
   const usersRef = db.collection('users');
 
   if (metadataUserId) {
-    // Try doc id first
-    try {
-      const docRef = usersRef.doc(metadataUserId);
-      const snap = await docRef.get();
-      if (snap.exists) return docRef;
-    } catch (e) {
-      // continue to queries
+    // if metadataUserId looks like an email, skip docId check
+    if (!String(metadataUserId).includes('@')) {
+      try {
+        const docRef = usersRef.doc(metadataUserId);
+        const snap = await docRef.get();
+        if (snap.exists) return docRef;
+      } catch (e) {
+        // continue to queries
+      }
     }
 
     // try equality queries on commonly used id fields
@@ -216,7 +261,7 @@ async function findUserDocRef(db, { metadataUserId, email }) {
 }
 
 // ------------------------
-// Existing webhook endpoint (modified to update subscription/entitlements)
+// Existing webhook endpoint (modified to update subscription/entitlements and write paystack_customer_id)
 // ------------------------
 app.post('/webhook/paystack', async (req, res) => {
   const raw = req.body; // Buffer because we used express.raw
@@ -241,10 +286,8 @@ app.post('/webhook/paystack', async (req, res) => {
   const isRefund = /refund/i.test(event);
   const isChargeSuccess = /charge\.success/i.test(event);
   const isInvoiceOrSubscription = /invoice\.(payment_succeeded|paid)|subscription\./i.test(event);
-  // We only care about refunds and payments (charge.success) as per earlier note
-  const isPayment = isChargeSuccess; // we intentionally only act on charge.success
+  const isPayment = isChargeSuccess;
 
-  // Short names
   const db = admin.firestore();
 
   if (isRefund || isPayment || /subscription\.create/i.test(event) || /subscription\.update/i.test(event)) {
@@ -263,14 +306,29 @@ app.post('/webhook/paystack', async (req, res) => {
       console.error('Failed to persist webhook audit:', err);
     }
 
-    // Common data paths
     const data = payload.data || {};
-    // metadata could be on data.metadata or data.customer.metadata depending on event
-    const metadata = data.metadata || data.customer?.metadata || null;
-    const metadataUserId = metadata?.userId || metadata?.user_id || null;
-    const customerEmail = data.customer?.email || (metadata && metadata.email) || null;
 
-    // Try to find the user doc
+    // Try to extract userId robustly (metadata/custom_fields/slug/email)
+    let metadataUserId = null;
+    let customerEmail = null;
+    let extractorSource = null;
+    try {
+      const extracted = await extractUserIdFromPayload(data, db);
+      metadataUserId = extracted.userId || null;
+      extractorSource = extracted.source || null;
+      // If extractor returned an email, set as customerEmail
+      if (metadataUserId && String(metadataUserId).includes('@')) {
+        customerEmail = String(metadataUserId);
+        metadataUserId = null;
+      }
+    } catch (e) {
+      console.error('Error extracting userId from payload:', e);
+    }
+
+    // Also set explicit customer email if present
+    if (!customerEmail && data.customer?.email) customerEmail = data.customer.email;
+
+    // Find user doc reference
     let userDocRef = null;
     try {
       userDocRef = await findUserDocRef(db, { metadataUserId, email: customerEmail });
@@ -279,18 +337,17 @@ app.post('/webhook/paystack', async (req, res) => {
       userDocRef = null;
     }
 
-    // Handler: subscription.create - store subscription id only
+    // Handler: subscription.create - store subscription id only and paystack_customer_id
     if (/subscription\.create/i.test(event) || event === 'subscription.create') {
       const subscriptionCode = data.subscription_code || data.subscription?.subscription_code || (data.id ? String(data.id) : null);
       const status = data.status || 'active';
-
-      // compute expiry from plan if possible
       const planObj = data.plan || data.subscription?.plan || null;
       const expiry = getExpiryFromPlan(planObj);
+      const paystackCustomerId = data.customer?.id ?? (data.customer?.customer_code ? data.customer.customer_code : null);
 
       if (userDocRef && subscriptionCode) {
         try {
-          await userDocRef.update({
+          const updateObj = {
             subscriptionId: subscriptionCode,
             subscription: {
               id: subscriptionCode,
@@ -301,8 +358,15 @@ app.post('/webhook/paystack', async (req, res) => {
               expiresAtIso: expiry.expiresAtIso,
             },
             updatedAt: admin.firestore.FieldValue.serverTimestamp(),
-          });
-          console.log(`User doc updated with subscription ${subscriptionCode} and expiry ${expiry.expiresAtIso}`);
+          };
+
+          // attach paystack_customer_id if present
+          if (paystackCustomerId) {
+            updateObj.paystack_customer_id = String(paystackCustomerId);
+          }
+
+          await userDocRef.update(updateObj);
+          console.log(`User doc updated with subscription ${subscriptionCode} and expiry ${expiry.expiresAtIso} (source: ${extractorSource})`);
         } catch (err) {
           console.error('Failed to update user subscription info:', err);
         }
@@ -311,18 +375,15 @@ app.post('/webhook/paystack', async (req, res) => {
       }
     }
 
-    // Handler: charge.success - add entitlement on successful subscription charge (or one-off if you want)
+    // Handler: charge.success - add entitlement on successful subscription charge
     if (isPayment) {
-      // Determine if this is a recurring/subscription payment:
       const recurringMarker = (data.metadata && (data.metadata.custom_filters?.recurring || data.metadata.recurring)) || false;
-      const hasSubscription = !!(data.subscription || data.subscriptions || data.plan); // defensive
+      const hasSubscription = !!(data.subscription || data.subscriptions || data.plan);
       const isLikelySubscriptionPayment = recurringMarker || hasSubscription;
 
-      // attempt to derive plan object for expiry calc
       const planObj = data.plan || (data.subscription ? data.subscription.plan : null) || null;
       const expiry = getExpiryFromPlan(planObj);
 
-      // Create an entitlement object
       const entitlement = {
         id: data.reference || data.id ? String(data.reference || data.id) : null,
         source: 'paystack',
@@ -330,7 +391,6 @@ app.post('/webhook/paystack', async (req, res) => {
         reference: data.reference || null,
         paidAt: data.paid_at || data.paidAt || data.created_at || null,
         plan: planObj ? { id: planObj.id, code: planObj.plan_code } : null,
-        // add computed expiry ms/iso if available
         expiresAtMs: expiry.expiresAtMs,
         expiresAtIso: expiry.expiresAtIso,
         createdAt: admin.firestore.FieldValue.serverTimestamp(),
@@ -338,7 +398,6 @@ app.post('/webhook/paystack', async (req, res) => {
 
       if (userDocRef && isLikelySubscriptionPayment) {
         try {
-          // Append entitlement
           await userDocRef.update({
             entitlements: admin.firestore.FieldValue.arrayUnion(entitlement),
             updatedAt: admin.firestore.FieldValue.serverTimestamp(),
@@ -348,7 +407,6 @@ app.post('/webhook/paystack', async (req, res) => {
           console.error('Failed to add entitlement to user:', err);
         }
       } else if (userDocRef && !isLikelySubscriptionPayment) {
-        // If you want to also give entitlement for one-off payments, you can add here.
         console.log('charge.success received but not marked recurring/subscription - skipping entitlement add by default.');
       } else {
         console.warn('charge.success: user not found, skipping entitlement update.');
@@ -357,19 +415,16 @@ app.post('/webhook/paystack', async (req, res) => {
 
     // Handler: refunds - remove entitlement(s) associated with refunded transaction
     if (isRefund) {
-      // Refund payload shapes vary. Try to extract refund reference or linked transaction
-      const refund = data; // top-level refund object in many webhook shapes
+      const refund = data;
       const refundedReference = refund.reference || refund.transaction?.reference || refund.transaction?.id || null;
 
       if (userDocRef && refundedReference) {
         try {
-          // Read current entitlements, filter out any matching the refunded reference, and write back
           const snap = await userDocRef.get();
           if (snap.exists) {
             const userData = snap.data();
             const currentEntitlements = Array.isArray(userData.entitlements) ? userData.entitlements : [];
             const filtered = currentEntitlements.filter(e => {
-              // compare by reference or id if present
               const ref = e.reference || e.id || '';
               return ref !== refundedReference && ref !== String(refundedReference);
             });
@@ -399,8 +454,6 @@ app.post('/webhook/paystack', async (req, res) => {
 // ------------------------
 // New: Create Payment Page (link) for a plan
 // ------------------------
-// This endpoint expects JSON body, so we attach express.json() for this route.
-// Required fields in body: planId, userId, name (friendly page name) optionally: amount, redirect_url, collect_phone, fixed_amount
 app.post('/create-payment-link', express.json(), async (req, res) => {
 
   // If req.body was left as a Buffer (because express.raw ran), parse it:
@@ -427,7 +480,16 @@ app.post('/create-payment-link', express.json(), async (req, res) => {
     metadata: {
       userId,
     },
-    // optional properties
+    // Pre-fill the custom field so Paystack includes it in transaction if possible
+   /* custom_fields: [
+      {
+        display_name: 'User ID',
+        variable_name: 'user_id',
+        value: userId,
+      },
+    ],
+    */
+    
     collect_phone,
     fixed_amount,
   };
@@ -444,9 +506,24 @@ app.post('/create-payment-link', express.json(), async (req, res) => {
       timeout: 10_000,
     });
 
-    // Paystack returns a response with data object. Return minimal info to caller.
     const pageData = response.data && response.data.data ? response.data.data : response.data;
 
+    // Persist slug -> userId mapping so webhooks can recover missing metadata later
+    try {
+      const slug = pageData.slug || pageData.data?.slug || null;
+      const pageId = pageData.id || pageData.data?.id || null;
+      if (slug) {
+        await admin.firestore().collection('paystack-page-mappings').doc(String(slug)).set({
+          userId,
+          pageId: pageId ? String(pageId) : null,
+          createdAt: admin.firestore.FieldValue.serverTimestamp(),
+        }, { merge: true });
+        console.log('Saved page slug mapping for', slug);
+      }
+    } catch (e) {
+      console.error('Failed to persist page slug mapping:', e);
+    }
+
     return res.status(201).json({ ok: true, page: pageData });
   } catch (err) {
     console.error('Error creating Paystack payment page:', err?.response?.data || err.message || err);