Update app.js

app.js

@@ -121,63 +121,47 @@ function getExpiryFromPlan(planInput) {
   return { expiresAtMs: expires, expiresAtIso: new Date(expires).toISOString() };
 }
 
-/* -------------------- Mapping helpers & updates -------------------- */
+/* -------------------- Mapping helpers & updates (SLUG-ONLY) -------------------- */
 
-async function updateMappingWithIdentifiers(dbInstance, { slug, pageId, userId, customerId, payerEmail, subscriptionCode, authorizationCode } = {}) {
-  if (!dbInstance) return;
+// update mapping doc by slug only (merge)
+async function updateMappingWithIdentifiers(dbInstance, { slug, userId, userIdType, customerId, payerEmail, subscriptionCode, authorizationCode } = {}) {
+  if (!dbInstance || !slug) return;
   try {
     const writeObj = {};
     if (userId !== undefined) writeObj.userId = String(userId);
+    if (userIdType !== undefined) writeObj.userIdType = String(userIdType);
     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);
-    }
+    await dbInstance.collection('paystack-page-mappings').doc(String(slug)).set({
+      slug: String(slug),
+      ...writeObj,
+      updatedAt: admin.firestore.FieldValue.serverTimestamp(),
+    }, { merge: true });
+    console.log('Updated mapping doc (slug) with identifiers:', slug, writeObj);
   } catch (e) {
     console.error('updateMappingWithIdentifiers failed:', e);
   }
 }
 
-async function getUserIdFromSlug(dbInstance, slugOrPageId) {
-  if (!dbInstance || !slugOrPageId) return null;
+// get mapping doc data by slug (doc id)
+async function getMappingBySlug(dbInstance, slug) {
+  if (!dbInstance || !slug) return null;
   try {
-    const docRef = dbInstance.collection('paystack-page-mappings').doc(String(slugOrPageId));
-    const snap = await docRef.get();
-    if (snap.exists) {
-      const d = snap.data();
-      if (d?.userId) {
-        console.log('Found mapping doc (by docId) for', slugOrPageId, ':', { userId: d.userId, customerId: d.customerId, payerEmail: d.payerEmail, subscriptionCode: d.subscriptionCode });
-        return d.userId;
-      }
-    }
-    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, ':', { userId: d.userId, customerId: d.customerId, payerEmail: d.payerEmail, subscriptionCode: d.subscriptionCode });
-      if (d?.userId) return d.userId;
-    }
-    return null;
+    const ref = dbInstance.collection('paystack-page-mappings').doc(String(slug));
+    const snap = await ref.get();
+    if (!snap.exists) return null;
+    return { ref, data: snap.data() };
   } catch (e) {
-    console.error('getUserIdFromSlug error:', e);
+    console.error('getMappingBySlug error:', e);
     return null;
   }
 }
 
