apps-sdk 1.0.67 → 1.0.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apps-sdk",
-  "version": "1.0.67",
+  "version": "1.0.69",
   "description": "Apps SDK",
   "main": "index.js",
   "scripts": {

package/src/components/PayWall.js

@@ -13,6 +13,7 @@ class PayWall extends React.Component {
         super(props);
         this.webviewRef = React.createRef();
         this.paywallData = {};
+        this.paywallJS = '';
     }
 
     initPayWall = async () => {
@@ -23,12 +24,6 @@ class PayWall extends React.Component {
         return config.PAYWALL_DATA[type][keyword].url || '';
     }
 
-    getPayWallJS = async () => {
-        PayWallLogic.requestPaymentInfo().then((payWallInfo) => {
-            return "window.subInfoInterval = setInterval(() => window.Appquiles && Appquiles.setSubscriptionPlans(" + JSON.stringify(payWallInfo) + "), 300);";
-        });
-    }
-
     getDesignIDFromURL = (url) => {
         const urlObject = new URL(url);
         return urlObject.searchParams.get('dsn_id') || '';
@@ -54,7 +49,7 @@ class PayWall extends React.Component {
 
     async componentDidUpdate(prevProps) {
         if (this.props.visible && !prevProps.visible) {
-            this.webviewRef.current.injectJavaScript(await this.getPayWallJS());
+            this.webviewRef.current.injectJavaScript(PayWallLogic.paywallJS);
             Networking.sendEvent('scene', 'payment_card', { user_id: Session.getUserID(), card_id: this.getCardID(), scene: 'payment_card' });
         }
     }
@@ -91,6 +86,16 @@ class PayWall extends React.Component {
         this.props.acceptTerms();
     }
 
+    eventClickRestore = (data) => {
+        Networking.sendEvent('action', 'subscription_restore');
+        let subscribed = PayWallLogic.restorePurchase(this.hideSpinner, this.hidePayWall).then((subscribed) => {
+            console.log('subscription result: ',subscribed);
+            if (subscribed) {
+                this.props.onSubscribe();
+            }
+        });
+    }
+
     hideSpinner = () => {
         const event = {
             event: 'hideLoader',
@@ -99,9 +104,8 @@ class PayWall extends React.Component {
             }
         }
         console.log('SDK setHideLoaderAppquiles',event);
-        this.webviewRef.current.injectJavaScript(
-            `Appquiles.emitAppEvent(${JSON.stringify(event)});$('.spinner').hide();`
-        );
+        const jsHideSpinner = `Appquiles.emitAppEvent(${JSON.stringify(event)});$('.spinner').hide(); true;`;
+        this.webviewRef.current.injectJavaScript(jsHideSpinner);
     }
 
     hidePayWall = () => {
@@ -112,10 +116,12 @@ class PayWall extends React.Component {
     render() {
         const { visible, onClose, type, keyword } = this.props;
         this.getPayWallData(type, keyword);
+        config.DEBUG_MODE && console.log('PayWallLogic.paywallJS:', PayWallLogic.paywallJS);
+        config.DEBUG_MODE && console.log('PayWallLogic.paywallJS type:', typeof PayWallLogic.paywallJS);
         return (
             <BottomSheet visible={visible} onBackButtonPress={onClose} onBackdropPress={onClose}>
                 <View style={styles.bottomNavigationView}>
-                    <WebView style={{flex:1}} source={{ uri: this.paywallData.url }} javaScriptEnabled ref={this.webviewRef} onMessage={this.handleMessage} onError={(err) => {console.log('Error al cargar webview:',err)}} injectedJavaScript={this.getPayWallJS()}/>
+                    <WebView style={{flex:1}} source={{ uri: this.paywallData.url }} javaScriptEnabled ref={this.webviewRef} onMessage={this.handleMessage} onError={(err) => {console.log('Error al cargar webview:',err)}} injectedJavaScript={PayWallLogic.paywallJS}/>
                 </View>
             </BottomSheet>
         );

package/src/libraries/AdJust.js

@@ -19,7 +19,7 @@ class AdJust {
             self.attribution = attribution;
             setTimeout(() => {
                 self.sendAttributionData(attribution);
-            }, 60000);
+            }, 30000);
         });
         Adjust.create(adjustConfig)
         this.updateAttributionInfo();

package/src/libraries/PayWallLogic.js

@@ -7,13 +7,19 @@ import * as config from "../../config";
 import {
     finishTransaction,
     flushFailedPurchasesCachedAsPendingAndroid,
+    getAvailablePurchases,
     getSubscriptions,
     initConnection,
     purchaseErrorListener,
-    purchaseUpdatedListener, requestSubscription,
+    purchaseUpdatedListener,
+    requestSubscription,
 } from 'react-native-iap';
 
 class PayWallLogic {
+    constructor(props) {
+        this.paywallJS = '';
+    }
+
     purchaseUpdateSubscription;
     purchaseErrorSubscription;
 
@@ -79,6 +85,8 @@ class PayWallLogic {
                     console.log('purchaseErrorListener', error);
                 },
             );
+
+            await this.getPayWallJS();
         } catch (error) {
             console.log('Error en initializePayWall', error);
         }
@@ -119,6 +127,42 @@ class PayWallLogic {
         return subscribed;
     };
 
+    restorePurchase = async (hideLoaderCallback, hidePayWallCallback) => {
+        let subscribed = false;
+        try {
+            const purchases = await getAvailablePurchases();
+            let restorePurchaseData = {};
+            if(purchases){
+                for(let i in purchases){
+                    if(purchases[i].productId ){
+                        restorePurchaseData = this.purchaseData(purchases[i], Platform.OS === 'android' ? purchases[i].purchaseToken : purchases[i].originalTransactionIdentifierIOS);
+                        break;
+                    }
+                }
+            }
+            subscribed = true;
+            Session.setIsSubscribed(true);
+            Session.setSubscriptionID(restorePurchaseData.subs_id);
+            if (hidePayWallCallback) {
+                hidePayWallCallback();
+            }
+            config.DEBUG_MODE && console.log('Purchase restored successfully', restorePurchaseData);
+        } catch (error) {
+            console.warn(error);
+        }
+        if (hideLoaderCallback) {
+            hideLoaderCallback();
+        }
+        return subscribed;
+    }
+
+    purchaseData = (subscription, purchaseToken) => {
+        return {
+            subs_id: purchaseToken,
+            product_id: subscription.productId,
+        };
+    }
+
     getSubscriptionInfo = async (productIDs) => {
         let subscriptionsData = {};
         try {
@@ -138,6 +182,17 @@ class PayWallLogic {
         return subscriptionsData;
     }
 
+    getPayWallJS = async () => {
+        try {
+            const payWallInfo = await this.requestPaymentInfo();
+            payWallInfo['localizedPrice'] = "";
+            this.paywallJS = "window.subInfoInterval = setInterval(() => window.Appquiles && Appquiles.setSubscriptionPlans(" + JSON.stringify(payWallInfo) + "), 300);";
+            config.DEBUG_MODE && console.log('getPayWallJS', this.paywallJS);
+        } catch (error) {
+            console.error(error);
+        }
+    }
+
     requestPaymentInfo = async () => {
         await this.getSubscriptionInfo(this.getProductIDs());
         return this.preparePayWallPurchaseInfo();

package/types/index.d.ts

@@ -121,6 +121,7 @@ declare module 'apps-sdk' {
     export class PayWallLogic {
         initializePayWall(): Promise<void>;
         executePurchase(productID: string): Promise<void>;
+        restorePurchase(): Promise<void>;
     }
 
     export class AdJust {