@purchasely/cordova-plugin-purchasely 1.1.7 → 2.0.1

package/src/ios/CDVPurchasely.m

@@ -15,16 +15,16 @@
 	NSString *apiKey = [command argumentAtIndex:0];
 	NSString *userId = [command argumentAtIndex:2];
 	NSInteger logLevel = [[command argumentAtIndex:3] intValue];
-	BOOL observerMode = [[command argumentAtIndex:4] boolValue];
+	NSInteger runningMode = [[command argumentAtIndex:4] intValue];
 
-	[Purchasely startWithAPIKey:apiKey appUserId:userId observerMode:observerMode eventDelegate:nil uiDelegate:nil confirmPurchaseHandler:nil logLevel:logLevel initialized:^(BOOL initialized, NSError * _Nullable error) {
-		if (error != nil) {
-			[self failureFor:command resultString: error.localizedDescription];
-		} else {
-			[self successFor:command resultBool:initialized];
-		}
-	}];
 	[Purchasely setAppTechnology:PLYAppTechnologyCordova];
+    [Purchasely startWithAPIKey:apiKey appUserId:userId runningMode:runningMode eventDelegate:nil uiDelegate:nil paywallActionsInterceptor:nil logLevel:logLevel initialized:^(BOOL initialized, NSError * _Nullable error) {
+        if (error != nil) {
+            [self failureFor:command resultString: error.localizedDescription];
+        } else {
+            [self successFor:command resultBool:initialized];
+        }
+    }];
 }
 
 - (void)setLogLevel:(CDVInvokedUrlCommand*)command {
@@ -72,61 +72,82 @@
 
 - (void)presentPresentationWithIdentifier:(CDVInvokedUrlCommand*)command {
 	NSString *presentationVendorId = [command argumentAtIndex:0];
-
-	UIViewController *ctrl = [Purchasely presentationControllerWith:presentationVendorId completion:^(enum PLYProductViewControllerResult result, PLYPlan * _Nullable plan) {
-		NSDictionary *resultDict = [self resultDictionaryForPresentationController:result plan:plan];
-		[self successFor:command resultDict:resultDict];
-	}];
-
-	UINavigationController *navCtrl = [[UINavigationController alloc] initWithRootViewController:ctrl];
-	[navCtrl.navigationBar setTranslucent:YES];
-	[navCtrl.navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];
-	[navCtrl.navigationBar setShadowImage: [UIImage new]];
-	[navCtrl.navigationBar setTintColor: [UIColor whiteColor]];
-
-	self.presentedPresentationViewController = navCtrl;
-
-	[Purchasely showController:navCtrl type: PLYUIControllerTypeProductPage];
+    NSString *contentId = [command argumentAtIndex:1];
+    BOOL isFullscreen = [[command argumentAtIndex:2] boolValue];
+
+    UIViewController *ctrl = [Purchasely presentationControllerWith:presentationVendorId contentId:contentId loaded:nil completion:^(enum PLYProductViewControllerResult result, PLYPlan * _Nullable plan) {
+        NSDictionary *resultDict = [self resultDictionaryForPresentationController:result plan:plan];
+        [self successFor:command resultDict:resultDict];
+    }];
+
+    if (ctrl != nil) {
+        UINavigationController *navCtrl = [[UINavigationController alloc] initWithRootViewController:ctrl];
+        [navCtrl.navigationBar setTranslucent:YES];
+        [navCtrl.navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];
+        [navCtrl.navigationBar setShadowImage: [UIImage new]];
+        [navCtrl.navigationBar setTintColor: [UIColor whiteColor]];
+
+        self.presentedPresentationViewController = navCtrl;
+        
+        if (isFullscreen) {
+            navCtrl.modalPresentationStyle = UIModalPresentationFullScreen;
+        }
+        [Purchasely showController:navCtrl type: PLYUIControllerTypeProductPage];
+    }
 }
 
 - (void)presentPlanWithIdentifier:(CDVInvokedUrlCommand*)command {
 	NSString *planVendorId = [command argumentAtIndex:0];
 	NSString *presentationVendorId = [command argumentAtIndex:1];
-
-	UIViewController *ctrl = [Purchasely planControllerFor:planVendorId with:presentationVendorId completion:^(enum PLYProductViewControllerResult result, PLYPlan * _Nullable plan) {
+    NSString *contentId = [command argumentAtIndex:2];
+    BOOL isFullscreen = [[command argumentAtIndex:3] boolValue];
+    
+    UIViewController *ctrl = [Purchasely planControllerFor:planVendorId with:presentationVendorId contentId:contentId loaded:nil completion:^(enum PLYProductViewControllerResult result, PLYPlan * _Nullable plan) {
 		NSDictionary *resultDict = [self resultDictionaryForPresentationController:result plan:plan];
 		[self successFor:command resultDict:resultDict];
 	}];
 
-	UINavigationController *navCtrl = [[UINavigationController alloc] initWithRootViewController:ctrl];
-	[navCtrl.navigationBar setTranslucent:YES];
-	[navCtrl.navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];
-	[navCtrl.navigationBar setShadowImage: [UIImage new]];
-	[navCtrl.navigationBar setTintColor: [UIColor whiteColor]];
-
-	self.presentedPresentationViewController = navCtrl;
-
-	[Purchasely showController:navCtrl type: PLYUIControllerTypeProductPage];
+    if (ctrl != nil) {
+        UINavigationController *navCtrl = [[UINavigationController alloc] initWithRootViewController:ctrl];
+        [navCtrl.navigationBar setTranslucent:YES];
+        [navCtrl.navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];
+        [navCtrl.navigationBar setShadowImage: [UIImage new]];
+        [navCtrl.navigationBar setTintColor: [UIColor whiteColor]];
+        
+        self.presentedPresentationViewController = navCtrl;
+        
+        if (isFullscreen) {
+            navCtrl.modalPresentationStyle = UIModalPresentationFullScreen;
+        }
+        [Purchasely showController:navCtrl type: PLYUIControllerTypeProductPage];
+    }
 }
 
 - (void)presentProductWithIdentifier:(CDVInvokedUrlCommand*)command {
 	NSString *productVendorId = [command argumentAtIndex:0];
 	NSString *presentationVendorId = [command argumentAtIndex:1];
-
-	UIViewController *ctrl = [Purchasely productControllerFor:productVendorId with:presentationVendorId completion:^(enum PLYProductViewControllerResult result, PLYPlan * _Nullable plan) {
+    NSString *contentId = [command argumentAtIndex:2];
+    BOOL isFullscreen = [[command argumentAtIndex:3] boolValue];
+    
+    UIViewController *ctrl = [Purchasely productControllerFor:productVendorId with:presentationVendorId contentId:contentId loaded:nil completion:^(enum PLYProductViewControllerResult result, PLYPlan * _Nullable plan) {
 		NSDictionary *resultDict = [self resultDictionaryForPresentationController:result plan:plan];
 		[self successFor:command resultDict:resultDict];
 	}];
 
-	UINavigationController *navCtrl = [[UINavigationController alloc] initWithRootViewController:ctrl];
-	[navCtrl.navigationBar setTranslucent:YES];
-	[navCtrl.navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];
-	[navCtrl.navigationBar setShadowImage: [UIImage new]];
-	[navCtrl.navigationBar setTintColor: [UIColor whiteColor]];
-
-	self.presentedPresentationViewController = navCtrl;
-
-	[Purchasely showController:navCtrl type: PLYUIControllerTypeProductPage];
+    if (ctrl != nil) {
+        UINavigationController *navCtrl = [[UINavigationController alloc] initWithRootViewController:ctrl];
+        [navCtrl.navigationBar setTranslucent:YES];
+        [navCtrl.navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];
+        [navCtrl.navigationBar setShadowImage: [UIImage new]];
+        [navCtrl.navigationBar setTintColor: [UIColor whiteColor]];
+        
+        self.presentedPresentationViewController = navCtrl;
+        
+        if (isFullscreen) {
+            navCtrl.modalPresentationStyle = UIModalPresentationFullScreen;
+        }
+        [Purchasely showController:navCtrl type: PLYUIControllerTypeProductPage];
+    }
 }
 
 - (void)presentSubscriptions:(CDVInvokedUrlCommand*)command {
@@ -163,6 +184,14 @@
 	}];
 }
 
+- (void)silentRestoreAllProducts:(CDVInvokedUrlCommand*)command {
+	[Purchasely silentRestoreAllProductsWithSuccess:^{
+		[self successFor:command];
+	} failure:^(NSError * _Nonnull error) {
+		[self failureFor:command resultString:error.localizedDescription];
+	}];
+}
+
 - (void)purchasedSubscription:(CDVInvokedUrlCommand*)command {
 	self.purchasedCommand = command;
 	[[NSNotificationCenter defaultCenter] addObserver:self
@@ -249,44 +278,10 @@
 - (void)close:(CDVInvokedUrlCommand*)command {
 }
 
-- (void)setLoginTappedHandler:(CDVInvokedUrlCommand*)command {
-	self.loginTappedCommand = command;
-	[Purchasely setLoginTappedHandler:^(UIViewController * _Nonnull controller, void (^ _Nonnull closedHandler)(BOOL)) {
-		self.loginClosedHandler = closedHandler;
-
-		[self.presentedPresentationViewController dismissViewControllerAnimated:true completion:^{
-			CDVPluginResult* result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
-			[result setKeepCallbackAsBool:YES];
-			[self.commandDelegate sendPluginResult:result callbackId:self.loginTappedCommand.callbackId];
-		}];
-	}];
-}
-
-- (void)onUserLoggedIn:(CDVInvokedUrlCommand*)command {
-	BOOL userDidLogin = [[command argumentAtIndex:0] boolValue];
-
-	[Purchasely showController:self.presentedPresentationViewController type: PLYUIControllerTypeProductPage];
-	self.loginClosedHandler(userDidLogin);
-}
-
-- (void)setConfirmPurchaseHandler:(CDVInvokedUrlCommand*)command {
-	self.authorizePurchaseCommand = command;
-	[Purchasely setConfirmPurchaseHandler:^(UIViewController * _Nonnull controller, void (^ _Nonnull authorizePurchaseHandler)(BOOL)) {
-		self.authorizePurchaseHandler = authorizePurchaseHandler;
-
-		[self.presentedPresentationViewController dismissViewControllerAnimated:true completion:^{
-			CDVPluginResult* result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
-			[result setKeepCallbackAsBool:YES];
-			[self.commandDelegate sendPluginResult:result callbackId:self.authorizePurchaseCommand.callbackId];
-		}];
-	}];
-}
-
-- (void)processToPayment:(CDVInvokedUrlCommand*)command {
-	BOOL processToPayment = [[command argumentAtIndex:0] boolValue];
-
-	[Purchasely showController:self.presentedPresentationViewController type: PLYUIControllerTypeProductPage];
-	self.authorizePurchaseHandler(processToPayment);
+- (void)setLanguage:(CDVInvokedUrlCommand*)command {
+	NSString *language = [command argumentAtIndex:0];
+	NSLocale *locale = [NSLocale localeWithLocaleIdentifier:language];
+	[Purchasely setLanguageFrom:locale];
 }
 
 // Helpers
@@ -315,6 +310,99 @@
 	return productViewResult;
 }
 
+- (NSDictionary<NSString *, NSObject *> *) resultDictionaryForActionInterceptor:(PLYPresentationAction) action
+                                                                     parameters: (PLYPresentationActionParameters * _Nullable) params
+                                                              presentationInfos: (PLYPresentationInfo * _Nullable) infos {
+    NSMutableDictionary<NSString *, NSObject *> *actionInterceptorResult = [NSMutableDictionary new];
+
+    NSString* actionString;
+
+    switch (action) {
+        case PLYPresentationActionLogin:
+            actionString = @"login";
+            break;
+        case PLYPresentationActionPurchase:
+            actionString = @"purchase";
+            break;
+        case PLYPresentationActionClose:
+            actionString = @"close";
+            break;
+        case PLYPresentationActionRestore:
+            actionString = @"restore";
+            break;
+        case PLYPresentationActionNavigate:
+            actionString = @"navigate";
+            break;
+        case PLYPresentationActionPromoCode:
+            actionString = @"promo_code";
+            break;
+        case PLYPresentationActionOpenPresentation:
+            actionString = @"open_presentation";
+            break;
+    }
+
+    [actionInterceptorResult setObject:actionString forKey:@"action"];
+
+    if (infos != nil) {
+        NSMutableDictionary<NSString *, NSObject *> *infosResult = [NSMutableDictionary new];
+        if (infos.contentId != nil) {
+            [infosResult setObject:infos.contentId forKey:@"contentId"];
+        }
+        if (infos.presentationId != nil) {
+            [infosResult setObject:infos.presentationId forKey:@"presentationId"];
+        }
+        [actionInterceptorResult setObject:infosResult forKey:@"info"];
+    }
+    if (params != nil) {
+        NSMutableDictionary<NSString *, NSObject *> *paramsResult = [NSMutableDictionary new];
+        if (params.url != nil) {
+            [paramsResult setObject:params.url.absoluteString forKey:@"url"];
+        }
+        if (params.plan != nil) {
+            [paramsResult setObject:[params.plan asDictionary] forKey:@"plan"];
+        }
+        if (params.title != nil) {
+            [paramsResult setObject:params.title forKey:@"title"];
+        }
+        if (params.presentation != nil) {
+            [paramsResult setObject:params.presentation forKey:@"presentation"];
+        }
+        [actionInterceptorResult setObject:paramsResult forKey:@"parameters"];
+    }
+    
+    return actionInterceptorResult;
+}
+
+- (void)setPaywallActionInterceptor:(CDVInvokedUrlCommand*)command {
+    self.paywallActionInterceptorCommand = command;
+    [Purchasely setPaywallActionsInterceptor:^(enum PLYPresentationAction action, PLYPresentationActionParameters * _Nullable parameters, PLYPresentationInfo * _Nullable infos, void (^ _Nonnull onProcessActionHandler)(BOOL)) {
+        self.onProcessActionHandler = onProcessActionHandler;
+        NSDictionary *resultDict = [self resultDictionaryForActionInterceptor:action parameters:parameters presentationInfos:infos];
+
+        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:resultDict];
+        [pluginResult setKeepCallbackAsBool:YES];
+        [self.commandDelegate sendPluginResult:pluginResult callbackId:self.paywallActionInterceptorCommand.callbackId];
+
+    }];
+}
+
+- (void)onProcessAction:(CDVInvokedUrlCommand*)command {
+    BOOL processAction = [[command argumentAtIndex:0] boolValue];
+    if (self.onProcessActionHandler != nil) {
+        self.onProcessActionHandler(processAction);
+    }
+}
+
+- (void)closePaywall:(CDVInvokedUrlCommand*)command {
+    if (self.presentedPresentationViewController != nil) {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [self.presentedPresentationViewController dismissViewControllerAnimated:true completion:^{
+                self.presentedPresentationViewController = nil;
+            }];
+        });
+    }
+}
+
 - (void)successFor:(CDVInvokedUrlCommand *)command {
 	CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
 	[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];

package/src/ios/Hybrid/PLYPlan+Hybrid.m

@@ -25,6 +25,10 @@
 		[dict setObject:self.name forKey:@"name"];
 	}
 
+    if (self.appleProductId != nil) {
+        [dict setObject:self.appleProductId forKey:@"productId"];
+    }
+
 	NSString *price = [self localizedFullPriceWithLanguage:nil];
 	if (price != nil) {
 		[dict setObject:price forKey:@"price"];

package/www/Purchasely.js

@@ -2,8 +2,8 @@ var exec = require('cordova/exec');
 
 var defaultError = (e) => { console.log(e); }
 
-exports.startWithAPIKey = function (apiKey, stores, userId, logLevel, observerMode, success, error) {
-    exec(success, error, 'Purchasely', 'startWithAPIKey', [apiKey, stores, userId, logLevel, observerMode]);
+exports.startWithAPIKey = function (apiKey, stores, userId, logLevel, runningMode, success, error) {
+    exec(success, error, 'Purchasely', 'startWithAPIKey', [apiKey, stores, userId, logLevel, runningMode]);
 };
 
 exports.addEventsListener = function (success, error) {
@@ -46,28 +46,16 @@ exports.synchronize = function () {
     exec(() => {}, defaultError, 'Purchasely', 'synchronize', []);
 };
 
-exports.presentPresentationWithIdentifier = function (presentationId, contentId, success, error) {
-    exec(success, error, 'Purchasely', 'presentPresentationWithIdentifier', [presentationId, contentId]);
+exports.presentPresentationWithIdentifier = function (presentationId, contentId, isFullscreen, success, error) {
+    exec(success, error, 'Purchasely', 'presentPresentationWithIdentifier', [presentationId, contentId, isFullscreen]);
 };
 
-exports.presentPresentationWithIdentifier = function (presentationId, success, error) {
-    exec(success, error, 'Purchasely', 'presentPresentationWithIdentifier', [presentationId, null]);
+exports.presentProductWithIdentifier = function (productId, presentationId, contentId, isFullscreen, success, error) {
+    exec(success, error, 'Purchasely', 'presentProductWithIdentifier', [productId, presentationId, contentId, isFullscreen]);
 };
 
-exports.presentProductWithIdentifier = function (productId, presentationId, contentId, success, error) {
-    exec(success, error, 'Purchasely', 'presentProductWithIdentifier', [productId, presentationId, contentId]);
-};
-
-exports.presentProductWithIdentifier = function (productId, presentationId, success, error) {
-    exec(success, error, 'Purchasely', 'presentProductWithIdentifier', [productId, presentationId, null]);
-};
-
-exports.presentPlanWithIdentifier = function (planId, presentationId, contentId, success, error) {
-    exec(success, error, 'Purchasely', 'presentPlanWithIdentifier', [planId, presentationId, contentId]);
-};
-
-exports.presentPlanWithIdentifier = function (planId, presentationId, success, error) {
-    exec(success, error, 'Purchasely', 'presentPlanWithIdentifier', [planId, presentationId, null]);
+exports.presentPlanWithIdentifier = function (planId, presentationId, contentId, isFullscreen, success, error) {
+    exec(success, error, 'Purchasely', 'presentPlanWithIdentifier', [planId, presentationId, contentId, isFullscreen]);
 };
 
 exports.presentSubscriptions = function () {
@@ -86,6 +74,10 @@ exports.restoreAllProducts = function (success, error) {
     exec(success, error, 'Purchasely', 'restoreAllProducts', []);
 };
 
+exports.silentRestoreAllProducts = function (success, error) {
+    exec(success, error, 'Purchasely', 'silentRestoreAllProducts', []);
+};
+
 exports.purchasedSubscription = function (success, error) {
     exec(success, error, 'Purchasely', 'purchasedSubscription', []);
 };
@@ -106,26 +98,26 @@ exports.productWithIdentifier = function (productId, success) {
     exec(success, defaultError, 'Purchasely', 'productWithIdentifier', [productId]);
 };
 
-exports.setLoginTappedHandler = function (success) {
-    exec(success, defaultError, 'Purchasely', 'setLoginTappedHandler', []);
+exports.setPaywallActionInterceptor = function (success) {
+    exec(success, defaultError, 'Purchasely', 'setPaywallActionInterceptor', []);
 };
 
-exports.onUserLoggedIn = function (userLoggedIn) {
-    exec(() => {}, defaultError, 'Purchasely', 'onUserLoggedIn', [userLoggedIn]);
+exports.onProcessAction = function (processAction) {
+    exec(() => {}, defaultError, 'Purchasely', 'onProcessAction', [processAction]);
 };
 
-exports.setConfirmPurchaseHandler = function (success) {
-    exec(success, defaultError, 'Purchasely', 'setConfirmPurchaseHandler', []);
-};
-
-exports.processToPayment = function (processToPayment) {
-    exec(() => {}, defaultError, 'Purchasely', 'processToPayment', [processToPayment]);
+exports.closePaywall = function () {
+    exec(() => {}, defaultError, 'Purchasely', 'closePaywall', []);
 };
 
 exports.userSubscriptions = function (success, error) {
     exec(success, defaultError, 'Purchasely', 'userSubscriptions', []);
 };
 
+exports.setLanguage = function (language) {
+    exec(() => {}, defaultError, 'Purchasely', 'setLanguage', [language]);
+};
+
 exports.LogLevel = {
 	DEBUG: 0,
 	INFO: 1,
@@ -136,7 +128,8 @@ exports.LogLevel = {
 exports.Attribute = {
 	AMPLITUDE_SESSION_ID: 0,
 	FIREBASE_APP_INSTANCE_ID: 1,
-	AIRSHIP_CHANNEL_ID: 2
+	AIRSHIP_CHANNEL_ID: 2,
+    BATCH_INSTALLATION_ID: 3
 }
 
 exports.PurchaseResult = {
@@ -160,3 +153,22 @@ exports.PlanType = {
     nonRenewingSubscription: 3,
     unknown: 4
 }
+
+
+exports.RunningMode = {
+    transactionOnly: 0,
+    observer: 1,
+    paywallOnly: 2,
+    paywallObserver: 3,
+    full: 4
+}
+
+exports.PaywallAction = {
+    close: 'close',
+    login: 'login',
+    navigate: 'navigate',
+    purchase: 'purchase',
+    restore: 'restore',
+    open_presentation: 'open_presentation',
+    promo_code: 'promo_code',
+}

package/src/android/.idea/runConfigurations.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>