cordova-plugin-insider 1.3.0 → 1.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-insider",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "description": "A plugin that you can use Insider SDK with Cordova and Ionic",
   "cordova_name": "Insider Cordova Plugin",
   "cordova": {

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="cordova-plugin-insider" version="1.3.0" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
+<plugin id="cordova-plugin-insider" version="1.5.0" xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android">
     <name>Insider</name>
     <description>Insider Cordova Plugin</description>
     <keywords>insider,cordova,cordova-ios,cordova-android</keywords>
@@ -28,9 +28,8 @@
     <platform name="android">
         <framework src="src/android/build-extras.gradle" custom="true" type="gradleReference" />
 
-    <hook type="before_plugin_uninstall" src="hooks/before_plugin_uninstall.js"/>
-    <hook type="after_plugin_install" src="hooks/after_plugin_install.js"/>
-
+        <hook type="before_plugin_uninstall" src="hooks/before_plugin_uninstall.js"/>
+        <hook type="after_plugin_install" src="hooks/after_plugin_install.js"/>
 
         <config-file target="config.xml" parent="/*">
             <preference name="GradlePluginGoogleServicesEnabled" value="true" />
@@ -71,8 +70,9 @@
                 <source url="https://cdn.cocoapods.org/" />
             </config>
             <pods use-frameworks="true">
-                <pod name="InsiderMobile" spec="12.5.2" />
-                <pod name="InsiderHybrid" spec="1.2.1" />
+                <pod name="InsiderMobile" spec="12.8.6" />
+                <pod name="InsiderGeofence" spec="1.0.3" />
+                <pod name="InsiderHybrid" spec="1.4.0" />
             </pods>
         </podspec>
 

package/src/android/Constants.java

@@ -38,4 +38,5 @@ class Constants {
     static final String VOUCHER_DISCOUNT = "voucher_discount";
     static final String PROMOTION_NAME = "promotion_name";
     static final String PROMOTION_DISCOUNT = "promotion_discount";
+    static final String GROUP_CODE = "groupcode";
 }

package/src/android/InsiderPlugin.java

@@ -87,7 +87,6 @@ public class InsiderPlugin extends CordovaPlugin {
                         }
                     });
 
-                    Insider.Instance.handleHybridIntent();
                     Insider.Instance.storePartnerName(partnerName);
                 }
             });
@@ -115,8 +114,6 @@ public class InsiderPlugin extends CordovaPlugin {
                 init(args.getString(0), args.getString(1));
             } else if (action.equals("setGDPRConsent")) {
                 Insider.Instance.setGDPRConsent(Boolean.parseBoolean(args.getString(0)));
-            } else if (action.equals("enableIDFACollection")) {
-                Insider.Instance.enableIDFACollection(Boolean.parseBoolean(args.getString(0)));
             } else if (action.equals("startTrackingGeofence")) {
                 cordova.getThreadPool().execute(new Runnable() {
                     @Override
@@ -273,6 +270,32 @@ public class InsiderPlugin extends CordovaPlugin {
                         }
                     }
                 });
