Merge pull request #1551 from RodriSanchez1/fix/refactorGetSubscriber…

…NotFound Fix/refactor get subscriber not found
cboard-org · Dec 18, 2023 · 0d3c5d5 · 0d3c5d5
2 parents e4ce4c0 + 4a9532a
commit 0d3c5d5
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/src/api/api.js b/src/api/api.js
@@ -518,11 +518,17 @@ class API {
     }
     const headers = {
       Authorization: `Bearer ${authToken}`,
-      requestOrigin
+      requestOrigin,
+      newVersion: 'true'
     };
     const { data } = await this.axiosInstance.get(`/subscriber/${userId}`, {
       headers
     });
+
+    if (data && !data.success) {
+      throw data;
+    }
+
     return data;
   }
 

diff --git a/src/components/Settings/Subscribe/Subscribe.container.js b/src/components/Settings/Subscribe/Subscribe.container.js
@@ -284,7 +284,10 @@ export class SubscribeContainer extends PureComponent {
           });
         }
       } catch (err) {
-        if (err.response?.data.error === 'subscriber not found') {
+        const isSubscriberNotFound =
+          (err.response?.data?.error || err.error) === 'subscriber not found';
+
+        if (isSubscriberNotFound) {
           // check if current subscriber already bought in this device
           if (isAndroid()) {
             if (localReceipts.length) {

diff --git a/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js b/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
@@ -215,11 +215,15 @@ export function updateIsSubscribed(requestOrigin = 'unkwnown') {
         );
       }
     } catch (err) {
-      console.error(err.message);
+      console.error(getErrorMessage(err));
+
       isSubscribed = false;
       status = NOT_SUBSCRIBED;
       let ownedProduct = '';
-      if (err.response?.data.error === 'subscriber not found') {
+      const isSubscriberNotFound =
+        (err.response?.data?.error || err.error) === 'subscriber not found';
+
+      if (isSubscriberNotFound) {
         dispatch(
           updateSubscription({
             ownedProduct,
@@ -274,6 +278,14 @@ export function updateIsSubscribed(requestOrigin = 'unkwnown') {
     }
     return isSubscribed;
   };
+
+  function getErrorMessage(err) {
+    return (
+      err.message +
+      '. ' +
+      (err.response ? err.response?.data?.message : err.error)
+    );
+  }
 }
 
 export function updatePlans() {