Update app.js

app.js

@@ -58,23 +58,19 @@ function verifyPaystackSignature(rawBodyBuffer, signatureHeader) {
 
 function extractSlugFromReferrer(refUrl) {
   if (!refUrl || typeof refUrl !== 'string') return null;
-  // common patterns: https://paystack.shop/pay/<slug>, https://example.com/pay/<slug>?...
   try {
-    // quick regex: look for /pay/<slug> or /p/<slug>
     const m = refUrl.match(/\/(?:pay|p)\/([^\/\?\#]+)/i);
     if (m && m[1]) return m[1];
-    // fallback: last path segment
     const parts = new URL(refUrl).pathname.split('/').filter(Boolean);
     if (parts.length) return parts[parts.length - 1];
   } catch (e) {
-    // invalid URL string; try fallback heuristic
     const fallback = (refUrl.split('/').pop() || '').split('?')[0].split('#')[0];
     return fallback || null;
   }
   return null;
 }
 
-/* expiry helper (same as before) */
+/* expiry helper */
 const EXTRA_FREE_MS = 2 * 60 * 60 * 1000;
 const WEEKLY_PLAN_IDS = new Set([3311892, 3305738, 'PLN_ngz4l76whecrpkv', 'PLN_f7a3oagrpt47d5f']);
 const MONTHLY_PLAN_IDS = new Set([3305739, 'PLN_584ck56g65xhkum']);
@@ -125,7 +121,38 @@ function getExpiryFromPlan(planInput) {
   return { expiresAtMs: expires, expiresAtIso: new Date(expires).toISOString() };
 }
 
-/* -------------------- Mapping resolution helpers -------------------- */
+/* -------------------- Mapping helpers & updates -------------------- */
+
+// update mapping doc(s) by slug/pageId with authoritative identifiers. merge=true
+async function updateMappingWithIdentifiers(dbInstance, { slug, pageId, userId, customerId, payerEmail, subscriptionCode, authorizationCode } = {}) {
+  if (!dbInstance) return;
+  try {
+    const writeObj = {};
+    if (userId !== undefined) writeObj.userId = String(userId);
+    if (customerId !== undefined && customerId !== null) writeObj.customerId = String(customerId);
+    if (payerEmail !== undefined && payerEmail !== null) writeObj.payerEmail = String(payerEmail);
+    if (subscriptionCode !== undefined && subscriptionCode !== null) writeObj.subscriptionCode = String(subscriptionCode);
+    if (authorizationCode !== undefined && authorizationCode !== null) writeObj.authorizationCode = String(authorizationCode);
+    if (Object.keys(writeObj).length === 0) return;
+
+    if (slug) {
+      await dbInstance.collection('paystack-page-mappings').doc(String(slug)).set({
+        ...writeObj,
+        updatedAt: admin.firestore.FieldValue.serverTimestamp(),
+      }, { merge: true });
+      console.log('Updated mapping doc (slug) with identifiers:', slug, writeObj);
+    }
+    if (pageId) {
+      await dbInstance.collection('paystack-page-mappings').doc(String(pageId)).set({
+        ...writeObj,
+        updatedAt: admin.firestore.FieldValue.serverTimestamp(),
+      }, { merge: true });
+      console.log('Updated mapping doc (pageId) with identifiers:', pageId, writeObj);
+    }
+  } catch (e) {
+    console.error('updateMappingWithIdentifiers failed:', e);
+  }
+}
 
 // get userId string from mapping doc (doc id == slug or where pageId==slug)
 async function getUserIdFromSlug(dbInstance, slugOrPageId) {
@@ -137,15 +164,16 @@ async function getUserIdFromSlug(dbInstance, slugOrPageId) {
     if (snap.exists) {
       const d = snap.data();
       if (d?.userId) {
-        console.log('Found mapping doc (by docId) for', slugOrPageId, ':', d);
+        console.log('Found mapping doc (by docId) for', slugOrPageId, ':', { userId: d.userId, customerId: d.customerId, payerEmail: d.payerEmail, subscriptionCode: d.subscriptionCode });
         return d.userId;
       }
+      // If doc exists but doesn't have userId, still return null (we'll use other mapping queries later)
     }
     // fallback query by pageId
     const q = await dbInstance.collection('paystack-page-mappings').where('pageId', '==', String(slugOrPageId)).limit(1).get();
     if (!q.empty) {
       const d = q.docs[0].data();
-      console.log('Found mapping doc (by pageId) for', slugOrPageId, ':', d);
+      console.log('Found mapping doc (by pageId) for', slugOrPageId, ':', { userId: d.userId, customerId: d.customerId, payerEmail: d.payerEmail, subscriptionCode: d.subscriptionCode });
       if (d?.userId) return d.userId;
     }
     return null;
@@ -155,50 +183,88 @@ async function getUserIdFromSlug(dbInstance, slugOrPageId) {
   }
 }
 
-// Attempt resolution: given mapping key (slug), return a users/<docRef> or null
-async function resolveUserDocFromMapping(dbInstance, key) {
-  if (!dbInstance || !key) return null;
+// If direct slug/pageId mapping didn't resolve, search mapping collection by customerId/payerEmail/subscriptionCode
+async function findMappingByIdentifiers(dbInstance, { customerId, payerEmail, subscriptionCode } = {}) {
+  if (!dbInstance) return null;
   try {
-    // map to userId (string) first
-    const mappedUserId = await getUserIdFromSlug(dbInstance, key);
-    if (!mappedUserId) return null;
+    const coll = dbInstance.collection('paystack-page-mappings');
+    if (customerId) {
+      const q = await coll.where('customerId', '==', String(customerId)).limit(1).get();
+      if (!q.empty) return { mappingDoc: q.docs[0].ref, data: q.docs[0].data() };
+    }
+    if (subscriptionCode) {
+      const q2 = await coll.where('subscriptionCode', '==', String(subscriptionCode)).limit(1).get();
+      if (!q2.empty) return { mappingDoc: q2.docs[0].ref, data: q2.docs[0].data() };
+    }
+    if (payerEmail) {
+      const q3 = await coll.where('payerEmail', '==', String(payerEmail)).limit(1).get();
+      if (!q3.empty) return { mappingDoc: q3.docs[0].ref, data: q3.docs[0].data() };
+    }
+    return null;
+  } catch (e) {
+    console.error('findMappingByIdentifiers error:', e);
+    return null;
+  }
+}
 
-    const usersRef = dbInstance.collection('users');
+// Attempt resolution: given mapping key (slug), return a users/<docRef> or null
+async function resolveUserDocFromMapping(dbInstance, { key = null, customerId = null, payerEmail = null, subscriptionCode = null } = {}) {
+  if (!dbInstance) return null;
+  const usersRef = dbInstance.collection('users');
 
-    // try doc id first
-    try {
-      const directRef = usersRef.doc(String(mappedUserId));
-      const ds = await directRef.get();
-      if (ds.exists) {
-        console.log('Resolved user by direct doc id:', directRef.path);
-        return directRef;
+  try {
+    if (key) {
+      // first try direct mapping doc by key (slug or pageId)
+      const mappedUserId = await getUserIdFromSlug(dbInstance, key);
+      if (mappedUserId) {
+        // Try doc lookup
+        try {
+          const directRef = usersRef.doc(String(mappedUserId));
+          const ds = await directRef.get();
+          if (ds.exists) return directRef;
+        } catch (e) {}
+        // fallback queries by common id/email fields
+        if (String(mappedUserId).includes('@')) {
+          try {
+            const q = await usersRef.where('email', '==', String(mappedUserId)).limit(1).get();
+            if (!q.empty) return q.docs[0].ref;
+          } catch (e) {}
+        }
+        const idFields = ['userId','uid','id'];
+        for (const f of idFields) {
+          try {
+            const q = await usersRef.where(f, '==', mappedUserId).limit(1).get();
+            if (!q.empty) return q.docs[0].ref;
+          } catch (e) {}
+        }
       }
-    } catch (e) {
-      // continue to queries
     }
 
-    // if mappedUserId looks like email, try email query
-    const looksLikeEmail = String(mappedUserId).includes('@');
-    if (looksLikeEmail) {
-      try {
-        const q = await usersRef.where('email', '==', String(mappedUserId)).limit(1).get();
-        if (!q.empty) {
-          console.log('Resolved user by email query for', mappedUserId);
-          return q.docs[0].ref;
+    // if not resolved by key, try mapping collection queries (customerId/payerEmail/subscriptionCode)
+    const mappingFound = await findMappingByIdentifiers(dbInstance, { customerId, payerEmail, subscriptionCode });
+    if (mappingFound && mappingFound.data) {
+      const mappedUserId = mappingFound.data.userId;
+      if (mappedUserId) {
+        try {
+          const directRef = usersRef.doc(String(mappedUserId));
+          const ds = await directRef.get();
+          if (ds.exists) return directRef;
+        } catch (e) {}
+        // fallback queries
+        if (String(mappedUserId).includes('@')) {
+          try {
+            const q = await usersRef.where('email', '==', String(mappedUserId)).limit(1).get();
+            if (!q.empty) return q.docs[0].ref;
+          } catch (e) {}
         }
-      } catch (e) { /* ignore */ }
-    }
-
-    // fallback to common id fields
-    const idFields = ['userId','uid','id'];
-    for (const f of idFields) {
-      try {
-        const q = await usersRef.where(f,'==',mappedUserId).limit(1).get();
-        if (!q.empty) {
-          console.log('Resolved user by field', f, 'for', mappedUserId);
-          return q.docs[0].ref;
+        const idFields = ['userId','uid','id'];
+        for (const f of idFields) {
+          try {
+            const q = await usersRef.where(f, '==', mappedUserId).limit(1).get();
+            if (!q.empty) return q.docs[0].ref;
+          } catch (e) {}
         }
-      } catch (e) { /* ignore */ }
+      }
     }
 
     return null;
@@ -249,7 +315,7 @@ async function findUserDocRef(dbInstance, { metadataUserId, email, paystackCusto
   return null;
 }
 
-/* -------------------- Cleanup -------------------- */
+/* -------------------- Cleanup (MAPPING ONLY) -------------------- */
 
 async function cleanUpAfterSuccessfulCharge(dbInstance, userDocRef, { slug, pageId, reference, email } = {}) {
   if (!dbInstance || !userDocRef) return;
@@ -274,34 +340,6 @@ async function cleanUpAfterSuccessfulCharge(dbInstance, userDocRef, { slug, page
     };
     await tryDelete(slug);
     await tryDelete(pageId);
-
-    // optional: clear pending-payments
-    try {
-      const pendingRef = dbInstance.collection('pending-payments');
-      const q = await pendingRef.where('userId','==',userDocRef.id).limit(100).get();
-      if (!q.empty) {
-        const batch = dbInstance.batch();
-        q.docs.forEach(d => batch.delete(d.ref));
-        await batch.commit();
-        console.log('Deleted pending-payments for user:', userDocRef.id);
-      }
-    } catch (e) {
-      console.error('Failed deleting pending-payments (non-fatal):', e);
-    }
-
-    // log cleanup
-    try {
-      await dbInstance.collection('paystack-cleanups').add({
-        userRef: userDocRef.path,
-        slug: slug || null,
-        pageId: pageId || null,
-        reference: reference || null,
-        email: email || null,
-        cleanedAt: admin.firestore.FieldValue.serverTimestamp(),
-      });
-    } catch (e) {
-      console.error('Failed logging cleanup:', e);
-    }
   } catch (e) {
     console.error('Unexpected cleanup error:', e);
   }
@@ -329,7 +367,7 @@ app.post('/webhook/paystack', express.raw({ type: 'application/json', limit: '1m
 
   if (!db) console.error('Firestore admin not initialized — cannot persist webhook data.');
 
-  // audit write
+  // persist webhook audit (only this extra collection is kept)
   try {
     if (db) {
       await db.collection('paystack-webhooks').add({ event, payload, receivedAt: admin.firestore.FieldValue.serverTimestamp() });
@@ -341,36 +379,34 @@ app.post('/webhook/paystack', express.raw({ type: 'application/json', limit: '1m
   if (/subscription\.create/i.test(event) || isRefund || isPayment || /subscription\.update/i.test(event)) {
     console.log('--- PAYSTACK WEBHOOK (INTERESTING EVENT) ---');
     console.log('event:', event);
-    // payload.data is the object of interest
     const data = payload.data || {};
 
-    // Extract slug candidate:
-    // prefer: data.page.id / data.page.slug / data.slug
-    // else: look into data.metadata.referrer URL and extract /pay/<slug>
+    // extract slug
     let maybePageId = data.page?.id || data.page_id || null;
     let maybeSlug = data.page?.slug || data.slug || null;
 
-    // Look for metadata.referrer (primary for your case)
     const referrer = data.metadata?.referrer || (data.metadata && data.metadata.referrer) || null;
     if (!maybeSlug && referrer) {
       const extracted = extractSlugFromReferrer(String(referrer));
       if (extracted) {
         maybeSlug = extracted;
-        console.log('Extracted slug from metadata.referrer:', maybeSlug, ' (referrer=', referrer, ')');
+        console.log('Extracted slug from metadata.referrer:', maybeSlug);
       } else {
         console.log('Could not extract slug from referrer:', referrer);
       }
     }
 
-    // Also log the metadata object for debugging
-    console.log('payload.data.metadata (raw):', data.metadata);
+    // extract authoritative identifiers from payload
+    const paystackCustomerId = data.customer?.id ?? data.customer?.customer_code ?? null;
+    const payerEmail = data.customer?.email ?? null; // save as payerEmail in mapping to decouple from user's app email
+    const subscriptionCode = data.subscription_code || data.subscription?.subscription_code || null;
+    const authorizationCode = data.authorization?.authorization_code || data.authorization_code || null;
 
-    // Try to extract userId from other places (metadata.custom_fields, customer.metadata, email)
+    // quick metadata extraction (keeps prior behavior)
     let metadataUserId = null;
     let customerEmail = null;
     let extractorSource = null;
     try {
-      // quick extraction: metadata.userId etc
       const metadata = data.metadata || {};
       if (metadata.userId || metadata.user_id) {
         metadataUserId = metadata.userId || metadata.user_id;
@@ -396,33 +432,57 @@ app.post('/webhook/paystack', express.raw({ type: 'application/json', limit: '1m
     }
 
     if (!customerEmail && data.customer?.email) customerEmail = data.customer.email;
-    const paystackCustomerId = data.customer?.id ?? data.customer?.customer_code ?? null;
 
-    // Resolve user: mapping-first using maybeSlug (important)
+    // Resolve user: mapping-first (key), then mapping-by-identifiers, then fallback findUserDocRef
     let userDocRef = null;
     try {
-      const mappingKey = maybeSlug || maybePageId || metadataUserId || null;
+      // try mapping with slug/pageId first (fast)
+      const mappingKey = maybeSlug || maybePageId || null;
       if (mappingKey && db) {
-        userDocRef = await resolveUserDocFromMapping(db, mappingKey);
-        if (userDocRef) console.log('resolveUserDocFromMapping found user:', userDocRef.path, 'using key:', mappingKey);
-        else console.log('resolveUserDocFromMapping found nothing for key:', mappingKey);
+        userDocRef = await resolveUserDocFromMapping(db, { key: mappingKey, customerId: paystackCustomerId, payerEmail, subscriptionCode });
+        if (userDocRef) console.log('Resolved user from mapping (key):', userDocRef.path, 'key=', mappingKey);
+        else console.log('No mapping resolved from key:', mappingKey);
+      }
+
+      // if not found via key, try mapping by identifiers (customerId / payerEmail / subscriptionCode)
+      if (!userDocRef && db && (paystackCustomerId || payerEmail || subscriptionCode)) {
+        userDocRef = await resolveUserDocFromMapping(db, { key: null, customerId: paystackCustomerId, payerEmail, subscriptionCode });
+        if (userDocRef) console.log('Resolved user from mapping by identifiers ->', userDocRef.path);
       }
+
+      // fallback: resolve user document using direct user fields
       if (!userDocRef) {
         userDocRef = await findUserDocRef(db, { metadataUserId, email: customerEmail, paystackCustomerId });
-        if (userDocRef) console.log('findUserDocRef found user:', userDocRef.path);
+        if (userDocRef) console.log('Resolved user via fallback queries:', userDocRef.path);
       }
     } catch (e) {
       console.error('Error resolving userDocRef (mapping-first):', e);
       userDocRef = null;
     }
 
+    // If we have mapping slug present and payload contains authoritative identifiers, update mapping immediately
+    try {
+      await updateMappingWithIdentifiers(db, {
+        slug: maybeSlug,
+        pageId: maybePageId,
+        userId: metadataUserId || (userDocRef ? userDocRef.id : undefined),
+        customerId: paystackCustomerId || undefined,
+        payerEmail: payerEmail || undefined,
+        subscriptionCode: subscriptionCode || undefined,
+        authorizationCode: authorizationCode || undefined,
+      });
+    } catch (e) {
+      console.error('Failed updateMappingWithIdentifiers:', e);
+    }
+
+    // ---------------------------
     // subscription.create handler
+    // ---------------------------
     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 subscriptionCode = subscriptionCode || (data.id ? String(data.id) : null);
       const status = data.status || 'active';
       const planObj = data.plan || data.subscription?.plan || null;
       const expiry = getExpiryFromPlan(planObj);
-      const paystackCustomerIdLocal = data.customer?.id ?? data.customer?.customer_code ?? null;
 
       if (userDocRef && subscriptionCode) {
         try {
@@ -438,23 +498,25 @@ app.post('/webhook/paystack', express.raw({ type: 'application/json', limit: '1m
             },
             updatedAt: admin.firestore.FieldValue.serverTimestamp(),
           };
-          if (paystackCustomerIdLocal) updateObj.paystack_customer_id = String(paystackCustomerIdLocal);
+          if (paystackCustomerId) updateObj.paystack_customer_id = String(paystackCustomerId);
           await userDocRef.update(updateObj);
           console.log('subscription.create: updated user with subscription:', subscriptionCode);
         } catch (e) {
           console.error('subscription.create: failed to update user:', e);
         }
       } else {
-        console.warn('subscription.create received but user not found or subscriptionCode missing — skipping user update.');
+        console.warn('subscription.create: user not found or subscriptionCode missing — skipping user update.');
       }
     }
 
-    // charge.success handler - entitlement add
+    // ---------------------------
+    // charge.success handler - entitlement add + mapping updates
+    // ---------------------------
     if (isPayment) {
-      console.log('charge.success identifiers:', { metadataUserId, customerEmail, maybeSlug, maybePageId, paystackCustomerId, extractorSource });
+      console.log('charge.success identifiers:', { metadataUserId, customerEmail, maybeSlug, maybePageId, paystackCustomerId, subscriptionCode, extractorSource });
 
       const recurringMarker = Boolean((data.metadata && (data.metadata.custom_filters?.recurring || data.metadata.recurring)) || false);
-      const hasSubscription = !!(data.subscription || data.subscriptions || data.plan);
+      const hasSubscription = !!(data.subscription || data.subscriptions || data.plan || subscriptionCode);
       const isLikelySubscriptionPayment = recurringMarker || hasSubscription;
 
       const planObj = data.plan || (data.subscription ? data.subscription.plan : null) || null;
@@ -472,25 +534,24 @@ app.post('/webhook/paystack', express.raw({ type: 'application/json', limit: '1m
         createdAt: admin.firestore.Timestamp.now(),
       };
 
-      // debug record
+      // Ensure mapping gets authoritative identifiers on first charge (if not already present)
       try {
-        if (db) {
-          await db.collection('paystack-debug').add({
-            kind: 'charge-success',
-            mappingKey: maybeSlug || maybePageId || null,
-            identifiers: { metadataUserId, customerEmail, maybeSlug, maybePageId, paystackCustomerId, extractorSource },
-            entitlement,
-            raw: data,
-            createdAt: admin.firestore.FieldValue.serverTimestamp(),
-          });
-        }
+        await updateMappingWithIdentifiers(db, {
+          slug: maybeSlug,
+          pageId: maybePageId,
+          userId: metadataUserId || (userDocRef ? userDocRef.id : undefined),
+          customerId: paystackCustomerId || undefined,
+          payerEmail: payerEmail || undefined,
+          subscriptionCode: subscriptionCode || undefined,
+          authorizationCode: authorizationCode || undefined,
+        });
       } catch (e) {
-        console.error('Failed writing paystack-debug:', e);
+        console.error('Failed updateMappingWithIdentifiers during charge.success:', e);
       }
 
       if (userDocRef && isLikelySubscriptionPayment) {
+        // add entitlement & save customer id on user
         try {
-          console.log('Adding entitlement to', userDocRef.path);
           await userDocRef.update({
             entitlements: admin.firestore.FieldValue.arrayUnion(entitlement),
             lastPaymentAt: admin.firestore.FieldValue.serverTimestamp(),
@@ -500,7 +561,6 @@ app.post('/webhook/paystack', express.raw({ type: 'application/json', limit: '1m
           console.log('Entitlement added (arrayUnion) to', userDocRef.path);
         } catch (err) {
           console.error('arrayUnion failed, falling back:', err);
-          // fallback: read-modify-write
           try {
             const snap = await userDocRef.get();
             const userData = snap.exists ? snap.data() : {};
@@ -520,26 +580,12 @@ app.post('/webhook/paystack', express.raw({ type: 'application/json', limit: '1m
             }
           } catch (err2) {
             console.error('Fallback persistence failed:', err2);
-            try {
-              if (db) {
-                await db.collection('paystack-debug-failures').add({
-                  kind: 'entitlement-persist-failure',
-                  userRef: userDocRef.path,
-                  error: String(err2 && err2.message ? err2.message : err2),
-                  entitlement,
-                  raw: data,
-                  createdAt: admin.firestore.FieldValue.serverTimestamp(),
-                });
-              }
-            } catch (e) {
-              console.error('Failed writing failure debug doc:', e);
-            }
           }
         }
 
-        // cleanup (best effort)
+        // cleanup mapping docs (if owner matches)
         try {
-          await cleanUpAfterSuccessfulCharge(db, userDocRef, { slug: maybeSlug, pageId: maybePageId, reference: entitlement.reference || entitlement.id, email: customerEmail });
+          await cleanUpAfterSuccessfulCharge(db, userDocRef, { slug: maybeSlug, pageId: maybePageId, reference: entitlement.reference || entitlement.id, email: payerEmail });
         } catch (e) {
           console.error('Cleanup failed:', e);
         }
@@ -547,17 +593,6 @@ app.post('/webhook/paystack', express.raw({ type: 'application/json', limit: '1m
         console.log('charge.success received but not flagged subscription/recurring - skipping entitlement add.');
       } else {
         console.warn('charge.success: user not found, skipping entitlement update.');
-        try {
-          if (db) {
-            await db.collection('paystack-unmatched').add({
-              kind: 'charge.success.unmatched',
-              mappingKey: maybeSlug || maybePageId || null,
-              identifiers: { metadataUserId, customerEmail, maybeSlug, maybePageId, paystackCustomerId, extractorSource },
-              raw: data,
-              createdAt: admin.firestore.FieldValue.serverTimestamp(),
-            });
-          }
-        } catch (e) { console.error('Failed creating unmatched debug doc:', e); }
       }
     }