bulltrackers-module 1.0.558 → 1.0.560

package/functions/generic-api/user-api/helpers/dev/dev_helpers.js

@@ -290,6 +290,9 @@ async function getDevOverrideStatus(req, res, dependencies, config) {
  * Get the effective CID to use for a developer account
  * Returns impersonateCid if set, otherwise returns the actual userCid
  * Only works for developer accounts
+ * 
+ * Note: If pretendToBePI is false, impersonation will not be used for PI-related checks
+ * to prevent unintended impersonation when the user doesn't want to pretend to be a PI
  */
 async function getEffectiveCid(db, userCid, config, logger = null) {
     if (!isDeveloperAccount(userCid)) {
@@ -297,8 +300,20 @@ async function getEffectiveCid(db, userCid, config, logger = null) {
     }
     
     const devOverride = await getDevOverride(db, userCid, config, logger);
-    // Only use impersonation if dev override is enabled
+    // Only use impersonation if dev override is enabled AND impersonateCid is set
+    // BUT: If pretendToBePI is explicitly false, don't use impersonation (user doesn't want to be treated as PI)
     if (devOverride && devOverride.enabled && devOverride.impersonateCid) {
+        // Check if user explicitly doesn't want to pretend to be a PI
+        // If pretendToBePI is false, don't use impersonation (respects user intent)
+        if (devOverride.pretendToBePI === false) {
+            if (logger && logger.log) {
+                logger.log('INFO', `[getEffectiveCid] DEV OVERRIDE: User ${userCid} has impersonateCid set but pretendToBePI=false, using actual CID ${userCid} instead`);
+            } else {
+                console.log(`[getEffectiveCid] DEV OVERRIDE: User ${userCid} has impersonateCid set but pretendToBePI=false, using actual CID ${userCid} instead`);
+            }
+            return Number(userCid);
+        }
+        
         if (logger && logger.log) {
             logger.log('INFO', `[getEffectiveCid] DEV OVERRIDE: User ${userCid} impersonating CID ${devOverride.impersonateCid}`);
         } else {

package/functions/generic-api/user-api/helpers/metrics/personalized_metrics_helpers.js

@@ -96,9 +96,62 @@ async function getSignedInUserPIPersonalizedMetrics(req, res, dependencies, conf
     }
     
     try {
-        const effectiveCid = await getEffectiveCid(db, userCid, config, logger);
         const devOverride = await getDevOverride(db, userCid, config, logger);
-        const isImpersonating = devOverride && devOverride.enabled && devOverride.impersonateCid && effectiveCid !== Number(userCid);
+        
+        // Also read raw Firestore data to check pretendToBePI value directly (in case of normalization issues)
+        let rawPretendToBePI = null;
+        if (devOverride && devOverride.enabled) {
+            try {
+                const devOverridesCollection = config.devOverridesCollection || 'dev_overrides';
+                const overrideDoc = await db.collection(devOverridesCollection).doc(String(userCid)).get();
+                if (overrideDoc.exists) {
+                    const rawData = overrideDoc.data();
+                    rawPretendToBePI = rawData.pretendToBePI; // Get raw value (could be false, true, undefined, etc.)
+                }
+            } catch (err) {
+                logger.log('WARN', `[getSignedInUserPIPersonalizedMetrics] Error reading raw dev override: ${err.message}`);
+            }
+        }
+        
+        // For PI-related checks, respect pretendToBePI flag
+        // If pretendToBePI is false (either normalized or raw), use actual userCid even if impersonateCid is set
+        let effectiveCid;
+        let shouldCheckPI = true;
+        
+        // Check if user explicitly doesn't want to pretend to be a PI
+        // Check both normalized value and raw value to be safe
+        const pretendToBePIValue = rawPretendToBePI !== undefined ? rawPretendToBePI : (devOverride ? devOverride.pretendToBePI : false);
+        const explicitlyNotPretending = pretendToBePIValue === false;
+        
+        if (devOverride && devOverride.enabled && explicitlyNotPretending) {
+            // User explicitly doesn't want to pretend to be a PI
+            // Use actual CID and don't check PI status (user doesn't want to be treated as PI)
+            effectiveCid = Number(userCid);
+            shouldCheckPI = false; // Skip PI check since user doesn't want to pretend to be PI
+            
+            logger.log('INFO', `[getSignedInUserPIPersonalizedMetrics] DEV OVERRIDE: User ${userCid} has pretendToBePI=false (raw: ${rawPretendToBePI}, normalized: ${devOverride.pretendToBePI}), skipping PI check and returning 404`);
+        } else {
+            // Use normal effective CID logic (may use impersonateCid if set)
+            effectiveCid = await getEffectiveCid(db, userCid, config, logger);
+        }
+        
+        // Calculate isImpersonating based on whether we're actually using impersonation
+        // If pretendToBePI is false, we're not impersonating for PI purposes
+        // Only consider it impersonating if pretendToBePI is not explicitly false AND effectiveCid differs from userCid
+        const isImpersonating = shouldCheckPI && 
+                                devOverride && devOverride.enabled && devOverride.impersonateCid && 
+                                !explicitlyNotPretending && effectiveCid !== Number(userCid);
+        
+        // If user explicitly doesn't want to pretend to be a PI, return 404 immediately
+        if (!shouldCheckPI) {
+            return res.status(404).json({
+                error: "Not a Popular Investor",
+                message: "This endpoint is only available for users who are Popular Investors",
+                effectiveCid: effectiveCid,
+                isImpersonating: false, // Not impersonating if pretendToBePI is false
+                actualCid: Number(userCid)
+            });
+        }
         
         // Check if user is a PI
         const rankEntry = await checkIfUserIsPI(db, effectiveCid, config, logger);
@@ -107,7 +160,8 @@ async function getSignedInUserPIPersonalizedMetrics(req, res, dependencies, conf
                 error: "Not a Popular Investor",
                 message: "This endpoint is only available for users who are Popular Investors",
                 effectiveCid: effectiveCid,
-                isImpersonating: isImpersonating || false
+                isImpersonating: isImpersonating || false,
+                actualCid: Number(userCid)
             });
         }
         
@@ -344,7 +398,8 @@ async function getSignedInUserPIPersonalizedMetrics(req, res, dependencies, conf
             isFallback: foundDate !== today,
             daysBackFromLatest: checkedDates.indexOf(foundDate),
             isImpersonating: isImpersonating || false,
-            actualCid: Number(userCid)
+            actualCid: Number(userCid),
+            pretendToBePI: devOverride && devOverride.enabled ? (devOverride.pretendToBePI || false) : false
         });
         
     } catch (error) {

package/functions/generic-api/user-api/helpers/profile/user_profile_helpers.js

@@ -128,8 +128,19 @@ async function checkIfUserIsPopularInvestor(req, res, dependencies, config) {
     
     try {
         // Check for dev override impersonation
-        const effectiveCid = await getEffectiveCid(db, userCid, config, logger);
         const devOverride = await getDevOverride(db, userCid, config, logger);
+        
+        // For PI-related checks, respect pretendToBePI flag
+        // If pretendToBePI is false, use actual userCid even if impersonateCid is set
+        let effectiveCid;
+        if (devOverride && devOverride.enabled && devOverride.pretendToBePI === false) {
+            // User explicitly doesn't want to pretend to be a PI, use actual CID
+            effectiveCid = Number(userCid);
+        } else {
+            // Use normal effective CID logic (may use impersonateCid if set)
+            effectiveCid = await getEffectiveCid(db, userCid, config, logger);
+        }
+        
         const isImpersonating = devOverride && devOverride.enabled && devOverride.impersonateCid && effectiveCid !== Number(userCid);
         
         // Use effective CID (impersonated or actual) to check PI status

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bulltrackers-module",
-  "version": "1.0.558",
+  "version": "1.0.560",
   "description": "Helper Functions for Bulltrackers.",
   "main": "index.js",
   "files": [