Merge pull request cboard-org#1539 from RodriSanchez1/fix/getSubscrib…

…erLoop Fix / Get subscriber loop
RodriSanchez1 · Jul 19, 2023 · df9b58f · df9b58f
2 parents 7483cf1 + 5204820
commit df9b58f
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 39 deletions.
diff --git a/src/components/PremiumFeature/PremiumFeature.js b/src/components/PremiumFeature/PremiumFeature.js
@@ -1,15 +1,38 @@
 import React from 'react';
 import { connect } from 'react-redux';
-import { showPremiumRequired } from '../../providers/SubscriptionProvider/SubscriptionProvider.actions';
+import {
+  updateIsInFreeCountry,
+  updateIsSubscribed,
+  updateSubscription,
+  updateIsOnTrialPeriod,
+  showPremiumRequired
+} from '../../providers/SubscriptionProvider/SubscriptionProvider.actions';
+
+function isUpdateSubscriberStatusNeeded(lastUpdated) {
+  if (!lastUpdated) return true;
+  const MAX_HOURS_DIFFERENCE = 12;
+  const actualTime = new Date().getTime();
+  const difference = actualTime - lastUpdated;
+  const hoursDifference = difference / (1000 * 60 * 60);
+  return hoursDifference > MAX_HOURS_DIFFERENCE;
+}
 
 function PremiumFeature({
   children,
   isOnTrialPeriod,
   isSubscribed,
   isInFreeCountry,
-  showPremiumRequired
+  showPremiumRequired,
+  lastUpdated
 }) {
   const captured = event => {
+    if (isUpdateSubscriberStatusNeeded(lastUpdated)) {
+      const requestOrigin = 'Function: captured - Component: PremiumFeature';
+      updateIsSubscribed(requestOrigin);
+      updateIsInFreeCountry();
+      updateIsOnTrialPeriod();
+    }
+
     if (isInFreeCountry || isSubscribed || isOnTrialPeriod) return;
     event.stopPropagation();
     event.preventDefault();
@@ -26,10 +49,16 @@ function PremiumFeature({
 const mapStateToProps = state => ({
   isOnTrialPeriod: state.subscription.isOnTrialPeriod,
   isSubscribed: state.subscription.isSubscribed,
-  isInFreeCountry: state.subscription.isInFreeCountry
+  isInFreeCountry: state.subscription.isInFreeCountry,
+  lastUpdated: state.subscription.lastUpdated
 });
 
-const mapDispatchToProps = { showPremiumRequired };
+const mapDispatchToProps = {
+  showPremiumRequired,
+  updateIsSubscribed,
+  updateSubscription,
+  updateIsInFreeCountry
+};
 
 export default connect(
   mapStateToProps,

diff --git a/src/components/Settings/Subscribe/Subscribe.container.js b/src/components/Settings/Subscribe/Subscribe.container.js
@@ -41,7 +41,7 @@ export class SubscribeContainer extends PureComponent {
     const { updateIsSubscribed, updatePlans } = this.props;
     const requestOrigin =
       'Function: componentDidMount - Component: Subscribe Container';
-    updateIsSubscribed(false, requestOrigin);
+    updateIsSubscribed(requestOrigin);
     updatePlans();
   }
 
@@ -56,7 +56,7 @@ export class SubscribeContainer extends PureComponent {
     const { updateIsSubscribed, updatePlans } = this.props;
     const requestOrigin =
       'Fuction: handleRefreshSubscription() - Component: subscribeContainer';
-    updateIsSubscribed(false, requestOrigin);
+    updateIsSubscribed(requestOrigin);
     updatePlans();
   };
 
@@ -68,7 +68,7 @@ export class SubscribeContainer extends PureComponent {
       this.setState({ cancelSubscriptionStatus: 'ok' });
       const requestOrigin =
         'Function: handleCancelSubscription() - Component:Subscribe Container';
-      updateIsSubscribed(false, requestOrigin);
+      updateIsSubscribed(requestOrigin);
       updatePlans();
     } catch (err) {
       console.error(err.message);

diff --git a/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js b/src/providers/SubscriptionProvider/SubscriptionProvider.actions.js
@@ -59,16 +59,19 @@ export function updateIsOnTrialPeriod() {
   };
 }
 
-export function updateIsSubscribed(
-  isOnResume = false,
-  requestOrigin = 'unkwnown'
-) {
+export function updateIsSubscribed(requestOrigin = 'unkwnown') {
   return async (dispatch, getState) => {
     let isSubscribed = false;
     let ownedProduct = '';
     let status = NOT_SUBSCRIBED;
     let expiryDate = null;
     const state = getState();
+    dispatch(
+      updateSubscription({
+        lastUpdated: new Date().getTime()
+      })
+    );
+
     try {
       if (!isLogged(state)) {
         dispatch(
@@ -81,9 +84,6 @@ export function updateIsSubscribed(
         );
       } else {
         if (isAndroid() && state.subscription.status === PROCCESING) {
-          //If just close the subscribe google play modal
-          if (isOnResume) return;
-
           const localReceipts = window.CdvPurchase.store.localReceipts;
           if (localReceipts.length) {
             //Restore purchases to pass to approved

diff --git a/src/providers/SubscriptionProvider/SubscriptionProvider.container.js b/src/providers/SubscriptionProvider/SubscriptionProvider.container.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 
 import API from '../../api';
-import { isAndroid, isCordova } from '../../cordova-util';
+import { isAndroid } from '../../cordova-util';
 
 import {
   updateIsInFreeCountry,
@@ -13,7 +13,6 @@ import {
   updateIsOnTrialPeriod,
   showPremiumRequired
 } from './SubscriptionProvider.actions';
-import { onCvaResume, cleanUpCvaOnResume } from '../../cordova-util';
 import {
   ACTIVE,
   CANCELED,
@@ -26,20 +25,6 @@ export class SubscriptionProvider extends Component {
     children: PropTypes.node.isRequired
   };
 
-  onResume = async () => {
-    const {
-      updateIsSubscribed,
-      updateIsInFreeCountry,
-      updateIsOnTrialPeriod
-    } = this.props;
-    const isOnResume = true;
-    const requestOrigin =
-      'Function: onCvaResume() - Component: SubscriptionProvider';
-    await updateIsSubscribed(isOnResume, requestOrigin);
-    updateIsInFreeCountry();
-    updateIsOnTrialPeriod();
-  };
-
   async componentDidMount() {
     const {
       isLogged,
@@ -50,11 +35,9 @@ export class SubscriptionProvider extends Component {
       updatePlans
     } = this.props;
 
-    if (isCordova()) onCvaResume(this.onResume);
-
     const requestOrigin =
       'Function: componentDidMount - Component: SubscriptionProvider';
-    const isSubscribed = await updateIsSubscribed(false, requestOrigin);
+    const isSubscribed = await updateIsSubscribed(requestOrigin);
     const isInFreeCountry = updateIsInFreeCountry();
     const isOnTrialPeriod = updateIsOnTrialPeriod();
     await updatePlans();
@@ -74,7 +57,7 @@ export class SubscriptionProvider extends Component {
     if (prevProps.isLogged !== isLogged) {
       const requestOrigin =
         'Function: componentDidUpdate - Component: SubscriptionProvider';
-      const isSubscribed = await updateIsSubscribed(false, requestOrigin);
+      const isSubscribed = await updateIsSubscribed(requestOrigin);
       const isInFreeCountry = updateIsInFreeCountry();
       const isOnTrialPeriod = updateIsOnTrialPeriod();
       if (!isInFreeCountry && !isOnTrialPeriod && !isSubscribed && isLogged) {
@@ -83,10 +66,6 @@ export class SubscriptionProvider extends Component {
     }
   };
 
-  componentWillUnmount() {
-    if (isCordova()) cleanUpCvaOnResume(this.onResume);
-  }
-
   configPurchaseValidator = () => {
     window.CdvPurchase.store.validator = async function(receipt, callback) {
       try {

diff --git a/src/providers/SubscriptionProvider/SubscriptionProvider.reducer.js b/src/providers/SubscriptionProvider/SubscriptionProvider.reducer.js
@@ -37,7 +37,8 @@ const initialState = {
       price: '',
       tag: ''
     }
-  ]
+  ],
+  lastUpdated: undefined
 };
 
 function subscriptionProviderReducer(state = initialState, action) {