@purchasely/cordova-plugin-purchasely 5.1.0 → 5.3.0

package/example/package-lock.json

@@ -33,7 +33,7 @@
     },
     "../../purchasely-google": {
       "name": "@purchasely/cordova-plugin-puchasely-google",
-      "version": "5.1.0",
+      "version": "5.3.0",
       "dev": true,
       "license": "ISC"
     },
@@ -204,9 +204,9 @@
       }
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -259,21 +259,6 @@
         "node": ">=16.13.0"
       }
     },
-    "node_modules/cordova-android/node_modules/dedent": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
-      "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "babel-plugin-macros": "^3.1.0"
-      },
-      "peerDependenciesMeta": {
-        "babel-plugin-macros": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/cordova-common": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/cordova-common/-/cordova-common-5.0.1.tgz",
@@ -390,6 +375,21 @@
         "node": ">= 8"
       }
     },
+    "node_modules/dedent": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.6.0.tgz",
+      "integrity": "sha512-F1Z+5UCFpmQUzJa11agbyPVMbpgT/qA3/SKyJ1jyBgm7dUcUEa8v9JwDkerSQXfakBwFljIxhOJqGkjUwZ9FSA==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "babel-plugin-macros": "^3.1.0"
+      },
+      "peerDependenciesMeta": {
+        "babel-plugin-macros": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/elementtree": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz",

package/example/package.json

@@ -22,11 +22,12 @@
   },
   "cordova": {
     "plugins": {
-      "@purchasely/cordova-plugin-puchasely-google": {}
+      "@purchasely/cordova-plugin-puchasely-google": {},
+      "@purchasely/cordova-plugin-purchasely": {}
     },
     "platforms": [
       "android",
       "ios"
     ]
   }
-}
+}

package/example/www/js/index.js

@@ -17,6 +17,18 @@
  * under the License.
  */
 
+function safeStringify(obj, space = 2) {
+  const seen = new WeakSet();
+  return JSON.stringify(obj, (key, value) => {
+    if (typeof value === 'object' && value !== null) {
+      if (seen.has(value)) {
+        return '[Circular Reference]';
+      }
+      seen.add(value);
+    }
+    return value;
+  }, space);
+}
 
 // Wait for the deviceready event before using any of Cordova's device APIs.
 // See https://cordova.apache.org/docs/en/latest/cordova/events/events.html#deviceready
