apps-sdk 1.0.53 → 1.0.55

package/config.js

@@ -21,7 +21,10 @@ export var SPECIAL_EVENTS = ['picture_upload', 'write_prompt', 'picture_generate
 export var PAYWALL_DATA = {
     actions: {},
     scenes: {},
-    others: {}
+    others: {},
+    products: {},
+    products_metadata: {},
+    paywall_info: {},
 }
 
 export const EVENT_TYPES = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apps-sdk",
-  "version": "1.0.53",
+  "version": "1.0.55",
   "description": "Apps SDK",
   "main": "index.js",
   "scripts": {
@@ -10,6 +10,7 @@
   "license": "ISC",
   "dependencies": {
     "@react-native-async-storage/async-storage": "^1.21.0",
+    "@react-native-community/netinfo": "^11.3.0",
     "crypto-es": "^2.1.0",
     "expo-constants": "^15.4.5",
     "expo-device": "^5.9.3",

package/src/components/PayWall.js

@@ -1,10 +1,11 @@
-import React from 'react';
+import React, {useEffect} from 'react';
 import {BottomSheet} from 'react-native-btr';
 import {WebView} from 'react-native-webview';
 import {View} from "react-native";
 import Utils from "../libraries/Utils";
 import Networking from "../libraries/Networking";
 import PayWallLogic from "../libraries/PayWallLogic";
+import Session from "../libraries/Session";
 import * as config from "../../config";
 
 class PayWall extends React.Component {
@@ -14,15 +15,23 @@ class PayWall extends React.Component {
         this.paywallData = {};
     }
 
-    getURL = () => {
-        // CP de prueba
-        return "https://backend.ailandsapp.com/payment-card/ZLp_slash_QSy94h9aKdNJWvvvkE8dkHSyeiTGRxsZVQAaiiYveh2jTjeZVJnnIZ0WVKTgiRoAkEoVrB2leXjt_slash_l2g2MtLKRa_slash_30mL6tMu0L9IJxY=?dsn_id=6274";
+    initPayWall = async () => {
+        await PayWallLogic.initializePayWall();
     }
 
-    getPayWallJS = () => {
-        // return "window.subInfoInterval = setInterval(() => window.Appquiles && Appquiles.setSubscriptionPlans(" + JSON.stringify(information.subsPlansInfo) + "), 300);" : '';
-        return "window.subInfoInterval = setInterval(() => window.Appquiles, 300);";
+    getURL = (type, keyword) => {
+        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') || '';
     }
 
     getPayWallData = (type, keyword) => {
@@ -30,7 +39,6 @@ class PayWall extends React.Component {
             console.log('No se encontraron datos para el paywall.');
             return;
         }
-        console.log('PayWallData: ', JSON.stringify(config.PAYWALL_DATA[type][keyword]));
         this.paywallData = config.PAYWALL_DATA[type][keyword];
     }
 
@@ -44,12 +52,17 @@ class PayWall extends React.Component {
         }
     }
 
-    componentDidUpdate(prevProps) {
+    async componentDidUpdate(prevProps) {
         if (this.props.visible && !prevProps.visible) {
-            this.webviewRef.current.injectJavaScript(this.getPayWallJS());
+            this.webviewRef.current.injectJavaScript(await this.getPayWallJS());
+            Networking.sendEvent('scene', 'payment_card', { user_id: Session.getUserID(), card_id: this.getCardID(), scene: 'payment_card' });
         }
     }
 
+    getCardID = () => {
+        return this.getDesignIDFromURL(this.paywallData.url);
+    }
+
     //  --------------------------------------- Eventos ---------------------------------------
     eventClickClose = (data) => {
         Networking.sendEvent('action', 'continue_free');
@@ -59,12 +72,13 @@ class PayWall extends React.Component {
     eventClickSubscribe = (data) => {
         Networking.sendEvent('action', 'cta');
         if (this.paywallData && this.paywallData.products_id && this.paywallData.products_id.length > 0) {
-            let subscribed = PayWallLogic.executePurchase(this.paywallData.products_id[0]);
-            console.log('subscribed',subscribed)
+            let subscribed = PayWallLogic.executePurchase(this.paywallData.products_id[0], this.hideSpinner).then((subscribed) => {
+                console.log('subscription result: ',subscribed);
+                if (subscribed) {
+                    this.props.onSubscribe();
+                }
+            });
         }
-        setTimeout(() => {
-            this.hideSpinner();
-        }, 3000);
     }
 
     eventClickFreeSubscription = (data) =>  {

package/src/libraries/Networking.js

@@ -1,4 +1,5 @@
 import * as config from '../../config';
+import NetInfo from "@react-native-community/netinfo";
 import { default as storage } from './Storage';
 import Session from './Session';
 import AdJust from './AdJust';
@@ -27,6 +28,7 @@ class Networking {
                 this.setEndpoints(initData.data.domains);
                 this.setEvents(initData.data.attribution);
                 this.setPayWallData(initData);
+                this.checkSubscription();
             }
         } catch (error) {
             console.error(error);
@@ -52,13 +54,21 @@ class Networking {
         try {
             const installID = await storage.getData('install_id');
             const result = this.request(config.ENDPOINTS.NOTIFICATION_SET_TOKEN, { expo_id: token });
-            console.log('setToken result: ', result);
         } catch (error) {
             console.error(error);
             return null;
         }
     }
 
+    async checkConnection() {
+        try {
+            const state = await NetInfo.fetch();
+            return state.isConnected;
+        } catch (error) {
+            console.error(error);
+            return false;
+        }
+    }
 
     async request(url, data = {}, encrypt = this.DEFAULT_ENCRYPT_VALUE) {
         data = { ...Session.sessionData, ...data };
@@ -130,6 +140,16 @@ class Networking {
         return this.request(config.ENDPOINTS.SUB_NEW, data);
     }
 
+    checkSubscription = async () => {
+        let subsID = await storage.getData('userID');
+        let subStatus = await this.request(config.ENDPOINTS.SUB_STATUS, {...Session.sessionData, subs_id: subsID});
+        console.log('checkSubscription', subStatus);
+        if (subStatus && subStatus.success === 1) {
+            Session.setIsSubscribed(subStatus.data.subscription_active);
+            Session.setSubscriptionData(subStatus.data);
+        }
+    }
+
     setEvents(events) {
         events && (config.EVENTS = events);
     }
@@ -159,8 +179,11 @@ class Networking {
             }
         }
 
+        result.products = data.data.product_ids;
+
         if (result) {
             config.PAYWALL_DATA = result;
+            console.log('PAYWALL_DATA', config.PAYWALL_DATA);
         }
     }
 
@@ -173,10 +196,11 @@ class Networking {
         try {
             AdJust.trackEventIfExist(eventKeyword);
             let eventResponse = await this.request(config.ENDPOINTS.EVENTS_PUSH, {
-                event_name: eventType,
+                event_name: eventKeyword,
                 event_type: eventType,
-                action: eventKeyword,
-                data: eventData,
+                // action: eventKeyword,
+                appevent: eventKeyword,
+                payload: eventData,
                 ...Session.sessionData,
             });
             if (eventResponse) {

package/src/libraries/PayWallLogic.js

@@ -2,6 +2,8 @@ import React from 'react';
 import {Platform} from "react-native";
 import Networking from "./Networking";
 import Session from "./Session";
+import * as config from "../../config";
+
 import {
     finishTransaction,
     flushFailedPurchasesCachedAsPendingAndroid,
@@ -39,6 +41,7 @@ class PayWallLogic {
                                 const purchaseResponse = await Networking.createSubscription(data);
                                 if(purchaseResponse.success){
                                     Session.setIsSubscribed(true);
+                                    Session.setSubscriptionID(data.subs_id);
                                     Session.setSubscriptionData(purchaseResponse.data);
                                 }
                             }
@@ -59,6 +62,7 @@ class PayWallLogic {
                             const purchaseResponse = await Networking.createSubscription(data);
                             if(purchaseResponse.success){
                                 Session.setIsSubscribed(true);
+                                Session.setSubscriptionID(data.subs_id);
                                 Session.setSubscriptionData(purchaseResponse.data);
                             } else {
                                 console.log('SDK checkSubscription fail')
@@ -87,8 +91,8 @@ class PayWallLogic {
         };
     }
 
-    executePurchase = async (productID) => {
-        let subscribe = false;
+    executePurchase = async (productID, hideLoaderCallback) => {
+        let subscribed = false;
         try {
             const subscriptionTemplates = await getSubscriptions({skus: [productID]});
             console.log('subscriptionTemplates', subscriptionTemplates);
@@ -96,16 +100,90 @@ class PayWallLogic {
                 const subscription = subscriptionTemplates[0];
                 const sku = subscription.productId;
                 const offerToken = Platform.OS === 'android' ? subscription.subscriptionOfferDetails[0].offerToken : false;
+                if (hideLoaderCallback) {
+                    setTimeout(() => {
+                        hideLoaderCallback();
+                    }, 15000);
+                }
                 await requestSubscription({
                     sku,
                     ...(offerToken && {subscriptionOffers: [{sku, offerToken}]}),
                 });
+                console.log('paso 2');
+                subscribed = true;
             }
         } catch (err) {
-            console.warn(err.code, err.message);
+            console.log(err.code, err.message);
         }
-        return subscribe;
+
+        return subscribed;
     };
+
+    getSubscriptionInfo = async (productIDs) => {
+        let subscriptionsData = {};
+        try {
+            const subscriptionTemplates = await getSubscriptions({skus: productIDs});
+            if (subscriptionTemplates.length > 0) {
+                subscriptionTemplates.forEach(product => {
+                    subscriptionsData[product.productId] = product;
+                });
+                config.PAYWALL_DATA.products_metadata = subscriptionsData;
+                console.log('products_metadata', config.PAYWALL_DATA.products_metadata);
+            }
+        } catch (err) {
+            console.log(err.code, err.message);
+            return {};
+        }
+        console.log('subscription Metadata: ', subscriptionsData);
+        return subscriptionsData;
+    }
+
+    requestPaymentInfo = async () => {
+        await this.getSubscriptionInfo(this.getProductIDs());
+        return this.preparePayWallPurchaseInfo();
+    }
+
+    preparePayWallPurchaseInfo = () => {
+        let payWallInfo = [];
+
+        if (config.PAYWALL_DATA && config.PAYWALL_DATA.products_metadata) {
+            for (let key in config.PAYWALL_DATA.products_metadata) {
+                let product = config.PAYWALL_DATA.products_metadata[key];
+                payWallInfo.push({
+                    productIdentifier: product.productId,
+                    localizedTitle: product.title,
+                    description: product.description,
+                    localizedPrice: product.localizedPrice,
+                    price: product.price,
+                    type: product.type,
+                    platform: product.platform,
+                    currency: product.currency,
+                    // duration: product.subscriptionPeriod,
+                    freePeriod: '',
+                    subscriptionUnits: product.subscriptionPeriodNumberIOS || product.subscriptionPeriodNumberAndroid || 1,
+                    subscriptionPeriod: this.getPeriodInt(product.subscriptionPeriodUnitIOS || product.subscriptionPeriodUnitAndroid || 'M'),
+                    units: product.subscriptionPeriodNumberIOS || product.subscriptionPeriodNumberAndroid || 1,
+                    period: product.subscriptionPeriodUnitIOS || product.subscriptionPeriodUnitAndroid || 'MONTH',
+                });
+            }
+            config.PAYWALL_DATA.paywall_info = payWallInfo;
+            console.log('paywall_info', config.PAYWALL_DATA.paywall_info);
+        }
+        return payWallInfo;
+    }
+
+    getProductIDs = () => {
+        return config.PAYWALL_DATA.products;
+    }
+
+    getPeriodInt(period) {
+        return {
+            D: 0,
+            W: 1,
+            M: 2,
+            Y: 3,
+        }[period.charAt(0)];
+    }
 }
 
 export default new PayWallLogic();

package/src/libraries/Session.js

@@ -114,13 +114,19 @@ class Session {
     }
 
     setIsSubscribed = (isSubscribed) => {
+        Storage.storeData("isSubscribed", isSubscribed);
         this.isSubscribed = isSubscribed;
     }
 
     setSubscriptionData = (subscriptionData) => {
+        Storage.storeData("subscriptionData", subscriptionData);
         this.subscriptionData = subscriptionData;
     }
 
+    setSubscriptionID = (subscriptionID) => {
+        Storage.storeData("subscriptionID", subscriptionID);
+    }
+
     setIsDevUser = (isDevUser) => {
         this.isDevUser = isDevUser;
     }
@@ -143,6 +149,28 @@ class Session {
             return null;
         }
     }
+
+    checkSubscription = async () => {
+        config.DEBUG_MODE && console.debug("checkSubscription");
+        try {
+            let result = Networking.checkSubscription();
+            config.DEBUG_MODE && console.debug("checkSubscription - result: ", result);
+        } catch (error) {
+            console.error(error);
+            return null;
+        }
+    }
+
+    checkSubscription24h = async () => {
+        config.DEBUG_MODE && console.debug("checkSubscription24h");
+        let lastCheck = await Storage.getData("lastSubscriptionCheck");
+        if (!lastCheck || (new Date().getTime() - lastCheck) > 86400000) {
+            await this.checkSubscription();
+            await Storage.storeData("lastSubscriptionCheck", new Date().getTime());
+        } else {
+            config.DEBUG_MODE && console.debug("checkSubscription24h - Not 24h yet");
+        }
+    }
 }
 
 export default new Session();

package/types/index.d.ts

@@ -35,6 +35,7 @@ declare module 'apps-sdk' {
         storeSessionStructure(): Promise<void>;
         checkFirstOpen(): Promise<void>;
         checkUserID(): Promise<void>;
+        setSubscriptionID(subscriptionID: string): void;
         generateSessionID(): string;
         getSessionData(): SessionData;
         getSessionID(): string | null;
@@ -46,6 +47,7 @@ declare module 'apps-sdk' {
         setUserID(userID: string): void;
         getUserID(): string | null;
         setSubscriptionData(subscriptionData: any): void;
+        checkSubscription24h(): Promise<void>;
     }
 
     export class Networking {
@@ -58,7 +60,8 @@ declare module 'apps-sdk' {
         getEndpoints(): any;
         setEvents(events: any): void;
         sendEvent(eventType: string, eventKeyword:string, eventData?: object): Promise<void>;
-        createSubscription()
+        createSubscription();
+        checkConnection(): Promise<boolean>;
     }
 
     export class Storage {