react-native-insider 5.0.0 → 5.0.2-nh

package/.github/workflows/git-leak.yml

@@ -0,0 +1,12 @@
+name: gitleaks
+on: [push]
+
+jobs:
+  gitleaks:
+    runs-on: self-hosted
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: '2'
+    - name: gitleaks-action
+      uses: zricethezav/gitleaks-action@master

package/.github/workflows/master_release_with_tag.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: develop
 
@@ -33,8 +33,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3.1.0
         with:
           node-version: 12
       - run: npm ci
@@ -44,8 +44,8 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3.1.0
         with:
           node-version: 12
           registry-url: https://registry.npmjs.org/

package/.github/workflows/new_release.yml

@@ -11,7 +11,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: develop
 
@@ -32,8 +32,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3.1.0
         with:
           node-version: 12
       - run: npm ci
@@ -43,8 +43,8 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3.1.0
         with:
           node-version: 12
           registry-url: https://registry.npmjs.org/

package/RNInsider.podspec

@@ -9,11 +9,11 @@ Pod::Spec.new do |s|
   s.authors      = package_json['author']
   s.license      = 'MIT'
   s.platform     = :ios, '10.0'
-  s.source = {:http => 'https://mobilesdk.useinsider.com/iOS/12.0.0/InsiderMobileIOSFramework.zip'}
+  s.source = {:http => 'https://mobilesdk.useinsider.com/iOS/12.1.0/InsiderMobileIOSFramework.zip'}
   s.source_files = 'ios/RNInsider/*.{h,m}'
   s.requires_arc = true
   s.static_framework = true
   s.dependency 'React'
-  s.dependency 'InsiderMobile', '12.0.0'
+  s.dependency 'InsiderMobile', '12.1.0'
   s.dependency 'InsiderHybrid', '1.1.2'
 end

package/android/build.gradle

@@ -1,4 +1,3 @@
-
 buildscript {
     repositories {
         jcenter()
@@ -9,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.1'
+        classpath 'com.android.tools.build:gradle:7.1.0'
     }
 }
 
@@ -36,18 +35,14 @@ android {
 
 dependencies {
     implementation "com.facebook.react:react-native:${getVersionFromPartner('reactNativeVersion', '+')}"
-    implementation ('com.useinsider:insider:13.0.1')
+    implementation ('com.useinsider:insider:13.1.0-nh')
     implementation ('com.useinsider:insiderhybrid:1.1.3')
 
-    implementation 'com.google.android.play:core:1.10.1'
+    implementation 'com.google.android.play:core:1.10.3'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.gms:play-services-location:17.0.0'
-    implementation 'com.google.firebase:firebase-messaging:20.0.0'
-    implementation 'com.google.android.gms:play-services-ads:16.0.0'
-    implementation 'androidx.lifecycle:lifecycle-process:2.3.1'
-    
-    implementation 'com.huawei.hms:push:5.3.0.304'
-    implementation 'com.huawei.hms:ads-identifier:3.4.34.301'
-    implementation 'com.huawei.hms:location:4.0.4.300'
+    implementation 'com.google.android.gms:play-services-location:19.0.1'
+    implementation 'com.google.android.gms:play-services-ads:20.6.0'
+    implementation 'com.google.firebase:firebase-messaging:23.0.2'
+    implementation 'androidx.lifecycle:lifecycle-process:2.4.1'
 
 }

package/android/src/main/java/com/useinsider/react/RNInsiderModule.java

@@ -223,6 +223,15 @@ public class RNInsiderModule extends ReactContextBaseJavaModule {
         }
     }
 
