fix: the passthrough field is changed to a string type

Author: danshuitaihejie

functions/index.js

@@ -122,11 +122,7 @@ exports.webhook = functions.https.onRequest(async (req, res) => {
     if (valid) {
       if (alertParser.supports(req)) {
         const subscription = alertParser.parse(req);
-        const userId =
-          typeof subscription.passthrough === 'string'
-            ? subscription.passthrough
-            : subscription.passthrough.userId;
-
+        const userId = getUserIdFromPassthrough(subscription.passthrough);
         const user = await db.collection('users').doc(userId).get();
         if (user.exists) {
           await db
@@ -148,3 +144,18 @@ exports.webhook = functions.https.onRequest(async (req, res) => {
     res.send('Invaid request');
   }
 });
+
+function getUserIdFromPassthrough(passthrough) {
+  return isJSONString(passthrough)
+    ? JSON.parse(passthrough).userId
+    : passthrough;
+}
+
+function isJSONString(str) {
+  try {
+    JSON.parse(str);
+    return true;
+  } catch (e) {
+    return false;
+  }
+}

src/components/subscription/UpgradeLink.jsx

@@ -8,7 +8,10 @@ const UpgradeLink = (props) => {
     Paddle.Checkout.open({
       product: planService.getProductByPlanType(props.planType),
       email: props.userEmail,
-      passthrough: { userId: props.userId, planType: props.planType },
+      passthrough: JSON.stringify({
+        userId: props.userId,
+        planType: props.planType,
+      }),
       successCallback: props.postActionCallback,
     });
   };

src/javascript/firebase/subscription.js

@@ -32,6 +32,7 @@ function loadSubscriptionToApp(app) {
       );
     })
     .then((subscription) => {
+      console.debug('Feng loadSubscriptionToApp', subscription);
       app.setState((state) => {
         const newUser = state.user;
         newUser.subscription = subscription;

src/services/user_service.js

@@ -5,6 +5,7 @@ export default {
   user: user,
   subscription: subscription,
   isSubscribed: function () {
+    console.debug('Feng subscription', subscription());
     return (
       subscription() &&
       (subscription().status === 'active' ||
@@ -23,12 +24,22 @@ export default {
   getPlanType: function () {
     if (!this.isSubscribed()) return 'free';
     const currentSubscription = subscription();
-
-    // Compatible with previous pro users, before subscription.passthrough only stored userId
-    if (typeof currentSubscription.passthrough === 'string') {
-      return 'basic-monthly';
-    }
-
-    return currentSubscription.passthrough.planType;
+    return getPlanTypeFromPassthrough(currentSubscription.passthrough);
   },
 };
+
+// Compatible with previous pro users, before subscription.passthrough only stored userId
+function getPlanTypeFromPassthrough(passthrough) {
+  return isJSONString(passthrough)
+    ? JSON.parse(passthrough).planType
+    : 'basic-monthly';
+}
+
+function isJSONString(str) {
+  try {
+    JSON.parse(str);
+    return true;
+  } catch (e) {
+    return false;
+  }
+}