+// find mapping by other authoritative identifiers (customerId / payerEmail / subscriptionCode)
 async function findMappingByIdentifiers(dbInstance, { customerId, payerEmail, subscriptionCode } = {}) {
   if (!dbInstance) return null;
   try {
@@ -201,65 +185,74 @@ async function findMappingByIdentifiers(dbInstance, { customerId, payerEmail, su
   }
 }
 
-async function resolveUserDocFromMapping(dbInstance, { key = null, customerId = null, payerEmail = null, subscriptionCode = null } = {}) {
+// Resolve user doc from mapping: prefer slug doc, else mapping-by-identifiers
+async function resolveUserDocFromMapping(dbInstance, { slug = null, customerId = null, payerEmail = null, subscriptionCode = null } = {}) {
   if (!dbInstance) return null;
   const usersRef = dbInstance.collection('users');
 
-  try {
-    if (key) {
-      const mappedUserId = await getUserIdFromSlug(dbInstance, key);
-      if (mappedUserId) {
+  // 1) try slug doc => read mapping.userId and resolve to users doc
+  if (slug) {
+    try {
+      const mapping = await getMappingBySlug(dbInstance, slug);
+      if (mapping && mapping.data && mapping.data.userId) {
+        const mappedUserId = mapping.data.userId;
+        // try doc id first
         try {
           const directRef = usersRef.doc(String(mappedUserId));
           const ds = await directRef.get();
           if (ds.exists) return directRef;
         } catch (e) {}
+        // fallback: if mappedUserId looks like email
         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) {}
         }
+        // fallback to other id fields
         const idFields = ['userId','uid','id'];
         for (const f of idFields) {
           try {
-            const q = await usersRef.where(f, '==', mappedUserId).limit(1).get();
+            const q = await usersRef.where(f,'==',mappedUserId).limit(1).get();
             if (!q.empty) return q.docs[0].ref;
           } catch (e) {}
         }
       }
+    } catch (e) {
+      console.error('resolveUserDocFromMapping slug branch error:', e);
     }
+  }
 
-    const mappingFound = await findMappingByIdentifiers(dbInstance, { customerId, payerEmail, subscriptionCode });
-    if (mappingFound && mappingFound.data) {
-      const mappedUserId = mappingFound.data.userId;
-      if (mappedUserId) {
+  // 2) try mapping by identifiers
+  try {
+    const found = await findMappingByIdentifiers(dbInstance, { customerId, payerEmail, subscriptionCode });
+    if (found && found.data && found.data.userId) {
+      const mappedUserId = found.data.userId;
+      // same resolution logic
+      try {
+        const directRef = usersRef.doc(String(mappedUserId));
+        const ds = await directRef.get();
+        if (ds.exists) return directRef;
+      } catch (e) {}
+      if (String(mappedUserId).includes('@')) {
         try {
-          const directRef = usersRef.doc(String(mappedUserId));
-          const ds = await directRef.get();
-          if (ds.exists) return directRef;
+          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) {}
-        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) {}
-        }
       }
     }
-
-    return null;
   } catch (e) {
-    console.error('resolveUserDocFromMapping error:', e);
-    return null;
+    console.error('resolveUserDocFromMapping identifiers branch error:', e);
   }
+
+  return null;
 }
 
 /* -------------------- Fallback user resolution -------------------- */
@@ -303,62 +296,81 @@ async function findUserDocRef(dbInstance, { metadataUserId, email, paystackCusto
   return null;
 }
 
-/* -------------------- Prune helper (entitlements + old webhook audits) -------------------- */
+/* -------------------- Cleanup (SLUG-only + smarter owner check) -------------------- */
+
+async function cleanUpAfterSuccessfulCharge(dbInstance, userDocRef, { slug, reference, email } = {}) {
+  if (!dbInstance || !userDocRef) return;
+  try {
+    // load mapping only by slug (we no longer create pageId docs)
+    if (!slug) return;
+    const mapRef = dbInstance.collection('paystack-page-mappings').doc(String(slug));
+    const mapSnap = await mapRef.get();
+    if (!mapSnap.exists) return;
+    const map = mapSnap.data();
+
+    // determine mapping owner type and user identity
+    const ownerVal = String(map.userId || '');
+    const ownerType = map.userIdType || (ownerVal.includes('@') ? 'email' : 'uid');
+
+    // get user doc data to check email or id
+    const userSnap = await userDocRef.get();
+    if (!userSnap.exists) return;
+    const userData = userSnap.data() || {};
+    const userEmail = userData.email || null;
+    const userId = userDocRef.id;
+
+    let shouldDelete = false;
+    if (ownerType === 'uid' && ownerVal === userId) shouldDelete = true;
+    if (ownerType === 'email' && userEmail && ownerVal === userEmail) shouldDelete = true;
+
+    if (shouldDelete) {
+      await mapRef.delete();
+      console.log('Deleted mapping doc (slug) after successful charge:', slug);
+    } else {
+      console.log('Mapping owner mismatch — not deleting slug:', slug, 'mappingOwner=', ownerVal, 'ownerType=', ownerType, 'userId=', userId, 'userEmail=', userEmail);
+    }
+  } catch (e) {
+    console.error('Error in cleanUpAfterSuccessfulCharge:', e);
+  }
+}
+
+/* -------------------- Prune helper (optional, unchanged) -------------------- */
 
 async function pruneUserEntitlementsAndWebhooks(dbInstance, userDocRef, { paystackCustomerId = null, payerEmail = null } = {}) {
   if (!dbInstance || !userDocRef) return;
   try {
-    // cutoff ~60 days (2 months approximated as 60 days)
     const cutoffMs = Date.now() - (60 * 24 * 60 * 60 * 1000);
-
-    // 1) prune entitlements on the user doc
     const snap = await userDocRef.get();
     if (!snap.exists) return;
     const userData = snap.data() || {};
     const entitlements = Array.isArray(userData.entitlements) ? userData.entitlements : [];
-
     const cleaned = entitlements.filter(e => {
-      // if expiresAtMs present -> keep only if still in future
       if (e && (e.expiresAtMs || e.expiresAtMs === 0)) {
         const exMs = Number(e.expiresAtMs) || 0;
-        return exMs > Date.now(); // keep if expiry in future
+        return exMs > Date.now();
       }
-      // else if createdAt present -> keep only if createdAt within cutoff window
       if (e && e.createdAt) {
-        // createdAt could be a Firestore Timestamp or a number/string
         let createdMs = 0;
         try {
           if (typeof e.createdAt === 'number') createdMs = e.createdAt;
           else if (e.createdAt && typeof e.createdAt.toMillis === 'function') createdMs = e.createdAt.toMillis();
           else if (typeof e.createdAt === 'string') createdMs = Number(e.createdAt) || 0;
           else if (e.createdAt._seconds) createdMs = (Number(e.createdAt._seconds) * 1000) + (Number(e.createdAt._nanoseconds || 0) / 1e6);
-        } catch (ee) {
-          createdMs = 0;
-        }
+        } catch (ee) { createdMs = 0; }
         if (createdMs) return createdMs >= cutoffMs;
-        // if no timestamps at all, conservatively keep
         return true;
       }
-      // if no expiry and no createdAt -> keep (can't judge)
       return true;
     });
-
     if (cleaned.length !== entitlements.length) {
-      await userDocRef.update({
-        entitlements: cleaned,
-        updatedAt: admin.firestore.FieldValue.serverTimestamp(),
-      });
+      await userDocRef.update({ entitlements: cleaned, updatedAt: admin.firestore.FieldValue.serverTimestamp() });
       console.log('Pruned entitlements: removed', entitlements.length - cleaned.length, 'entries for', userDocRef.path);
-    } else {
-      console.log('No entitlements to prune for', userDocRef.path);
     }
 
-    // 2) prune paystack-webhooks audit docs for this user older than cutoff
+    // prune paystack-webhooks older than cutoff for this user (best-effort)
     try {
       const coll = dbInstance.collection('paystack-webhooks');
       const toDeleteRefs = [];
-
-      // Query by customer id
       if (paystackCustomerId) {
         try {
           const q = await coll.where('payload.data.customer.id', '==', paystackCustomerId).get();
@@ -369,13 +381,8 @@ async function pruneUserEntitlementsAndWebhooks(dbInstance, userDocRef, { paysta
             if (ts && typeof ts.toMillis === 'function') tsMs = ts.toMillis();
             if (tsMs && tsMs < cutoffMs) toDeleteRefs.push(d.ref);
           });
-        } catch (e) {
-          // May require index; ignore failure to avoid breaking webhook
-          console.warn('Could not query paystack-webhooks by customer.id (skipping):', e);
-        }
+        } catch (e) { console.warn('Could not query paystack-webhooks by customer.id (skipping):', e); }
       }
-
-      // Query by payer email
       if (payerEmail) {
         try {
           const q2 = await coll.where('payload.data.customer.email', '==', payerEmail).get();
@@ -388,22 +395,15 @@ async function pruneUserEntitlementsAndWebhooks(dbInstance, userDocRef, { paysta
               if (!toDeleteRefs.find(x => x.path === d.ref.path)) toDeleteRefs.push(d.ref);
             }
           });
-        } catch (e) {
-          console.warn('Could not query paystack-webhooks by customer.email (skipping):', e);
-        }
+        } catch (e) { console.warn('Could not query paystack-webhooks by customer.email (skipping):', e); }
       }
-
       if (toDeleteRefs.length) {
         const batch = dbInstance.batch();
         toDeleteRefs.forEach(r => batch.delete(r));
         await batch.commit();
         console.log('Deleted', toDeleteRefs.length, 'old paystack-webhooks audit docs for user', userDocRef.id);
-      } else {
-        console.log('No old paystack-webhooks audit docs to prune for user', userDocRef.id);
       }
-    } catch (e) {
-      console.error('Failed pruning paystack-webhooks (non-fatal):', e);
-    }
+    } catch (e) { console.error('Failed pruning paystack-webhooks (non-fatal):', e); }
   } catch (e) {
     console.error('pruneUserEntitlementsAndWebhooks failed:', e);
   }
@@ -446,17 +446,17 @@ app.post('/webhook/paystack', express.raw({ type: 'application/json', limit: '1m
     const data = payload.data || {};
 
     // extract slug
-    let maybePageId = data.page?.id || data.page_id || null;
     let maybeSlug = data.page?.slug || data.slug || null;
-
-    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);
-      } else {
-        console.log('Could not extract slug from referrer:', referrer);
+    if (!maybeSlug) {
+      const referrer = data.metadata?.referrer || (data.metadata && data.metadata.referrer) || null;
+      if (referrer) {
+        const extracted = extractSlugFromReferrer(String(referrer));
+        if (extracted) {
+          maybeSlug = extracted;
+          console.log('Extracted slug from metadata.referrer:', maybeSlug);
+        } else {
+          console.log('Could not extract slug from referrer:', referrer);
+        }
       }
     }
 
@@ -468,24 +468,17 @@ app.post('/webhook/paystack', express.raw({ type: 'application/json', limit: '1m
 
     // quick metadata extraction
     let metadataUserId = null;
-    let extractorSource = null;
     try {
       const metadata = data.metadata || {};
-      if (metadata.userId || metadata.user_id) {
-        metadataUserId = metadata.userId || metadata.user_id;
-        extractorSource = 'metadata';
-      } else if (data.customer?.metadata) {
+      if (metadata.userId || metadata.user_id) metadataUserId = metadata.userId || metadata.user_id;
+      else if (data.customer?.metadata) {
         const cm = data.customer.metadata;
-        if (cm.userId || cm.user_id) {
-          metadataUserId = cm.userId || cm.user_id;
-          extractorSource = 'customer.metadata';
-        }
+        if (cm.userId || cm.user_id) metadataUserId = cm.userId || cm.user_id;
       } else if (Array.isArray(data.custom_fields)) {
         for (const f of data.custom_fields) {
           const n = (f.variable_name || f.display_name || '').toString().toLowerCase();
           if ((n.includes('user') || n.includes('user_id') || n.includes('userid')) && f.value) {
             metadataUserId = f.value;
-            extractorSource = 'custom_fields';
             break;
           }
         }
@@ -494,18 +487,17 @@ app.post('/webhook/paystack', express.raw({ type: 'application/json', limit: '1m
       console.error('Error during quick metadata extraction:', e);
     }
 
-    // Resolve user: mapping-first (slug/pageId), then mapping by identifiers, then fallback queries
+    // Resolve user: mapping-first (slug), then mapping-by-identifiers, then fallback queries
     let userDocRef = null;
     try {
-      const mappingKey = maybeSlug || maybePageId || null;
-      if (mappingKey && db) {
-        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 (maybeSlug && db) {
+        userDocRef = await resolveUserDocFromMapping(db, { slug: maybeSlug, customerId: paystackCustomerId, payerEmail, subscriptionCode });
+        if (userDocRef) console.log('Resolved user from mapping (slug):', userDocRef.path, 'slug=', maybeSlug);
+        else console.log('No mapping resolved from slug:', maybeSlug);
       }
 
       if (!userDocRef && db && (paystackCustomerId || payerEmail || subscriptionCode)) {
-        userDocRef = await resolveUserDocFromMapping(db, { key: null, customerId: paystackCustomerId, payerEmail, subscriptionCode });
+        userDocRef = await resolveUserDocFromMapping(db, { slug: null, customerId: paystackCustomerId, payerEmail, subscriptionCode });
         if (userDocRef) console.log('Resolved user from mapping by identifiers ->', userDocRef.path);
       }
 
@@ -518,22 +510,26 @@ app.post('/webhook/paystack', express.raw({ type: 'application/json', limit: '1m
       userDocRef = null;
     }
 
-    // update mapping with authoritative identifiers if available
+    // update mapping with authoritative identifiers ONLY if we have a slug (we avoid creating mapping by pageId)
     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,
-      });
+      if (maybeSlug) {
+        const userIdToSave = metadataUserId || (userDocRef ? userDocRef.id : undefined);
+        const userIdType = userIdToSave && String(userIdToSave).includes('@') ? 'email' : 'uid';
+        await updateMappingWithIdentifiers(db, {
+          slug: maybeSlug,
+          userId: userIdToSave,
+          userIdType,
+          customerId: paystackCustomerId || undefined,
+          payerEmail: payerEmail || undefined,
+          subscriptionCode: subscriptionCode || undefined,
+          authorizationCode: authorizationCode || undefined,
+        });
+      }
     } catch (e) {
       console.error('Failed updateMappingWithIdentifiers:', e);
     }
 
-    // subscription.create handler
+    // subscription.create
     if (/subscription\.create/i.test(event) || event === 'subscription.create') {
       const subscriptionCodeLocal = subscriptionCode || (data.id ? String(data.id) : null);
       const status = data.status || 'active';
@@ -557,7 +553,6 @@ app.post('/webhook/paystack', express.raw({ type: 'application/json', limit: '1m
           if (paystackCustomerId) updateObj.paystack_customer_id = String(paystackCustomerId);
           await userDocRef.update(updateObj);
           console.log('subscription.create: updated user with subscription:', subscriptionCodeLocal);
-          // prune after successful subscription update
           await pruneUserEntitlementsAndWebhooks(db, userDocRef, { paystackCustomerId, payerEmail });
         } catch (e) {
           console.error('subscription.create: failed to update user:', e);
@@ -567,9 +562,9 @@ app.post('/webhook/paystack', express.raw({ type: 'application/json', limit: '1m
       }
     }
 
-    // charge.success handler - entitlement add + mapping updates
+    // charge.success
     if (isPayment) {
-      console.log('charge.success identifiers:', { metadataUserId, payerEmail, maybeSlug, maybePageId, paystackCustomerId, subscriptionCode, extractorSource });
+      console.log('charge.success identifiers:', { metadataUserId, payerEmail, maybeSlug, paystackCustomerId, subscriptionCode });
 
       const recurringMarker = Boolean((data.metadata && (data.metadata.custom_filters?.recurring || data.metadata.recurring)) || false);
       const hasSubscription = !!(data.subscription || data.subscriptions || data.plan || subscriptionCode);
@@ -590,17 +585,21 @@ app.post('/webhook/paystack', express.raw({ type: 'application/json', limit: '1m
         createdAt: admin.firestore.Timestamp.now(),
       };
 
-      // Ensure mapping gets authoritative identifiers on first charge
+      // Ensure mapping gets authoritative identifiers on first charge (only if slug present)
       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,
-        });
+        if (maybeSlug) {
+          const userIdToSave = metadataUserId || (userDocRef ? userDocRef.id : undefined);
+          const userIdType = userIdToSave && String(userIdToSave).includes('@') ? 'email' : 'uid';
+          await updateMappingWithIdentifiers(db, {
+            slug: maybeSlug,
+            userId: userIdToSave,
+            userIdType,
+            customerId: paystackCustomerId || undefined,
+            payerEmail: payerEmail || undefined,
+            subscriptionCode: subscriptionCode || undefined,
+            authorizationCode: authorizationCode || undefined,
+          });
+        }
       } catch (e) {
         console.error('Failed updateMappingWithIdentifiers during charge.success:', e);
       }
@@ -638,14 +637,14 @@ app.post('/webhook/paystack', express.raw({ type: 'application/json', limit: '1m
           }
         }
 
-        // cleanup mapping docs (if owner matches)
+        // cleanup mapping doc if slug exists (only slug doc)
         try {
-          await cleanUpAfterSuccessfulCharge(db, userDocRef, { slug: maybeSlug, pageId: maybePageId, reference: entitlement.reference || entitlement.id, email: payerEmail });
+          await cleanUpAfterSuccessfulCharge(db, userDocRef, { slug: maybeSlug, reference: entitlement.reference || entitlement.id, email: payerEmail });
         } catch (e) {
           console.error('Cleanup failed:', e);
         }
 
-        // prune entitlements and old webhook audits for this user (runs after successful processing)
+        // prune entitlements & old webhooks
         try {
           await pruneUserEntitlementsAndWebhooks(db, userDocRef, { paystackCustomerId, payerEmail });
         } catch (e) {
@@ -674,7 +673,6 @@ app.post('/webhook/paystack', express.raw({ type: 'application/json', limit: '1m
             });
             await userDocRef.update({ entitlements: filtered, updatedAt: admin.firestore.FieldValue.serverTimestamp() });
             console.log('Removed entitlements matching refund:', refundedReference);
-            // also prune (to remove other expired ones if present)
             await pruneUserEntitlementsAndWebhooks(db, userDocRef, { paystackCustomerId, payerEmail });
           } else {
             console.warn('Refund handling: user doc vanished.');
@@ -693,7 +691,7 @@ app.post('/webhook/paystack', express.raw({ type: 'application/json', limit: '1m
   return res.status(200).json({ ok: true });
 });
 
-/* -------------------- Create payment link endpoint -------------------- */
+/* -------------------- Create payment link endpoint (SLUG only) -------------------- */
 
 app.post('/create-payment-link', express.json(), async (req, res) => {
   const { planId, userId, name, amount, redirect_url, collect_phone = false, fixed_amount = false } = req.body || {};
@@ -713,36 +711,25 @@ app.post('/create-payment-link', express.json(), async (req, res) => {
 
     const pageData = response.data && response.data.data ? response.data.data : response.data;
 
-    // persist mapping docs: docId = slug and docId = pageId if available
+    // persist mapping doc keyed by slug only (no pageId doc creation)
     try {
       if (db) {
         const slug = pageData.slug || pageData.data?.slug || null;
-        const pageId = pageData.id || pageData.data?.id || null;
-
         if (slug) {
           await db.collection('paystack-page-mappings').doc(String(slug)).set({
             userId: String(userId),
             userIdType: String(userId).includes('@') ? 'email' : 'uid',
-            pageId: pageId ? String(pageId) : null,
+            pageId: pageData.id ? String(pageData.id) : null, // store pageId inside slug doc only
             slug: String(slug),
             createdAt: admin.firestore.FieldValue.serverTimestamp(),
           }, { merge: true });
           console.log('Saved page slug mapping for', slug);
-        }
-
-        if (pageId) {
-          await db.collection('paystack-page-mappings').doc(String(pageId)).set({
-            userId: String(userId),
-            userIdType: String(userId).includes('@') ? 'email' : 'uid',
-            pageId: String(pageId),
-            slug: slug || null,
-            createdAt: admin.firestore.FieldValue.serverTimestamp(),
-          }, { merge: true });
-          console.log('Saved pageId mapping for', pageId);
+        } else {
+          console.warn('create-payment-link: Paystack response did not return a slug; no mapping saved.');
         }
       }
     } catch (e) {
-      console.error('Failed to persist mapping docs:', e);
+      console.error('Failed to persist mapping doc (slug only):', e);
     }
 
     return res.status(201).json({ ok: true, page: pageData });