+    @ReactMethod
+    public void setWhatsappOptin(boolean whatsappOptin) {
+        try {
+            Insider.Instance.getCurrentUser().setWhatsappOptin(whatsappOptin);
+        } catch (Exception e) {
+            Insider.Instance.putException(e);
+        }
+    }
+
     @ReactMethod
     public void login(ReadableMap identifiers) {
         try {
@@ -592,10 +601,6 @@ public class RNInsiderModule extends ReactContextBaseJavaModule {
             }
             String provider = Insider.Instance.getCurrentProvider(reactContext);
             switch (provider) {
-                case "huawei":
-                    com.huawei.hms.push.RemoteMessage hmsRemoteMessage = new com.huawei.hms.push.RemoteMessage.Builder("insider").setData(remoteMessageStringMap).build();
-                    Insider.Instance.handleHMSNotification(reactContext, hmsRemoteMessage);
-                    break;
                 case "other":
                 case "google":
                     RemoteMessage fcmRemoteMessage = new RemoteMessage.Builder("insider").setData(remoteMessageStringMap).build();

package/changelog/5.0.2.md

@@ -0,0 +1,7 @@
+5.0.2-nh RELEASE
+
+Updated Android to 13.1.0-nh
+MOB-11450 | Cart Page Issue Fixed
+MOB-11160 | Packages Updated
+MOB-11541 | JSON parsed data for Android Message Center Added
+MOB-10883 | Watsapp Optin Added

package/index.js

@@ -155,6 +155,22 @@ export default class RNInsider {
       Insider.putErrorLog(generateJSONErrorString(error));
     }
   }
+    
+  static getMessageCenterDataArray(limit: number, startDate: Date, endDate: Date, callback: Function) {
+        if (shouldNotProceed() || limit == null || startDate == null || endDate == null || callback == null || startDate.getTime() === endDate.getTime() ||
+            startDate.getTime() > endDate.getTime()) return;
+        try {
+            Insider.getMessageCenterData(limit, startDate.toISOString(), endDate.toISOString(), (messageCenterData) => {
+                if (Platform.OS !== 'ios') {
+                    callback(JSON.parse(messageCenterData || '[]'));
+                    return;
+                }
+                callback(messageCenterData.data);
+            });
+        } catch (error) {
+            Insider.putErrorLog(generateJSONErrorString(error));
+        }
+  }
 
   static getSmartRecommendation(recommendationID: number, locale: string, currency: string, callback: Function) {
     if (shouldNotProceed() || recommendationID == null || locale == null || currency == null || callback == null) return;
@@ -245,14 +261,14 @@ export default class RNInsider {
 
   static visitCartPage(products: Array<RNInsiderProduct>) {
     if (shouldNotProceed() || products == null) return;
-    let productMap = {};
     let mappedProducts = new Array(products.length);
     try {
-      products.forEach((product, i) => {
-        productMap['productMustMap'] = product.productMustMap;
-        productMap['productOptMap'] = product.productOptMap;
-        mappedProducts[i] = productMap;
-      });
+        products.forEach((product, i) => {
+            let productMap = {};
+            productMap['productMustMap'] = product.productMustMap;
+            productMap['productOptMap'] = product.productOptMap;
+            mappedProducts[i] = productMap;
+          });
       Insider.visitCartPage(mappedProducts);
     } catch (error) {
       Insider.putErrorLog(generateJSONErrorString(error));

package/ios/RNInsider/RNInsider.m

@@ -152,6 +152,14 @@ RCT_EXPORT_METHOD(setLocationOptin:(BOOL)value) {
     }
 }
 
+RCT_EXPORT_METHOD(setWhatsappOptin:(BOOL)value) {
+    @try {
+        [Insider getCurrentUser].setWhatsappOptin(value);
+    } @catch (NSException *e) {
+        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
+    }
+}
+
 RCT_EXPORT_METHOD(login:(NSDictionary *)identifiers) {
     @try {
         if (!identifiers) return;

package/package.json

@@ -1,18 +1,18 @@
 {
-  "name": "react-native-insider",
-  "version": "5.0.0",
-  "description": "React Native Insider SDK",
-  "main": "index.js",
-  "keywords": [
-    "react-native",
-    "ios",
-    "android",
-    "notifications",
-    "push",
-    "apns",
-    "fcm",
-    "insider"
-  ],
-  "author": "insidermobile",
-  "homepage": "https://github.com/useinsider/react-native-insider"
+    "name": "react-native-insider",
+    "version": "5.0.2-nh",
+    "description": "React Native Insider SDK",
+    "main": "index.js",
+    "keywords": [
+        "react-native",
+        "ios",
+        "android",
+        "notifications",
+        "push",
+        "apns",
+        "fcm",
+        "insider"
+    ],
+    "author": "insidermobile",
+    "homepage": "https://github.com/useinsider/react-native-insider"
 }

package/src/InsiderUser.js

@@ -4,257 +4,267 @@ import RNInsiderIdentifier from 'react-native-insider/src/InsiderIdentifier';
 const Insider = NativeModules.RNInsider;
 
 function shouldNotProceed() {
-  return Insider == null;
+    return Insider == null;
 }
 
 function generateJSONErrorString(error) {
-  return '[JavaScript Error] ' + error;
+    return '[JavaScript Error] ' + error;
 }
 
 export default class RNInsiderUser {
-  setGender(value: number) {
-    if (shouldNotProceed() || value == null) return this;
-    try {
-      Insider.setGender(value);
-    } catch (error) {
-      Insider.putErrorLog(generateJSONErrorString(error));
+    setGender(value: number) {
+        if (shouldNotProceed() || value == null) return this;
+        try {
+            Insider.setGender(value);
+        } catch (error) {
+            Insider.putErrorLog(generateJSONErrorString(error));
+        }
+        return this;
     }
-    return this;
-  }
 
-  setBirthday(value: Date) {
-    if (shouldNotProceed() || value == null) return this;
-    try {
-      Insider.setBirthday(value.toISOString());
-    } catch (error) {
-      Insider.putErrorLog(generateJSONErrorString(error));
+    setBirthday(value: Date) {
+        if (shouldNotProceed() || value == null) return this;
+        try {
+            Insider.setBirthday(value.toISOString());
+        } catch (error) {
+            Insider.putErrorLog(generateJSONErrorString(error));
+        }
+        return this;
     }
-    return this;
-  }
 
-  setName(value: string) {
-    if (shouldNotProceed() || value == null) return this;
-    try {
-      Insider.setName(value);
-    } catch (error) {
-      Insider.putErrorLog(generateJSONErrorString(error));
+    setName(value: string) {
+        if (shouldNotProceed() || value == null) return this;
+        try {
+            Insider.setName(value);
+        } catch (error) {
+            Insider.putErrorLog(generateJSONErrorString(error));
+        }
+        return this;
     }
-    return this;
-  }
 
-  setSurname(value: string) {
-    if (shouldNotProceed() || value == null) return this;
-    try {
-      Insider.setSurname(value);
-    } catch (error) {
-      Insider.putErrorLog(generateJSONErrorString(error));
+    setSurname(value: string) {
+        if (shouldNotProceed() || value == null) return this;
+        try {
+            Insider.setSurname(value);
+        } catch (error) {
+            Insider.putErrorLog(generateJSONErrorString(error));
+        }
+        return this;
     }
-    return this;
-  }
 
-  setAge(value: number) {
-    if (shouldNotProceed() || value == null) return this;
-    try {
-      Insider.setAge(value);
-    } catch (error) {
-      Insider.putErrorLog(generateJSONErrorString(error));
+    setAge(value: number) {
+        if (shouldNotProceed() || value == null) return this;
+        try {
+            Insider.setAge(value);
+        } catch (error) {
+            Insider.putErrorLog(generateJSONErrorString(error));
+        }
+        return this;
     }
-    return this;
-  }
 
-  // setEmail(value: string) {
-  //   if (shouldNotProceed() || value == null) return this;
-  //   try {
-  //     Insider.setEmail(value);
-  //   } catch (error) {
-  //     Insider.putErrorLog(generateJSONErrorString(error));
-  //   }
-  //   return this;
-  // }
+    // setEmail(value: string) {
+    //   if (shouldNotProceed() || value == null) return this;
+    //   try {
+    //     Insider.setEmail(value);
+    //   } catch (error) {
+    //     Insider.putErrorLog(generateJSONErrorString(error));
+    //   }
+    //   return this;
+    // }
 
-  // setPhoneNumber(value: string) {
-  //   if (shouldNotProceed() || value == null) return this;
-  //   try {
-  //     Insider.setPhoneNumber(value);
-  //   } catch (error) {
-  //     Insider.putErrorLog(generateJSONErrorString(error));
-  //   }
-  //   return this;
-  // }
+    // setPhoneNumber(value: string) {
+    //   if (shouldNotProceed() || value == null) return this;
+    //   try {
+    //     Insider.setPhoneNumber(value);
+    //   } catch (error) {
+    //     Insider.putErrorLog(generateJSONErrorString(error));
+    //   }
+    //   return this;
+    // }
 
-  setLanguage(value: string) {
-    if (shouldNotProceed() || value == null) return this;
-    try {
-      Insider.setLanguage(value);
-    } catch (error) {
-      Insider.putErrorLog(generateJSONErrorString(error));
+    setLanguage(value: string) {
+        if (shouldNotProceed() || value == null) return this;
+        try {
+            Insider.setLanguage(value);
+        } catch (error) {
+            Insider.putErrorLog(generateJSONErrorString(error));
+        }
+        return this;
     }
-    return this;
-  }
 
-  setLocale(value: string) {
-    if (shouldNotProceed() || value == null) return this;
-    try {
-      Insider.setLocale(value);
-    } catch (error) {
-      Insider.putErrorLog(generateJSONErrorString(error));
+    setLocale(value: string) {
+        if (shouldNotProceed() || value == null) return this;
+        try {
+            Insider.setLocale(value);
+        } catch (error) {
+            Insider.putErrorLog(generateJSONErrorString(error));
+        }
+        return this;
     }
-    return this;
-  }
 
-  setFacebookID(value: string) {
-    if (shouldNotProceed() || value == null) return this;
-    try {
-      Insider.setFacebookID(value);
-    } catch (error) {
-      Insider.putErrorLog(generateJSONErrorString(error));
+    setFacebookID(value: string) {
+        if (shouldNotProceed() || value == null) return this;
+        try {
+            Insider.setFacebookID(value);
+        } catch (error) {
+            Insider.putErrorLog(generateJSONErrorString(error));
+        }
+        return this;
     }
-    return this;
-  }
 
-  setTwitterID(value: string) {
-    if (shouldNotProceed() || value == null) return this;
-    try {
-      Insider.setTwitterID(value);
-    } catch (error) {
-      Insider.putErrorLog(generateJSONErrorString(error));
+    setTwitterID(value: string) {
+        if (shouldNotProceed() || value == null) return this;
+        try {
+            Insider.setTwitterID(value);
+        } catch (error) {
+            Insider.putErrorLog(generateJSONErrorString(error));
+        }
+        return this;
     }
-    return this;
-  }
 
-  setEmailOptin(value: boolean) {
-    if (shouldNotProceed() || value == null) return this;
-    try {
-      Insider.setEmailOptin(value);
-    } catch (error) {
-      Insider.putErrorLog(generateJSONErrorString(error));
+    setEmailOptin(value: boolean) {
+        if (shouldNotProceed() || value == null) return this;
+        try {
+            Insider.setEmailOptin(value);
+        } catch (error) {
+            Insider.putErrorLog(generateJSONErrorString(error));
+        }
+        return this;
     }
-    return this;
-  }
 
-  setSMSOptin(value: boolean) {
-    if (shouldNotProceed() || value == null) return this;
-    try {
-      Insider.setSMSOptin(value);
-    } catch (error) {
-      Insider.putErrorLog(generateJSONErrorString(error));
+    setSMSOptin(value: boolean) {
+        if (shouldNotProceed() || value == null) return this;
+        try {
+            Insider.setSMSOptin(value);
+        } catch (error) {
+            Insider.putErrorLog(generateJSONErrorString(error));
+        }
+        return this;
     }
-    return this;
-  }
 
-  setPushOptin(value: boolean) {
-    if (shouldNotProceed() || value == null) return this;
-    try {
-      Insider.setPushOptin(value);
-    } catch (error) {
-      Insider.putErrorLog(generateJSONErrorString(error));
+    setPushOptin(value: boolean) {
+        if (shouldNotProceed() || value == null) return this;
+        try {
+            Insider.setPushOptin(value);
+        } catch (error) {
+            Insider.putErrorLog(generateJSONErrorString(error));
+        }
+        return this;
     }
-    return this;
-  }
 
-  setLocationOptin(value: boolean) {
-    if (shouldNotProceed() || value == null) return this;
-    try {
-      Insider.setLocationOptin(value);
-    } catch (error) {
-      Insider.putErrorLog(generateJSONErrorString(error));
+    setLocationOptin(value: boolean) {
+        if (shouldNotProceed() || value == null) return this;
+        try {
+            Insider.setLocationOptin(value);
+        } catch (error) {
+            Insider.putErrorLog(generateJSONErrorString(error));
+        }
+        return this;
     }
-    return this;
-  }
 
-  login(identifiers: RNInsiderIdentifier, insiderIDResult: Function) {
-    if (shouldNotProceed()) {return this;}
-    try {
-      if (insiderIDResult != null) {
-        Insider.loginWithReturningID(identifiers.identifiers, insiderIDResult);
+    setWhatsappOptin(value: boolean) {
+        if (shouldNotProceed() || value == null) return this;
+        try {
+            Insider.setWhatsappOptin(value);
+        } catch (error) {
+            Insider.putErrorLog(generateJSONErrorString(error));
+        }
+        return this;
+    }
+
+    login(identifiers: RNInsiderIdentifier, insiderIDResult: Function) {
+        if (shouldNotProceed()) { return this; }
+        try {
+            if (insiderIDResult != null) {
+                Insider.loginWithReturningID(identifiers.identifiers, insiderIDResult);
 
-        return;
-      }
+                return;
+            }
 
-      Insider.login(identifiers.identifiers);
-    } catch (error) {
-      Insider.putErrorLog(generateJSONErrorString(error));
+            Insider.login(identifiers.identifiers);
+        } catch (error) {
+            Insider.putErrorLog(generateJSONErrorString(error));
+        }
+        return this;
     }
-    return this;
-  }
 
-  logout() {
-    if (shouldNotProceed()) return this;
-    try {
-      Insider.logout();
-    } catch (error) {
-      Insider.putErrorLog(generateJSONErrorString(error));
+    logout() {
+        if (shouldNotProceed()) return this;
+        try {
+            Insider.logout();
+        } catch (error) {
+            Insider.putErrorLog(generateJSONErrorString(error));
+        }
+        return this;
     }
-    return this;
-  }
 
-  setCustomAttributeWithString(key: string, value: string) {
-    if (shouldNotProceed() || key == null || value == null) return this;
-    try {
-      Insider.setCustomAttributeWithString(key, value);
-    } catch (error) {
-      Insider.putErrorLog(generateJSONErrorString(error));
+    setCustomAttributeWithString(key: string, value: string) {
+        if (shouldNotProceed() || key == null || value == null) return this;
+        try {
+            Insider.setCustomAttributeWithString(key, value);
+        } catch (error) {
+            Insider.putErrorLog(generateJSONErrorString(error));
+        }
+        return this;
     }
-    return this;
-  }
 
-  setCustomAttributeWithInt(key: string, value: number) {
-    if (shouldNotProceed() || key == null || value == null) return this;
-    try {
-      Insider.setCustomAttributeWithInt(key, value);
-    } catch (error) {
-      Insider.putErrorLog(generateJSONErrorString(error));
+    setCustomAttributeWithInt(key: string, value: number) {
+        if (shouldNotProceed() || key == null || value == null) return this;
+        try {
+            Insider.setCustomAttributeWithInt(key, value);
+        } catch (error) {
+            Insider.putErrorLog(generateJSONErrorString(error));
+        }
+        return this;
     }
-    return this;
-  }
 
-  setCustomAttributeWithDouble(key: string, value: number) {
-    if (shouldNotProceed() || key == null || value == null) return this;
-    try {
-      Insider.setCustomAttributeWithDouble(key, value);
-    } catch (error) {
-      Insider.putErrorLog(generateJSONErrorString(error));
+    setCustomAttributeWithDouble(key: string, value: number) {
+        if (shouldNotProceed() || key == null || value == null) return this;
+        try {
+            Insider.setCustomAttributeWithDouble(key, value);
+        } catch (error) {
+            Insider.putErrorLog(generateJSONErrorString(error));
+        }
+        return this;
     }
-    return this;
-  }
 
-  setCustomAttributeWithBoolean(key: string, value: boolean) {
-    if (shouldNotProceed() || key == null || value == null) return this;
-    try {
-      Insider.setCustomAttributeWithBoolean(key, value);
-    } catch (error) {
-      Insider.putErrorLog(generateJSONErrorString(error));
+    setCustomAttributeWithBoolean(key: string, value: boolean) {
+        if (shouldNotProceed() || key == null || value == null) return this;
+        try {
+            Insider.setCustomAttributeWithBoolean(key, value);
+        } catch (error) {
+            Insider.putErrorLog(generateJSONErrorString(error));
+        }
+        return this;
     }
-    return this;
-  }
 
-  setCustomAttributeWithDate(key: string, value: Date) {
-    if (shouldNotProceed() || key == null || value == null) return this;
-    try {
-      Insider.setCustomAttributeWithDate(key, value.toISOString());
-    } catch (error) {
-      Insider.putErrorLog(generateJSONErrorString(error));
+    setCustomAttributeWithDate(key: string, value: Date) {
+        if (shouldNotProceed() || key == null || value == null) return this;
+        try {
+            Insider.setCustomAttributeWithDate(key, value.toISOString());
+        } catch (error) {
+            Insider.putErrorLog(generateJSONErrorString(error));
+        }
+        return this;
     }
-    return this;
-  }
 
-  setCustomAttributeWithArray(key: string, value: string[]) {
-    if (shouldNotProceed() || key == null || value == null) return this;
-    try {
-      Insider.setCustomAttributeWithArray(key, value);
-    } catch (error) {
-      Insider.putErrorLog(generateJSONErrorString(error));
+    setCustomAttributeWithArray(key: string, value: string[]) {
+        if (shouldNotProceed() || key == null || value == null) return this;
+        try {
+            Insider.setCustomAttributeWithArray(key, value);
+        } catch (error) {
+            Insider.putErrorLog(generateJSONErrorString(error));
+        }
+        return this;
     }
-    return this;
-  }
 
-  unsetCustomAttribute(key: string) {
-    if (shouldNotProceed() || key == null) return this;
-    try {
-      Insider.unsetCustomAttribute(key);
-    } catch (error) {
-      Insider.putErrorLog(generateJSONErrorString(error));
+    unsetCustomAttribute(key: string) {
+        if (shouldNotProceed() || key == null) return this;
+        try {
+            Insider.unsetCustomAttribute(key);
+        } catch (error) {
+            Insider.putErrorLog(generateJSONErrorString(error));
+        }
+        return this;
     }
-    return this;
-  }
-}
+}

package/changelog/5.0.0.md

@@ -1,5 +0,0 @@
-5.0.0 RELEASE
-
-Updated Android to 13.0.1
-MOB-11126 | Change resumeSessionHybridRequestConfig method name.
-MOB-10783 | GetMessageCenter startdate&enddate validation