+            } else if (action.equals("getSmartRecommendationWithProductIDs")) {
+                if (args.get(0) == null || args.get(1) == null || args.get(2) == null || args.get(3) == null)
+                    return false;
+
+                cordova.getThreadPool().execute(new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            String[] productIDs = (CDVUtils.convertJSONToArrayList(args.get(0).toString())).toArray(new String[0]);
+
+                            Insider.Instance.getSmartRecommendationWithProductIDs(productIDs,
+                                    args.getInt(1),
+                                    args.getString(2),
+                                    args.getString(3),
+                                    new RecommendationEngine.SmartRecommendation() {
+                                        @Override
+                                        public void loadRecommendationData(JSONObject jsonObject) {
+                                            callbackSuccess(callbackContext, jsonObject.toString());
+                                        }
+                                    });
+                        } catch (JSONException e) {
+                            callbackFailure(callbackContext, "ERROR:" + e.toString());
+                            e.printStackTrace();
+                        }
+                    }
+                });
             } else if (action.equals(InsiderHybridMethods.CLICK_SMART_RECOMMENDATION_PRODUCT)) {
                 if (args.get(0) == null || args.get(1) == null || args.get(2) == null)
                     return false;
@@ -770,6 +793,9 @@ public class InsiderPlugin extends CordovaPlugin {
                     case Constants.PROMOTION_DISCOUNT:
                         product.setPromotionDiscount((double) value);
                         break;
+                    case Constants.GROUP_CODE:
+                        product.setGroupCode((String) value);
+                        break;
                     default:
                         setProductCustomAttribute(product, entry.getKey(), value);
                         break;

package/src/android/build-extras.gradle

@@ -11,16 +11,13 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 1
-        versionName "1.0"
-        manifestPlaceholders = [ partner: "partner_name" ]
         multiDexEnabled true
     }
 }
 
 dependencies {
-    implementation 'com.useinsider:insider:13.4.2'
-    implementation 'com.useinsider:insiderhybrid:1.1.4'
+    implementation 'com.useinsider:insider:13.8.5'
+    implementation 'com.useinsider:insiderhybrid:1.1.6'
 
     implementation 'com.fasterxml.jackson.core:jackson-core:2.12.4'
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.12.4'
@@ -30,9 +27,11 @@ dependencies {
 
     implementation 'com.google.android.gms:play-services-location:20.0.0'
     implementation 'com.google.firebase:firebase-messaging:23.0.5'
-    implementation 'com.google.android.gms:play-services-ads:16.0.0'
+    implementation 'com.google.android.play:core-ktx:1.8.1'
 
     implementation 'com.huawei.hms:push:6.5.0.300'
     implementation 'com.huawei.hms:ads-identifier:3.4.39.302'
     implementation 'com.huawei.hms:location:6.4.0.300'
+    
+    implementation 'androidx.security:security-crypto:1.0.0'
 }

package/src/ios/InsiderPlugin.h

@@ -1,6 +1,7 @@
 #import <InsiderMobile/Insider.h>
 #import <InsiderHybrid/InsiderHybrid.h>
 #import <InsiderMobile/InsiderCallbackTypeEnum.h>
+#import <InsiderGeofence/InsiderGeofence.h>
 #import "IDFAHelper.h"
 #import <UserNotifications/UserNotifications.h>
 
@@ -30,6 +31,7 @@
 - (void) cartCleared:(CDVInvokedUrlCommand *)command;
 - (void) getSmartRecommendation:(CDVInvokedUrlCommand *)command;
 - (void) getSmartRecommendationWithProduct:(CDVInvokedUrlCommand *)command;
+- (void) getSmartRecommendationWithProductIDs:(CDVInvokedUrlCommand *)command;
 - (void) clickSmartRecommendationProduct:(CDVInvokedUrlCommand *)command;
 - (void) getMessageCenterData:(CDVInvokedUrlCommand *)command;
 - (void) setGender:(CDVInvokedUrlCommand *)command;

package/src/ios/InsiderPlugin.m

@@ -62,41 +62,47 @@
     }
 }
 
