@purchasely/cordova-plugin-purchasely 5.7.3 → 6.0.0-rc.1

package/example/www/js/index.js

@@ -41,12 +41,13 @@ function onDeviceReady() {
 	document.getElementById('deviceready').classList.add('ready');
 
 	Purchasely.start(
-		'fcb39be4-2ba4-4db7-bde3-2a5a1e20745d',
-		['Google'],
-		false,
-		null,
-		Purchasely.LogLevel.DEBUG,
-		Purchasely.RunningMode.full,
+		{
+			apiKey: 'fcb39be4-2ba4-4db7-bde3-2a5a1e20745d',
+			stores: [Purchasely.Store.google],
+			storeKit1: false,
+			logLevel: Purchasely.LogLevel.DEBUG,
+			runningMode: Purchasely.RunningMode.full
+		},
 		(isConfigured) => {
 			if(isConfigured) onPurchaselySdkReady();
 		},
@@ -60,14 +61,13 @@ function onDeviceReady() {
 
 	document.getElementById("openPresentation").addEventListener("click", openPresentation);
 	document.getElementById("fetchPresentation").addEventListener("click", fetchPresentation);
-	document.getElementById("presentSubscriptions").addEventListener("click", presentSubscriptions);
-	document.getElementById("showPresentation").addEventListener("click", showPresentation);
-	document.getElementById("hidePresentation").addEventListener("click", hidePresentation);
+	document.getElementById("backPresentation").addEventListener("click", backPresentation);
 	document.getElementById("closePresentation").addEventListener("click", closePresentation);
 	document.getElementById("purchaseWithPlanVendorId").addEventListener("click", purchaseWithPlanVendorId);
 	document.getElementById("restore").addEventListener("click", restore);
 	document.getElementById("silentRestore").addEventListener("click", silentRestore);
 	document.getElementById("processToPayment").addEventListener("click", processToPayment);
+	document.getElementById("openDeeplink").addEventListener("click", openDeeplink);
 
 }
 
@@ -139,7 +139,7 @@ function onPurchaselySdkReady() {
 	Purchasely.setAttribute(Purchasely.Attribute.BATCH_CUSTOM_USER_ID, "batch_custom_user_id");
 	Purchasely.setAttribute(Purchasely.Attribute.BATCH_INSTALLATION_ID, "testBatch1");
 
-	Purchasely.readyToOpenDeeplink(true);
+	Purchasely.allowDeeplink(true);
 
 	Purchasely.planWithIdentifier('PURCHASELY_PLUS_MONTHLY', (plan) => {
 		console.log(' ==> Plan');
@@ -157,16 +157,16 @@ function onPurchaselySdkReady() {
 		console.log(error);
 	});
 
-	Purchasely.setDefaultPresentationResultHandler(callback => {
-		console.log(callback);
+	Purchasely.setDefaultPresentationDismissHandler(callback => {
+		console.log('[setDefaultPresentationDismissHandler] onDismissed — purchaseResult=' + callback.purchaseResult + ' closeReason=' + callback.closeReason + ' — outcome: ' + safeStringify(callback));
 		if(callback.result == Purchasely.PurchaseResult.CANCELLED) {
-			console.log("User cancelled purchased");
-		} else {
+			console.log("User cancelled purchase - close reason " + callback.closeReason);
+		} else if (callback.plan) {
 			console.log("User purchased " + callback.plan.vendorId);
 		}
 	},
 		(error) => {
-		console.log("Error with purchase : " + error);
+		console.log("[setDefaultPresentationDismissHandler] error: " + error);
 	});
 
 	Purchasely.setUserAttributeWithString("key_string", "value_string", Purchasely.DataProcessingLegalBasis.essential);
@@ -238,53 +238,58 @@ function onPurchaselySdkReady() {
 
 	Purchasely.removeUserAttributeListener();
 
-	Purchasely.setPaywallActionInterceptor((result) => {
-		console.log(result);
-		console.log('Received action from paywall ' + result.info.presentationId);
-
-		if (result.action === Purchasely.PaywallAction.navigate) {
-			console.log(
-			'User wants to navigate to website ' +
-				result.parameters.title +
-				' ' +
-				result.parameters.url
-			);
-			console.log('prevent Purchasely SDK to navigate to website');
-			Purchasely.onProcessAction(true);
-		} else if (result.action === Purchasely.PaywallAction.close) {
-			console.log('User wants to close paywall - close reason ' + result.parameters.closeReason);
-			Purchasely.onProcessAction(true);
-		} else if (result.action === Purchasely.PaywallAction.close_all) {
-		    console.log('User wants to close all paywalls');
-            Purchasely.onProcessAction(true);
-		} else if (result.action === Purchasely.PaywallAction.login) {
-			console.log('User wants to login');
-			//Present your own screen for user to log in
-			Purchasely.closePaywall();
-			Purchasely.userLogin('MY_USER_ID');
-			//Call this method to update Purchasely Paywall
-			Purchasely.onProcessAction(true);
-		} else if (result.action === Purchasely.PaywallAction.open_presentation) {
-			console.log('User wants to open a new paywall');
-			Purchasely.onProcessAction(true);
-	    } else if (result.action === Purchasely.PaywallAction.open_placement) {
-            console.log('User wants to open a new placement');
-            Purchasely.onProcessAction(true);
-		} else if (result.action === Purchasely.PaywallAction.purchase) {
-			console.log('User wants to purchase');
-			//If you want to intercept it, close paywall and display your screen
-			Purchasely.hidePresentation();
-		} else if (result.action === Purchasely.PaywallAction.web_checkout) {
-			console.log('User wants to proceed to web checkout');
-			console.log('web checkout url: ' + result.parameters.url);
-			console.log('web checkout provider: ' + result.parameters.webCheckoutProvider);
-	        console.log('web checkout client reference id: ' + result.parameters.clientReferenceId);
-	        console.log('web checkout query parameter key: ' + result.parameters.queryParameterKey);
-			Purchasely.onProcessAction(true);
-		} else {
-			console.log('Action unknown ' + result.action);
-			Purchasely.onProcessAction(true);
-		}
+	// Purchasely 6.0: per-action interceptor. Register a handler per action kind; each
+	// handler receives (info, parameters) and returns a Purchasely.InterceptResult telling
+	// the SDK how it was handled (notHandled = let the SDK proceed, success = app handled it).
+	Purchasely.removeAllActionInterceptors();
+
+	// NOTE: `info` and `parameters` can be null depending on the action and the
+	// platform (e.g. on iOS the `close` action carries no parameters). Always log
+	// them with safeStringify (null-safe) rather than reading fields directly, or
+	// a thrown handler is reported to the SDK as `failed` and the action (e.g.
+	// close) will NOT be performed.
+	Purchasely.interceptAction(Purchasely.PresentationAction.navigate, (info, parameters) => {
+		console.log('[interceptAction] navigate — info: ' + safeStringify(info) + ' — parameters: ' + safeStringify(parameters));
+		return Purchasely.InterceptResult.notHandled;
+	});
+
+	Purchasely.interceptAction(Purchasely.PresentationAction.close, (info, parameters) => {
+		console.log('[interceptAction] close — info: ' + safeStringify(info) + ' — parameters: ' + safeStringify(parameters));
+		return Purchasely.InterceptResult.notHandled;
+	});
+
+	Purchasely.interceptAction(Purchasely.PresentationAction.close_all, (info, parameters) => {
+		console.log('[interceptAction] close_all — info: ' + safeStringify(info) + ' — parameters: ' + safeStringify(parameters));
+		return Purchasely.InterceptResult.notHandled;
+	});
+
+	Purchasely.interceptAction(Purchasely.PresentationAction.login, (info, parameters) => {
+		console.log('[interceptAction] login — info: ' + safeStringify(info) + ' — parameters: ' + safeStringify(parameters));
+		// Present your own screen for the user to log in, then report success so the paywall refreshes.
+		Purchasely.closePresentation();
+		Purchasely.userLogin('MY_USER_ID');
+		return Purchasely.InterceptResult.success;
+	});
+
+	Purchasely.interceptAction(Purchasely.PresentationAction.open_presentation, (info, parameters) => {
+		console.log('[interceptAction] open_presentation — info: ' + safeStringify(info) + ' — parameters: ' + safeStringify(parameters));
+		return Purchasely.InterceptResult.notHandled;
+	});
+
+	Purchasely.interceptAction(Purchasely.PresentationAction.open_placement, (info, parameters) => {
+		console.log('[interceptAction] open_placement — info: ' + safeStringify(info) + ' — parameters: ' + safeStringify(parameters));
+		return Purchasely.InterceptResult.notHandled;
+	});
+
+	Purchasely.interceptAction(Purchasely.PresentationAction.purchase, (info, parameters) => {
+		console.log('[interceptAction] purchase — info: ' + safeStringify(info) + ' — parameters: ' + safeStringify(parameters));
+		// Let the SDK proceed with the purchase.
+		return Purchasely.InterceptResult.notHandled;
+	});
+
+	Purchasely.interceptAction(Purchasely.PresentationAction.web_checkout, (info, parameters) => {
+		console.log('[interceptAction] web_checkout — info: ' + safeStringify(info) + ' — parameters: ' + safeStringify(parameters));
+		return Purchasely.InterceptResult.notHandled;
 	});
 
 	Purchasely.clearBuiltInAttributes();
@@ -294,19 +299,38 @@ function openPresentation() {
 	Purchasely.presentPresentationForPlacement(
 		'ONBOARDING', //placementId
 		null, //contentId
-		true, //fullscreen
+		Purchasely.TransitionType.fullScreen, //display mode (string) — or a transition object, see below
 		(callback) => {
-			console.log(callback);
+			console.log('[openPresentation] onDismissed — purchaseResult=' + callback.purchaseResult + ' — outcome: ' + safeStringify(callback));
 			if(callback.result == Purchasely.PurchaseResult.CANCELLED) {
-				console.log("User cancelled purchased");
+				console.log("User cancelled purchased - close reason " + callback.closeReason);
 			} else {
-				console.log("User purchased " + callback.plan.name);
+				console.log("User purchased " + (callback.plan ? callback.plan.name : ''));
 			}
 		},
 		(error) => {
-			console.log("Error with purchase : " + error);
+			console.log("[openPresentation] error: " + error);
+		},
+		// Purchasely 6.0: optional per-request lifecycle callbacks.
+		{
+			onPresented: (presentation, error) => {
+				console.log('[openPresentation] onPresented — ' + (presentation ? presentation.screenId : '') + (error ? ' error=' + error : ''));
+			},
+			onCloseRequested: () => {
+				console.log('[openPresentation] onCloseRequested');
+			}
 		}
 	);
+
+	// Purchasely 6.0 also supports:
+	//  - a rich transition object for drawer/popin sizing (see fetchPresentation below):
+	//      { type: Purchasely.TransitionType.drawer, dismissible: true,
+	//        height: { type: Purchasely.DimensionType.percentage, value: 0.8 }, backgroundColor: '#000000' }
+	//  - the default (audience-targeted) presentation:
+	//      Purchasely.presentPresentationForDefault(null, Purchasely.TransitionType.fullScreen, ok, err);
+	//      Purchasely.fetchPresentationForDefault(null, onLoaded, err);
+	//  - stopping campaign/deeplink dismiss outcomes:
+	//      Purchasely.removeDefaultPresentationDismissHandler();
 }
 
 function fetchPresentation() {
@@ -314,50 +338,47 @@ function fetchPresentation() {
 		'flow_demo', //placementId
 		null, //contentId
 		(presentation) => {
-			console.log(safeStringify(presentation));
-			Purchasely.presentPresentation(presentation, false, null,
+			console.log('[fetchPresentation] onFetched — presentation: ' + safeStringify(presentation));
+			// Rich transition object: drawer at 80% height, dismissible. (iOS applies the
+			// percentage height + dismissible; Android also supports pixel + popin width.)
+			Purchasely.presentPresentation(presentation, {
+				type: Purchasely.TransitionType.drawer,
+				dismissible: true,
+				height: { type: Purchasely.DimensionType.percentage, value: 0.8 }
+			}, null,
 				(callback) => {
-					console.log(callback);
+					console.log('[fetchPresentation → presentPresentation] onDismissed — purchaseResult=' + callback.purchaseResult + ' — outcome: ' + safeStringify(callback));
 					if(callback.result == Purchasely.PurchaseResult.CANCELLED) {
-						console.log("User cancelled purchased");
+						console.log("User cancelled purchased - close reason " + callback.closeReason);
 					} else {
-						console.log("User purchased " + callback.plan.name);
+						console.log("User purchased " + (callback.plan ? callback.plan.name : ''));
 					}
 				}, (error) => {
-					console.log("Error with present : " + error);
+					console.log("[fetchPresentation → presentPresentation] error: " + error);
 				});
 		},
 		(error) => {
-			console.log("Error with purchase : " + error);
+			console.log("[fetchPresentation] error: " + error);
 		}
 	);
 }
 
-function presentSubscriptions() {
-	Purchasely.presentSubscriptions();
-}
-
 function purchaseWithPlanVendorId() {
 	Purchasely.purchaseWithPlanVendorId("PURCHASELY_PLUS_MONTHLY");
 }
 
 function processToPayment() {
-	// Call this method open paywall again
-	Purchasely.showPresentation();
-
-	// Call this method in paywallObserver mode to synchronize purchases with Purchasely
-	// Purchasely.synchronize();
-
-	// Call this method to process to payment or false if you handled it
-	Purchasely.onProcessAction(true);
-}
+	// Call this method in observer mode to synchronize purchases with Purchasely
+	// Purchasely.synchronize((ok) => console.log("synchronized " + ok), (e) => console.log(e));
 
-function showPresentation() {
-	Purchasely.showPresentation();
+	// Purchasely 6.0: with the per-action interceptor (interceptAction), each handler returns
+	// its own Purchasely.InterceptResult, so there is no separate "process action" step.
+	// Kept as a no-op for the example's existing button wiring.
+	console.log('processToPayment: no-op in v6 — interceptAction handlers report their own result');
 }
 
-function hidePresentation() {
-	Purchasely.hidePresentation();
+function backPresentation() {
+	Purchasely.backPresentation();
 }
 
 function closePresentation() {
@@ -416,7 +437,7 @@ function signPromotionalOffer() {
 }
 
 function openDeeplink() {
-	Purchasely.isDeeplinkHandled(
+	Purchasely.handleDeeplink(
 		"purchasely://ply/presentations/CAROUSEL",
 		isHandled => {
 			console.log("Deeplink is handled ? " + isHandled)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@purchasely/cordova-plugin-purchasely",
-  "version": "5.7.3",
+  "version": "6.0.0-rc.1",
   "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.7.3" 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="6.0.0-rc.1" 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.7.4"/>
+                <pod name="Purchasely" spec="6.0.0-rc.2"/>
             </pods>
         </podspec>
     </platform>
@@ -51,27 +51,8 @@
             <preference name="GradlePluginKotlinEnabled" value="true" />
             <preference name="GradlePluginKotlinCodeStyle" value="official" />
         </config-file>
-        <config-file parent="/manifest/application" target="AndroidManifest.xml">
-            <activity
-                android:label="PLYProductActivity"
-                android:name="cordova.plugin.purchasely.PLYProductActivity"
-                android:theme="@style/Theme.AppCompat.Light.NoActionBar">
-            </activity>
-            <activity
-                android:label="PLYSubscriptionsActivity"
-                android:name="cordova.plugin.purchasely.PLYSubscriptionsActivity"
-                android:theme="@style/Theme.AppCompat.Light.NoActionBar">
-            </activity>
-        </config-file>
         <framework src="src/android/build-extras.gradle" custom="true" type="gradleReference" />
-        <framework src="io.purchasely:core:5.7.4" />
+        <framework src="io.purchasely:core:6.0.0-rc.2" />
         <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" />
-        <source-file src="src/android/activity_ply_product_activity.xml" target-dir="res/layout"/>
-        <source-file src="src/android/activity_ply_subscriptions_activity.xml" target-dir="res/layout"/>
-        <source-file src="src/android/theme_purchasely_fullscreen.xml" target-dir="res/values"/>
-        <source-file src="src/android/theme_purchasely_fullscreen_v23_light_status_bar.xml" target-dir="res/values-v23"/>
-        <source-file src="src/android/theme_purchasely_fullscreen_v23.xml" target-dir="res/values-v23"/>
     </platform>
 </plugin>