@@ -69,8 +81,8 @@ function onPuchaselySdkReady() {
 
 	Purchasely.addEventsListener((event) => {
 		console.log("Event Name " + event.name);
-		console.log(event.properties);
-		console.log(event);
+		console.log(safeStringify(event.properties));
+		console.log(safeStringify(event));
 	}, (error) => {
 		console.log(error);
 	});
@@ -288,7 +300,7 @@ function fetchPresentation() {
 		'onboarding', //placementId
 		null, //contentId
 		(presentation) => {
-			console.log(presentation);
+			console.log(safeStringify(presentation));
 			Purchasely.presentPresentation(presentation, false, null,
 				(callback) => {
 					console.log(callback);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@purchasely/cordova-plugin-purchasely",
-  "version": "5.1.0",
+  "version": "5.3.0",
   "description": "Purchasely is a solution to ease the integration and boost your In-App Purchases & Subscriptions on the App Store, Google Play Store, Amazon Appstore and Huawei App Gallery.",
   "cordova": {
     "id": "@purchasely/cordova-plugin-purchasely",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="@purchasely/cordova-plugin-purchasely" version="5.1.0" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
+<plugin id="@purchasely/cordova-plugin-purchasely" version="5.3.0" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
     <name>Purchasely</name>
     <js-module name="Purchasely" src="www/Purchasely.js">
         <clobbers target="Purchasely" />
@@ -38,7 +38,7 @@
                 <source url="https://github.com/CocoaPods/Specs.git"/>
             </config>
             <pods use-frameworks="true">
-                <pod name="Purchasely" spec="5.1.0"/>
+                <pod name="Purchasely" spec="5.3.7"/>
             </pods>
         </podspec>
     </platform>
@@ -63,7 +63,7 @@
                 android:theme="@style/Theme.AppCompat.Light.NoActionBar">
             </activity>
         </config-file>
-        <framework src="io.purchasely:core:5.1.0" />
+        <framework src="io.purchasely:core:5.3.7" />
         <source-file src="src/android/PurchaselyPlugin.kt" target-dir="java/cordova/plugin/purchasely" />
         <source-file src="src/android/PLYProductActivity.kt" target-dir="java/cordova/plugin/purchasely" />
         <source-file src="src/android/PLYSubscriptionsActivity.java" target-dir="src/cordova/plugin/purchasely" />

package/src/android/PurchaselyPlugin.kt

@@ -562,10 +562,17 @@ class PurchaselyPlugin : CordovaPlugin() {
         purchaseCallback = callbackContext
 
         cordova.activity.let { activity ->
-            val intent = PLYProductActivity.newIntent(activity, PLYPresentationProperties(), isFullScreen, loadingBackgroundColor).apply {
-                putExtra("presentation", presentation)
+            if (presentation.flowId != null) {
+                presentation.display(activity) { result, plan ->
+                    sendPurchaseResult(result, plan)
+                }
+            } else {
+                // Open legacy Activity for now if not a flow
+                val intent = PLYProductActivity.newIntent(activity, PLYPresentationProperties(), isFullScreen, loadingBackgroundColor).apply {
+                    putExtra("presentation", presentation)
+                }
+                activity.startActivity(intent)
             }
-            activity.startActivity(intent)
         }
 
     }

package/src/ios/CDVPurchasely.m

@@ -550,6 +550,9 @@
         case PLYPresentationActionClose:
             actionString = @"close";
             break;
+        case PLYPresentationActionCloseAll:
+            actionString = @"close_all";
+            break;
         case PLYPresentationActionRestore:
             actionString = @"restore";
             break;
@@ -562,6 +565,12 @@
         case PLYPresentationActionOpenPresentation:
             actionString = @"open_presentation";
             break;
+        case PLYPresentationActionOpenPlacement:
+            actionString = @"open_placement";
+            break;
+        case PLYPresentationActionWebCheckout:
+            actionString = @"web_checkout";
+            break;
     }
 
     [actionInterceptorResult setObject:actionString forKey:@"action"];
@@ -606,12 +615,31 @@
             [promoOffer setObject:params.promoOffer.storeOfferId forKey:@"storeOfferId"];
             [paramsResult setObject:promoOffer forKey:@"offer"];
         }
+        NSString *webCheckoutProviderString = PLYWebCheckoutProviderToString(params.webCheckoutProvider);
+        [paramsResult setObject:webCheckoutProviderString forKey:@"webCheckoutProvider"];
+        if (params.queryParameterKey != nil) {
+            [paramsResult setObject:params.queryParameterKey forKey:@"queryParameterKey"];
+        }
+        if (params.clientReferenceId != nil) {
+            [paramsResult setObject:params.clientReferenceId forKey:@"clientReferenceId"];
+        }
         [actionInterceptorResult setObject:paramsResult forKey:@"parameters"];
     }
-
+    
     return actionInterceptorResult;
 }
 
+static NSString * PLYWebCheckoutProviderToString(PLYWebCheckoutProvider provider) {
+    switch (provider) {
+        case PLYWebCheckoutProviderStripe:
+            return @"stripe";
+        case PLYWebCheckoutProviderOther:
+            return @"other";
+        default:
+            return @"unknown";
+    }
+}
+
 - (void)setPaywallActionInterceptor:(CDVInvokedUrlCommand*)command {
     self.paywallActionInterceptorCommand = command;
     [Purchasely setPaywallActionsInterceptor:^(enum PLYPresentationAction action, PLYPresentationActionParameters * _Nullable parameters, PLYPresentationInfo * _Nullable infos, void (^ _Nonnull onProcessActionHandler)(BOOL)) {
@@ -860,7 +888,11 @@
                 [Purchasely closeDisplayedPresentation];
                 self.presentedPresentationViewController = presentationLoaded.controller;
                 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.5 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
-                    [Purchasely showController:presentationLoaded.controller type: PLYUIControllerTypeProductPage from:nil];
+                    if (presentationLoaded.isFlow) {
+                        [presentationLoaded displayFrom:nil];
+                    } else {
+                        [Purchasely showController:presentationLoaded.controller type: PLYUIControllerTypeProductPage from:nil];
+                    }
                 });
             }
         });

package/www/Purchasely.js

@@ -5,7 +5,7 @@ var defaultError = (e) => { console.log(e); }
 exports.start = function (apiKey, stores, storekit1, userId, logLevel, runningMode, success, error) {
     var cordovaSdkVersion = cordova.define.moduleMap['cordova/plugin_list'].exports['metadata']['cordova-plugin-purchasely']
     if(!cordovaSdkVersion) {
-        cordovaSdkVersion = "5.1.0";
+        cordovaSdkVersion = "5.3.0";
     }
     exec(success, error, 'Purchasely', 'start', [apiKey, stores, storekit1, userId, logLevel, runningMode, cordovaSdkVersion]);
 };