--(void)registerCallback:(NSDictionary *)notfDict {
+-(void)registerCallback:(NSDictionary *)callbackDictionary {
     @try {
-        if (!notfDict || [notfDict count] == 0)
+        if (!callbackDictionary || [callbackDictionary count] == 0)
             return;
-        InsiderCallbackType type = (InsiderCallbackType)[[notfDict objectForKey:@"type"] intValue];
-        NSString* notfData = [InsiderHybrid dictToJson:notfDict];
+        InsiderCallbackType type = (InsiderCallbackType)[[callbackDictionary objectForKey:@"type"] intValue];
+        NSString* callbackData = [InsiderHybrid dictToJson:callbackDictionary];
 
         NSString *js;
         switch (type) {
             case InsiderCallbackTypeNotificationOpen:{
-                NSString * data = [NSString stringWithFormat:@"{""action"":'NOTIFICATION_OPEN',""result"":""%@""}", notfData];
+                NSString * data = [NSString stringWithFormat:@"{""action"":'NOTIFICATION_OPEN',""result"":""%@""}", callbackData];
                 js = [NSString stringWithFormat:@"cordova.fireDocumentEvent('ins_notification_handle',%@);", data];
                 [self.commandDelegate evalJs:js];
                 break;
             }
             case InsiderCallbackTypeInappButtonClick:{
-                NSString * data = [NSString stringWithFormat:@"{""action"":'INAPP_BUTTON_CLICK',""result"":""%@""}", notfData];
+                NSString * data = [NSString stringWithFormat:@"{""action"":'INAPP_BUTTON_CLICK',""result"":""%@""}", callbackData];
                 js = [NSString stringWithFormat:@"cordova.fireDocumentEvent('ins_notification_handle',%@);", data];
                 [self.commandDelegate evalJs:js];
                 break;
             }
             case InsiderCallbackTypeTempStorePurchase:{
-                NSString * data = [NSString stringWithFormat:@"{""action"":'TEMP_STORE_PURCHASE',""result"":""%@""}", notfData];
+                NSString * data = [NSString stringWithFormat:@"{""action"":'TEMP_STORE_PURCHASE',""result"":""%@""}", callbackData];
                 js = [NSString stringWithFormat:@"cordova.fireDocumentEvent('ins_notification_handle',%@);", data];
                 [self.commandDelegate evalJs:js];
                 break;
             }
             case InsiderCallbackTypeTempStoreAddedToCart:{
-                NSString * data = [NSString stringWithFormat:@"{""action"":'TEMP_STORE_ADDED_TO_CART',""result"":""%@""}", notfData];
+                NSString * data = [NSString stringWithFormat:@"{""action"":'TEMP_STORE_ADDED_TO_CART',""result"":""%@""}", callbackData];
                 js = [NSString stringWithFormat:@"cordova.fireDocumentEvent('ins_notification_handle',%@);", data];
                 [self.commandDelegate evalJs:js];
                 break;
             }
             case InsiderCallbackTypeTempStoreCustomAction:{
-                NSString * data = [NSString stringWithFormat:@"{""action"":'TEMP_STORE_CUSTOM_ACTION',""result"":""%@""}", notfData];
+                NSString * data = [NSString stringWithFormat:@"{""action"":'TEMP_STORE_CUSTOM_ACTION',""result"":""%@""}", callbackData];
+                js = [NSString stringWithFormat:@"cordova.fireDocumentEvent('ins_notification_handle',%@);", data];
+                [self.commandDelegate evalJs:js];
+                break;
+            }
+            case InsiderCallbackTypeInAppSeen:{
+                NSString * data = [NSString stringWithFormat:@"{""action"":'INAPP_SEEN',""result"":""%@""}", callbackData];
                 js = [NSString stringWithFormat:@"cordova.fireDocumentEvent('ins_notification_handle',%@);", data];
                 [self.commandDelegate evalJs:js];
                 break;
@@ -138,7 +144,7 @@
 - (void) startTrackingGeofence:(CDVInvokedUrlCommand *)command {
     @try {
         [self.commandDelegate runInBackground:^{
-            [Insider startTrackingGeofence];
+            [InsiderGeofence startTracking];
             [self sendSuccessResultWithString:@"SUCCESS" andCommand:command];
         }];
     } @catch (NSException *exception) {
@@ -390,6 +396,20 @@
     }
 }
 
+- (void)getSmartRecommendationWithProductIDs:(CDVInvokedUrlCommand *)command {
+    @try {
+        [self.commandDelegate runInBackground:^{
+            if (![command.arguments objectAtIndex:0] || ![command.arguments objectAtIndex:1] || ![command.arguments objectAtIndex:2] || ![command.arguments objectAtIndex:3]) return;
+
+            [Insider getSmartRecommendationWithProductIDs:[command.arguments objectAtIndex:0] recommendationID:[[command.arguments objectAtIndex:1] intValue] locale:[command.arguments objectAtIndex:2]  currency:[command.arguments objectAtIndex:3] smartRecommendation:^(NSDictionary *recommendation) {
+                [self sendSuccessResultWithDictionary:recommendation andCommand:command];
+            }];
+        }];
+    } @catch (NSException *e) {
+        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
+    }
+}
+
 - (void)clickSmartRecommendationProduct:(CDVInvokedUrlCommand *)command {
     @try {
         dispatch_async(dispatch_get_main_queue(), ^{

package/types/InsiderPlugin.d.ts

@@ -19,6 +19,7 @@ interface InsiderPlugin {
     getMessageCenterData(limit: number, startDate: Date, endDate: Date): Promise <any>;
     getSmartRecommendation(recommendationID: number, locale: string, currency: string): Promise <any>;
     getSmartRecommendationWithProduct(product: object, recommendationID: number, locale: string): Promise <any>;
+    getSmartRecommendationWithProductIDs(product: Array<string>, recommendationID: number, locale: string): Promise <any>;
     clickSmartRecommendationProduct(product: object, recommendationID: number);
     getContentStringWithName(variableName: string, defaultValue: any, contentOptimizerDataType: number): Promise <any>;
     getContentBoolWithName(variableName: string, defaultValue: boolean, contentOptimizerDataType: number): Promise <any>;

package/types/Product.d.ts

@@ -9,6 +9,7 @@ export interface Product {
     setPromotionDiscount(promotionDiscount: number):Product;
     setStock(setStock: number):Product;
     setQuantity(quantity: number):Product;
+    setGroupCode(groupCode: string):Product;
     setCustomAttributeWithString(key: string, value: string):Product;
     setCustomAttributeWithInt(key: string, value: number):Product;
     setCustomAttributeWithBoolean(key: string, value: boolean):Product;

package/www/CallbackType.js

@@ -4,4 +4,5 @@ module.exports = {
     TEMP_STORE_PURCHASE: 2,
     TEMP_STORE_ADDED_TO_CART: 3,
     TEMP_STORE_CUSTOM_ACTION: 4,
+    INAPP_SEEN: 5,
 };

package/www/Constants.js

@@ -42,6 +42,7 @@ module.exports = {
     GET_MESSAGE_CENTER_DATA: 'getMessageCenterData',
     GET_SMART_RECOMMENDATION: 'getSmartRecommendation',
     GET_SMART_RECOMMENDATION_WITH_PRODUCT: 'getSmartRecommendationWithProduct',
+    GET_SMART_RECOMMENDATION_WITH_PRODUCT_IDS: 'getSmartRecommendationWithProductIDs',
     CLICK_SMART_RECOMMENDATION_PRODUCT: 'clickSmartRecommendationProduct',
     GET_CONTENT_STRING_WITH_NAME: 'getContentStringWithName',
     GET_CONTENT_BOOL_WITH_NAME: 'getContentBoolWithName',
@@ -76,11 +77,12 @@ module.exports = {
     VOUCHER_DISCOUNT: 'voucher_discount',
     PROMOTION_NAME: 'promotion_name',
     PROMOTION_DISCOUNT: 'promotion_discount',
+    GROUP_CODE: 'groupcode',
     // Error
     PUT_ERROR_LOG: 'putErrorLog',
     // Platform
     ANDROID: 'android',
     IOS: 'ios',
     // SDK Version
-    SDK_VERSION: 'CDV-1.3.0',
+    SDK_VERSION: 'CDV-1.5.0',
 };

package/www/Event.js

@@ -12,7 +12,10 @@ class Event {
     }
 
     addParameterWithString(key, value) {
-        if (key === null || value === null || Utils.isEmpty(key) || Utils.isEmpty(value)){ Utils.showWarning(this.constructor.name + '-addParameterWithString key or value'); return this;}
+        if (Utils.checkParameters([{ type: 'string', value: key }, { type: 'string', value: value }])) {
+            Utils.showParameterWarningLog(this.constructor.name + '-addParameterWithString');
+            return this;
+        }
 
         try {
             this.parameters[key] = value;
@@ -24,7 +27,10 @@ class Event {
     }
 
     addParameterWithInt(key, value) {
-        if (key === null || value === null || Utils.isEmpty(key) || Utils.isEmpty(value)){ Utils.showWarning(this.constructor.name + '-addParameterWithInt key or value'); return this;}
+        if (Utils.checkParameters([{ type: 'string', value: key }, { type: 'number', value: value }])) {
+            Utils.showParameterWarningLog(this.constructor.name + '-addParameterWithInt');
+            return this;
+        }
 
         try {
             this.parameters[key] = value;
@@ -36,7 +42,10 @@ class Event {
     }
 
     addParameterWithDouble(key, value) {
-        if (key === null || value === null || Utils.isEmpty(key) || Utils.isEmpty(value)){ Utils.showWarning(this.constructor.name + '-addParameterWithDouble key or value'); return this;}
+        if (Utils.checkParameters([{ type: 'string', value: key }, { type: 'number', value: value }])) {
+            Utils.showParameterWarningLog(this.constructor.name + '-addParameterWithDouble');
+            return this;
+        }
 
         try {
             this.parameters[key] = value;
@@ -48,7 +57,10 @@ class Event {
     }
 
     addParameterWithBoolean(key, value) {
-        if (key === null || value === null || Utils.isEmpty(key)|| Utils.isEmpty(value)){ Utils.showWarning(this.constructor.name + '-addParameterWithBoolean key or value'); return this;}
+        if (Utils.checkParameters([{ type: 'string', value: key }, { type: 'boolean', value: value }])) {
+            Utils.showParameterWarningLog(this.constructor.name + '-addParameterWithBoolean');
+            return this;
+        }
 
         try {
             this.parameters[key] = value;
@@ -60,10 +72,12 @@ class Event {
     }
 
     addParameterWithDate(key, value) {
-        if (key === null || value === null || Utils.isEmpty(key) || Utils.isEmpty(value)){ Utils.showWarning(this.constructor.name + '-addParameterWithDate key or value'); return this;}
+        if (Utils.checkParameters([{ type: 'string', value: key }, { type: 'object', value: value }])) {
+            Utils.showParameterWarningLog(this.constructor.name + '-addParameterWithDate');
+            return this;
+        }
 
         try {
-
             this.parameters[key] = value.toISOString();
 
             return this;
@@ -73,7 +87,10 @@ class Event {
     }
 
     addParameterWithArray(key, value) {
-        if (key === null || value === null || Utils.isEmpty(key) || Utils.isEmpty(value)){ Utils.showWarning(this.constructor.name + '-addParameterWithArray key or value'); return this;}
+        if (Utils.checkParameters([{ type: 'string', value: key }, { type: 'object', value: value }])) {
+            Utils.showParameterWarningLog(this.constructor.name + '-addParameterWithArray');
+            return this;
+        }
 
         try {
             this.parameters[key] = value;

package/www/Identifier.js

@@ -11,7 +11,10 @@ class Identifier {
     }
 
     addEmail(email) {
-        if (email === null || Utils.isEmpty(email)){ Utils.showWarning(this.constructor.name + '-email'); return this;}
+        if (Utils.checkParameters([{ type: 'string', value: email }])) {
+            Utils.showParameterWarningLog(this.constructor.name + '-addEmail');
+            return this;
+        }
 
         try {
             this.identifiers[InsiderConstants.ADD_EMAIL] = email;
@@ -23,7 +26,10 @@ class Identifier {
     }
 
     addPhoneNumber(phoneNumber) {
-        if (phoneNumber === null || Utils.isEmpty(phoneNumber)){ Utils.showWarning(this.constructor.name + '-phoneNumber'); return this;}
+        if (Utils.checkParameters([{ type: 'string', value: phoneNumber }])) {
+            Utils.showParameterWarningLog(this.constructor.name + '-addPhoneNumber');
+            return this;
+        }
 
         try {
             this.identifiers[InsiderConstants.ADD_PHONE_NUMBER] = phoneNumber;
@@ -35,7 +41,10 @@ class Identifier {
     }
 
     addUserID(userID) {
-        if (userID === null || Utils.isEmpty(userID)){ Utils.showWarning(this.constructor.name + '-userID'); return this;}
+        if (Utils.checkParameters([{ type: 'string', value: userID }])) {
+            Utils.showParameterWarningLog(this.constructor.name + '-addUserID');
+            return this;
+        }
 
         try {
             this.identifiers[InsiderConstants.ADD_USER_ID] = userID;
@@ -47,7 +56,10 @@ class Identifier {
     }
 
     addCustomIdentifier(key, value) {
-        if (key === null || value === null || Utils.isEmpty(key)){ Utils.showWarning(this.constructor.name + '-addCustomIdentifier key or value'); return this;}
+        if (Utils.checkParameters([{ type: 'string', value: key }, { type: 'string', value: value }])) {
+            Utils.showParameterWarningLog(this.constructor.name + '-addCustomIdentifier');
+            return this;
+        }
 
         try {
             this.identifiers[key] = value;