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

package/www/Purchasely.js

@@ -2,12 +2,64 @@ var exec = require('cordova/exec');
 
 var defaultError = (e) => { console.log(e); }
 
-exports.start = function (apiKey, stores, storekit1, userId, logLevel, runningMode, success, error) {
+// Normalize a presentation transition. Accepts, for source compatibility:
+//   - a display-mode string ('fullScreen'|'modal'|'drawer'|'popin'|'push'|'inlinePaywall')
+//   - a legacy boolean (true -> fullScreen, false -> modal)
+//   - a full transition object { type, dismissible?, width?, height?, backgroundColor? }
+//     where width/height are { type: 'pixel'|'percentage', value: Number } (width is
+//     popin-only, height drives drawer+popin) and backgroundColor is a hex string.
+// Always returns a transition object for the native bridge.
+function normalizeTransition(mode) {
+    if (mode === true) return { type: 'fullScreen' };
+    if (mode === false) return { type: 'modal' };
+    if (typeof mode === 'string') return { type: mode };
+    if (mode && typeof mode === 'object' && mode.type) return mode;
+    return { type: 'fullScreen' };
+}
+
+// Wire a present* command's callback stream. Purchasely 6.0 emits presentation
+// lifecycle events during display: the native side sends keep-alive envelopes
+// { event: 'presented', presentation } and { event: 'closeRequested' }, then the
+// dismiss OUTCOME (which has no `event` key) as the final, non-kept callback.
+// `callbacks` may carry onPresented(presentation, error) and onCloseRequested().
+function presentationDispatcher(success, callbacks) {
+    callbacks = callbacks || {};
+    return function (payload) {
+        if (payload && payload.event === 'presented') {
+            if (callbacks.onPresented) callbacks.onPresented(payload.presentation || null, payload.error || null);
+            return;
+        }
+        if (payload && payload.event === 'closeRequested') {
+            if (callbacks.onCloseRequested) callbacks.onCloseRequested();
+            return;
+        }
+        if (success) success(payload);
+    };
+}
+
+// Purchasely 6.0: `start` now takes a single options object instead of a
+// positional argument list. Existing positional calls are no longer supported
+// (see MIGRATION-v6.md).
+//
+// options:
+//   apiKey          (string, required)
+//   appUserId       (string, optional)
+//   logLevel        (int, optional — see Purchasely.LogLevel)
+//   runningMode     (string, optional — see Purchasely.RunningMode; defaults to observer)
+//   stores          (string[], optional — see Purchasely.Store)
+//   storeKit1       (bool, optional — iOS; true forces StoreKit 1)
+//   storekitVersion (string, optional — iOS; see Purchasely.StorekitVersion)
+//   allowDeeplink   (bool, optional)
+//   allowCampaigns  (bool, optional)
+//   deeplink        (string, optional — cold-start deeplink URL)
+exports.start = function (options, success, error) {
+    var opts = options || {};
     var cordovaSdkVersion = cordova.define.moduleMap['cordova/plugin_list'].exports['metadata']['cordova-plugin-purchasely']
     if(!cordovaSdkVersion) {
-        cordovaSdkVersion = "5.7.2";
+        cordovaSdkVersion = "6.0.0-rc.1";
     }
-    exec(success, error, 'Purchasely', 'start', [apiKey, stores, storekit1, userId, logLevel, runningMode, cordovaSdkVersion]);
+    opts.sdkVersion = cordovaSdkVersion;
+    exec(success, error, 'Purchasely', 'start', [opts]);
 };
 
 exports.addEventsListener = function (success, error) {
@@ -46,32 +98,47 @@ exports.setAttribute = function (attribute, value) {
     exec(() => {}, defaultError, 'Purchasely', 'setAttribute', [attribute, value]);
 };
 
-exports.readyToOpenDeeplink = function (isReady) {
-    exec(() => {}, defaultError, 'Purchasely', 'readyToOpenDeeplink', [isReady]);
+// Purchasely 6.0: allow (or defer) the SDK from opening deeplinks.
+exports.allowDeeplink = function (allow) {
+    exec(() => {}, defaultError, 'Purchasely', 'allowDeeplink', [allow]);
 };
 
-exports.setDefaultPresentationResultHandler = function (success, error) {
-    exec(success, error, 'Purchasely', 'setDefaultPresentationResultHandler', []);
+// Purchasely 6.0: allow (or defer) the SDK from displaying campaign deeplinks.
+exports.allowCampaigns = function (allow) {
+    exec(() => {}, defaultError, 'Purchasely', 'allowCampaigns', [allow]);
 };
 
-exports.synchronize = function () {
-    exec(() => {}, defaultError, 'Purchasely', 'synchronize', []);
+exports.setDefaultPresentationDismissHandler = function (success, error) {
+    exec(success, error, 'Purchasely', 'setDefaultPresentationDismissHandler', []);
 };
 
-exports.presentPresentationWithIdentifier = function (presentationId, contentId, isFullscreen, success, error) {
-    exec(success, error, 'Purchasely', 'presentPresentationWithIdentifier', [presentationId, contentId, isFullscreen]);
+// Purchasely 6.0: stop receiving default (campaign/deeplink) presentation dismiss outcomes.
+exports.removeDefaultPresentationDismissHandler = function () {
+    exec(() => {}, defaultError, 'Purchasely', 'removeDefaultPresentationDismissHandler', []);
 };
 
-exports.presentPresentationForPlacement = function (placementId, contentId, isFullscreen, success, error) {
-    exec(success, error, 'Purchasely', 'presentPresentationForPlacement', [placementId, contentId, isFullscreen]);
+// Purchasely 6.0: synchronize now reports completion. success receives true on
+// success; error is invoked on failure (previously fire-and-forget).
+exports.synchronize = function (success, error) {
+    exec(success || (() => {}), error || defaultError, 'Purchasely', 'synchronize', []);
 };
 
-exports.presentProductWithIdentifier = function (productId, presentationId, contentId, isFullscreen, success, error) {
-    exec(success, error, 'Purchasely', 'presentProductWithIdentifier', [productId, presentationId, contentId, isFullscreen]);
+// present* methods: `displayMode` accepts a mode string, a legacy boolean, or a
+// full transition object (see normalizeTransition). `callbacks` is optional and
+// may carry { onPresented(presentation, error), onCloseRequested() }; `success`
+// still receives the final dismiss outcome.
+exports.presentPresentationWithIdentifier = function (presentationId, contentId, displayMode, success, error, callbacks) {
+    exec(presentationDispatcher(success, callbacks), error, 'Purchasely', 'presentPresentationWithIdentifier', [presentationId, contentId, normalizeTransition(displayMode)]);
 };
 
-exports.presentPlanWithIdentifier = function (planId, presentationId, contentId, isFullscreen, success, error) {
-    exec(success, error, 'Purchasely', 'presentPlanWithIdentifier', [planId, presentationId, contentId, isFullscreen]);
+exports.presentPresentationForPlacement = function (placementId, contentId, displayMode, success, error, callbacks) {
+    exec(presentationDispatcher(success, callbacks), error, 'Purchasely', 'presentPresentationForPlacement', [placementId, contentId, normalizeTransition(displayMode)]);
+};
+
+// Purchasely 6.0: present the default (audience-targeted) presentation, with no
+// placement or presentation id (mirrors the native default presentation source).
+exports.presentPresentationForDefault = function (contentId, displayMode, success, error, callbacks) {
+    exec(presentationDispatcher(success, callbacks), error, 'Purchasely', 'presentPresentationForDefault', [contentId, normalizeTransition(displayMode)]);
 };
 
 exports.fetchPresentation = function (presentationId, contentId, success, error) {
@@ -82,12 +149,13 @@ exports.fetchPresentationForPlacement = function (placementId, contentId, succes
     exec(success, error, 'Purchasely', 'fetchPresentation', [placementId, null, contentId]);
 };
 
-exports.presentPresentation = function (presentation, isFullscreen, backgroundColor,success, error) {
-    exec(success, error, 'Purchasely', 'presentPresentation', [presentation, isFullscreen, backgroundColor]);
+// Purchasely 6.0: fetch the default (audience-targeted) presentation.
+exports.fetchPresentationForDefault = function (contentId, success, error) {
+    exec(success, error, 'Purchasely', 'fetchPresentation', [null, null, contentId]);
 };
 
-exports.presentSubscriptions = function () {
-    exec(() => {}, defaultError, 'Purchasely', 'presentSubscriptions', []);
+exports.presentPresentation = function (presentation, displayMode, backgroundColor, success, error, callbacks) {
+    exec(presentationDispatcher(success, callbacks), error, 'Purchasely', 'presentPresentation', [presentation, normalizeTransition(displayMode), backgroundColor]);
 };
 
 exports.purchaseWithPlanVendorId = function (planId, offerId, contentId, success, error) {
@@ -106,8 +174,9 @@ exports.purchasedSubscription = function (success, error) {
     exec(success, error, 'Purchasely', 'purchasedSubscription', []);
 };
 
-exports.isDeeplinkHandled = function (deepLink, success, error) {
-    exec(success, error, 'Purchasely', 'isDeeplinkHandled', [deepLink]);
+// Purchasely 6.0: returns whether the deeplink was handled by Purchasely.
+exports.handleDeeplink = function (deepLink, success, error) {
+    exec(success, error, 'Purchasely', 'handleDeeplink', [deepLink]);
 };
 
 exports.allProducts = function (success, error) {
@@ -122,12 +191,53 @@ exports.productWithIdentifier = function (productId, success) {
     exec(success, defaultError, 'Purchasely', 'productWithIdentifier', [productId]);
 };
 
-exports.setPaywallActionInterceptor = function (success) {
-    exec(success, defaultError, 'Purchasely', 'setPaywallActionInterceptor', []);
-};
+// Purchasely 6.0: per-action interceptor. Registers a handler for a single
+// action kind (see Purchasely.PresentationAction). The handler receives
+// (info, parameters) and returns — or resolves to — a Purchasely.InterceptResult
+// ('success' | 'failed' | 'notHandled'). Registering a kind again replaces its
+// handler. This maps 1:1 onto the native v6 SDK, which intercepts per action.
+var _actionInterceptors = {}; // kind -> true (registered)
 
-exports.onProcessAction = function (processAction) {
-    exec(() => {}, defaultError, 'Purchasely', 'onProcessAction', [processAction]);
+function normalizeInterceptResult(result) {
+    if (result === 'success' || result === 'failed' || result === 'notHandled') return result;
+    return 'notHandled';
+}
+
+exports.interceptAction = function (kind, handler) {
+    exports.removeActionInterceptor(kind);
+    _actionInterceptors[kind] = true;
+    exec(function (event) {
+        // Native registers one interceptor per kind, so events only arrive for
+        // this kind; guard anyway. `callbackId` ties the async reply back to the
+        // exact intercepted invocation, so concurrent intercepts never clobber.
+        if (!event || event.action !== kind) return;
+        Promise.resolve()
+            .then(function () { return handler(event.info || null, event.parameters || null); })
+            .then(function (result) {
+                exec(function () {}, defaultError, 'Purchasely', 'completeActionInterceptor',
+                    [event.callbackId, normalizeInterceptResult(result)]);
+            })
+            .catch(function () {
+                exec(function () {}, defaultError, 'Purchasely', 'completeActionInterceptor',
+                    [event.callbackId, 'failed']);
+            });
+    }, defaultError, 'Purchasely', 'registerActionInterceptor', [kind]);
+};
+
+// Purchasely 6.0: stop intercepting a single action kind.
+exports.removeActionInterceptor = function (kind, success, error) {
+    delete _actionInterceptors[kind];
+    exec(function () {}, defaultError, 'Purchasely', 'unregisterActionInterceptor', [kind]);
+    if (success) setTimeout(success, 0);
+};
+
+// Purchasely 6.0: stop intercepting every registered action kind.
+exports.removeAllActionInterceptors = function (success, error) {
+    Object.keys(_actionInterceptors).forEach(function (kind) {
+        delete _actionInterceptors[kind];
+        exec(function () {}, defaultError, 'Purchasely', 'unregisterActionInterceptor', [kind]);
+    });
+    if (success) setTimeout(success, 0);
 };
 
 exports.userDidConsumeSubscriptionContent = function () {
@@ -146,18 +256,16 @@ exports.setLanguage = function (language) {
     exec(() => {}, defaultError, 'Purchasely', 'setLanguage', [language]);
 };
 
-exports.showPresentation = function () {
-    exec(() => {}, defaultError, 'Purchasely', 'showPresentation', []);
-};
-
-exports.hidePresentation = function () {
-    exec(() => {}, defaultError, 'Purchasely', 'hidePresentation', []);
-};
-
+// Purchasely 6.0: close the displayed presentation.
 exports.closePresentation = function () {
     exec(() => {}, defaultError, 'Purchasely', 'closePresentation', []);
 };
 
+// Purchasely 6.0: navigate back within the displayed presentation.
+exports.backPresentation = function () {
+    exec(() => {}, defaultError, 'Purchasely', 'backPresentation', []);
+};
+
 exports.setUserAttributeWithString = function (key, value, processLegalBasis) {
     exec(() => {}, defaultError, 'Purchasely', 'setUserAttributeWithString', [key, value, processLegalBasis]);
 };
@@ -297,12 +405,15 @@ exports.PlanType = {
     unknown: 4
 }
 
+// Purchasely 6.0: running mode is passed by name (the native iOS and Android
+// enums use different raw values). Native 6.0 exposes only observer and full.
 exports.RunningMode = {
-    paywallObserver: 2,
-    full: 3
+    observer: 'observer',
+    full: 'full'
 }
 
-exports.PaywallAction = {
+// Purchasely 6.0: the paywall action kinds handled by interceptAction.
+exports.PresentationAction = {
     close: 'close',
     close_all: 'close_all',
     login: 'login',
@@ -315,6 +426,63 @@ exports.PaywallAction = {
     web_checkout: 'web_checkout'
 }
 
+// Purchasely 6.0: result returned by an interceptAction handler after handling
+// an intercepted paywall action.
+exports.InterceptResult = {
+    success: 'success',
+    failed: 'failed',
+    notHandled: 'notHandled'
+}
+
+// Purchasely 6.0: the type of a fetched presentation.
+exports.PresentationType = {
+    normal: 0,
+    fallback: 1,
+    deactivated: 2,
+    client: 3
+}
+
+// Purchasely 6.0: why a presentation closed (delivered in the dismiss outcome).
+// Matches the native PLYCloseReason wire contract (identical to the Flutter
+// PLYCloseReason enum): `button`, `back_system`, `programmatic`. Android emits
+// these directly; on iOS a swipe/interactive dismiss maps to `back_system`, and
+// a close with no dismiss reason (e.g. after a purchase) omits the key.
+exports.CloseReason = {
+    button: 'button',
+    backSystem: 'back_system',
+    programmatic: 'programmatic'
+}
+
+// Purchasely 6.0: presentation display mode, passed in place of the former
+// `isFullscreen` boolean to the present* methods.
+exports.TransitionType = {
+    fullScreen: 'fullScreen',
+    modal: 'modal',
+    drawer: 'drawer',
+    popin: 'popin',
+    push: 'push',
+    inlinePaywall: 'inlinePaywall'
+}
+
+// Purchasely 6.0: sizing unit for drawer/popin display modes.
+exports.DimensionType = {
+    pixel: 'pixel',
+    percentage: 'percentage'
+}
+
+// Purchasely 6.0: stores that can be enabled at start.
+exports.Store = {
+    google: 'Google',
+    huawei: 'Huawei',
+    amazon: 'Amazon'
+}
+
+// Purchasely 6.0: StoreKit version selection (iOS).
+exports.StorekitVersion = {
+    storeKit1: 'storeKit1',
+    storeKit2: 'storeKit2'
+}
+
 exports.ThemeMode = {
 	light: 0,
 	dark: 1,
@@ -324,4 +492,4 @@ exports.ThemeMode = {
 exports.UserAttributeAction = {
     ADD: 'add',
     REMOVE: 'remove'
-}
+}

package/src/android/PLYProductActivity.kt

@@ -1,168 +0,0 @@
-package cordova.plugin.purchasely
-
-import android.app.Activity
-import android.content.Intent
-import android.graphics.Color
-import android.os.Bundle
-import android.view.View
-import android.widget.FrameLayout
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.WindowCompat
-import cordova.plugin.purchasely.PurchaselyPlugin.ProductActivity
-import io.purchasely.ext.PLYPresentation
-import io.purchasely.ext.PLYPresentationProperties
-import io.purchasely.ext.PLYProductViewResult
-import io.purchasely.ext.Purchasely
-import io.purchasely.models.PLYPlan
-import io.purchasely.views.parseColor
-import java.lang.ref.WeakReference
-import android.view.WindowManager
-
-class PLYProductActivity : AppCompatActivity() {
-
-    private var presentationId: String? = null
-    private var placementId: String? = null
-    private var productId: String? = null
-    private var planId: String? = null
-    private var contentId: String? = null
-
-    private var presentation: PLYPresentation? = null
-
-    private var isFullScreen: Boolean = false
-    private var backgroundColor: String? = null
-
-    private var paywallView: View? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        isFullScreen = intent.extras?.getBoolean("isFullScreen") ?: false
-        backgroundColor = intent.extras?.getString("background_color")
-
-        if(isFullScreen) {
-            WindowCompat.setDecorFitsSystemWindows(window, false)
-            window.setFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS, WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
-        }
-
-        val package_name = application.packageName
-
-        setContentView(
-            application.resources
-                .getIdentifier(
-                    "activity_ply_product_activity",
-                    "layout",
-                    package_name
-                )
-        )
-
-        val container = findViewById<View>(
-            resources.getIdentifier(
-                "container",
-                "id",
-                package_name
-            )
-        ) as FrameLayout
-
-        try {
-            val loadingBackgroundColor = backgroundColor.parseColor(Color.WHITE)
-            container.setBackgroundColor(loadingBackgroundColor)
-        } catch (e: Exception) {
-            //do nothing
-        }
-
-        presentationId = intent.extras?.getString("presentationId")
-        placementId = intent.extras?.getString("placementId")
-        productId = intent.extras?.getString("productId")
-        planId = intent.extras?.getString("planId")
-        contentId = intent.extras?.getString("contentId")
-
-        presentation = intent.extras?.getParcelable("presentation")
-
-        paywallView = if(presentation != null) {
-            presentation?.buildView(this, properties = PLYPresentationProperties(onClose = {
-                container.removeAllViews()
-                supportFinishAfterTransition()
-            }), callback)
-        } else {
-            Purchasely.presentationView(
-                context = this@PLYProductActivity,
-                properties = PLYPresentationProperties(
-                    placementId = placementId,
-                    contentId = contentId,
-                    presentationId = presentationId,
-                    planId = planId,
-                    productId = productId,
-                    onLoaded = { isLoaded ->
-                        if(!isLoaded) return@PLYPresentationProperties
-
-                        val backgroundPaywall = paywallView?.findViewById<FrameLayout>(io.purchasely.R.id.content)?.background
-                        if(backgroundPaywall != null) {
-                            container.background = backgroundPaywall
-                        }
-                    },
-                    onClose = {
-                        container.removeAllViews()
-                        supportFinishAfterTransition()
-                    }
-                ),
-                callback = callback
-            )
-        }
-
-        if(paywallView == null) {
-            finish()
-            return
-        }
-
-        container.addView(paywallView)
-    }
-
-    override fun onStart() {
-        super.onStart()
-
-        val productActivity = ProductActivity()
-        productActivity.presentation = presentation
-        productActivity.presentationId = presentationId
-        productActivity.placementId = placementId
-        productActivity.productId = productId
-        productActivity.planId = planId
-        productActivity.contentId = contentId
-        productActivity.isFullScreen = isFullScreen
-        productActivity.loadingBackgroundColor = backgroundColor
-        productActivity.activity = WeakReference(this)
-        PurchaselyPlugin.productActivity = productActivity
-    }
-
-    private val callback: (PLYProductViewResult, PLYPlan?) -> Unit = { result, plan ->
-        PurchaselyPlugin.sendPurchaseResult(
-            result,
-            plan
-        )
-        //supportFinishAfterTransition()
-    }
-
-    companion object {
-        @JvmStatic
-        fun newIntent(activity: Activity?,
-                      properties: PLYPresentationProperties = PLYPresentationProperties(),
-                      isFullScreen: Boolean = false,
-                      backgroundColor: String? = null) = Intent(activity, PLYProductActivity::class.java).apply {
-            //remove old activity if still referenced to avoid issues
-            val oldActivity = PurchaselyPlugin.productActivity?.activity?.get()
-            oldActivity?.finish()
-            PurchaselyPlugin.productActivity?.activity = null
-            PurchaselyPlugin.productActivity = null
-            //flags = Intent.FLAG_ACTIVITY_NEW_TASK xor Intent.FLAG_ACTIVITY_MULTIPLE_TASK
-
-            putExtra("background_color", backgroundColor)
-            putExtra("isFullScreen", isFullScreen)
-
-            putExtra("presentationId", properties.presentationId)
-            putExtra("contentId", properties.contentId)
-            putExtra("placementId", properties.placementId)
-            putExtra("productId", properties.productId)
-            putExtra("planId", properties.planId)
-        }
-    }
-
-}

package/src/android/PLYSubscriptionsActivity.java

@@ -1,37 +0,0 @@
-package cordova.plugin.purchasely;
-
-import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
-
-import io.purchasely.ext.Purchasely;
-
-public class PLYSubscriptionsActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        String package_name = getApplication().getPackageName();
-        setContentView(getApplication().getResources()
-                .getIdentifier("activity_ply_subscriptions_activity",
-                        "layout",
-                        package_name)
-        );
-
-        getSupportFragmentManager()
-                .beginTransaction()
-                .addToBackStack(null)
-                .replace(getApplication().getResources()
-                .getIdentifier("fragmentContainer",
-                        "id",
-                        package_name), Purchasely.subscriptionsFragment(), "SubscriptionsFragment")
-                .commitAllowingStateLoss();
-
-        getSupportFragmentManager().addOnBackStackChangedListener(() -> {
-            if(getSupportFragmentManager().getBackStackEntryCount() == 0) {
-                supportFinishAfterTransition();
-            }
-        });
-    }
-}

package/src/android/activity_ply_product_activity.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" />

package/src/android/activity_ply_subscriptions_activity.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.fragment.app.FragmentContainerView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/fragmentContainer"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" />

package/src/android/theme_purchasely_fullscreen.xml

@@ -1,6 +0,0 @@
-<resources>
-    <style name="Theme.Purchasely.Fullscreen" parent="Theme.AppCompat.Light.NoActionBar">
-      <item name="android:navigationBarColor">@android:color/transparent</item>
-      <item name="android:statusBarColor">@android:color/transparent</item>
-    </style>
-</resources>

package/src/android/theme_purchasely_fullscreen_v23.xml

@@ -1,6 +0,0 @@
-<resources>
-    <style name="Theme.Purchasely.Fullscreen" parent="Theme.AppCompat.Light.NoActionBar">
-      <item name="android:navigationBarColor">@android:color/transparent</item>
-      <item name="android:statusBarColor">@android:color/transparent</item>
-    </style>
-</resources>

package/src/android/theme_purchasely_fullscreen_v23_light_status_bar.xml

@@ -1,7 +0,0 @@
-<resources>
-    <style name="Theme.Purchasely.Fullscreen.Light" parent="Theme.AppCompat.Light.NoActionBar">
-      <item name="android:navigationBarColor">@android:color/transparent</item>
-      <item name="android:statusBarColor">@android:color/transparent</item>
-      <item name="android:windowLightStatusBar">true</item>
-    </style>
-</resources>