cordova-plugin-insider 3.0.0 → 3.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-insider",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "description": "A plugin that you can use Insider SDK with Cordova and Ionic",
   "cordova_name": "Insider Cordova Plugin",
   "cordova": {
@@ -28,6 +28,6 @@
     "@babel/preset-env": "^7.27.2"
   },
   "dependencies": {
-    "babel": "^5.8.38"
+    "babel": "^6.23.0"
   }
 }

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="cordova-plugin-insider" version="3.0.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="3.0.2" 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>
@@ -70,9 +70,9 @@
                 <source url="https://cdn.cocoapods.org/" />
             </config>
             <pods use-frameworks="true">
-                <pod name="InsiderMobile" spec="14.0.4" />
-                <pod name="InsiderGeofence" spec="1.2.3" />
-                <pod name="InsiderHybrid" spec="1.7.5" />
+                <pod name="InsiderMobile" spec="14.2.2" />
+                <pod name="InsiderGeofence" spec="1.2.4" />
+                <pod name="InsiderHybrid" spec="1.7.6" />
             </pods>
         </podspec>
 

package/src/android/InsiderPlugin.java

@@ -584,6 +584,29 @@ public class InsiderPlugin extends CordovaPlugin {
                 Insider.Instance.getCurrentUser().login(insiderIdentifiers);
             } else if (action.equals(InsiderHybridMethods.LOGOUT)) {
                 Insider.Instance.getCurrentUser().logout();
+            // TODO: Use InsiderHybridMethods.LOGOUT_RESETTING_INSIDER_ID constant when insiderhybrid is upgraded to version with this constant
+            } else if (action.equals("logoutResettingInsiderID")) {
+                InsiderIdentifiers[] identifiers = null;
+
+                if (args.get(0) != null && !args.isNull(0)) {
+                    identifiers = convertJSONArrayToInsiderIdentifiersArray(args.getJSONArray(0));
+                }
+
+                if (args.length() > 1) {
+                    final CallbackContext finalCallbackContext = callbackContext;
+                    Insider.Instance.getCurrentUser().logoutResettingInsiderID(identifiers, new InsiderUser.InsiderIDResult() {
+                        @Override
+                        public void insiderIDResult(String insiderID) {
+                            if (insiderID != null) {
+                                callbackSuccess(finalCallbackContext, insiderID);
+                            } else {
+                                callbackSuccess(finalCallbackContext, "");
+                            }
+                        }
+                    });
+                } else {
+                    Insider.Instance.getCurrentUser().logoutResettingInsiderID(identifiers);
+                }
             } else if (action.equals(Constants.HANDLE_NOTIFICATION)) {
                 if (args.get(0) == null)
                     return false;
@@ -1030,4 +1053,36 @@ public class InsiderPlugin extends CordovaPlugin {
             Insider.Instance.putException(e);
         }
     }
+
+    private InsiderIdentifiers[] convertJSONArrayToInsiderIdentifiersArray(JSONArray identifiersArray) throws JSONException {
+        if (identifiersArray == null || identifiersArray.length() == 0) {
+            return null;
+        }
+
+        InsiderIdentifiers[] identifiers = new InsiderIdentifiers[identifiersArray.length()];
+        for (int i = 0; i < identifiersArray.length(); i++) {
+            JSONObject identifierMap = identifiersArray.getJSONObject(i);
+            InsiderIdentifiers insiderIdentifiers = new InsiderIdentifiers();
+
+            Map<String, Object> identifierData = CDVUtils.convertJSONToMap(identifierMap.toString());
+            for (String key : identifierData.keySet()) {
+                switch (key) {
+                    case InsiderHybridMethods.ADD_EMAIL:
+                        insiderIdentifiers.addEmail(String.valueOf(identifierData.get(key)));
+                        break;
+                    case InsiderHybridMethods.ADD_PHONE_NUMBER:
+                        insiderIdentifiers.addPhoneNumber(String.valueOf(identifierData.get(key)));
+                        break;
+                    case InsiderHybridMethods.ADD_USER_ID:
+                        insiderIdentifiers.addUserID(String.valueOf(identifierData.get(key)));
+                        break;
+                    default:
+                        insiderIdentifiers.addCustomIdentifier(key, String.valueOf(identifierData.get(key)));
+                        break;
+                }
+            }
+            identifiers[i] = insiderIdentifiers;
+        }
+        return identifiers;
+    }
 }

package/src/android/build-extras.gradle

@@ -16,8 +16,8 @@ android {
 }
 
 dependencies {
-    implementation 'com.useinsider:insider:15.1.3'
-    implementation 'com.useinsider:insiderhybrid:1.3.3'
+    implementation 'com.useinsider:insider:15.2.1'
+    implementation 'com.useinsider:insiderhybrid:1.3.4'
 
     implementation 'com.fasterxml.jackson.core:jackson-core:2.12.4'
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.12.4'
@@ -31,7 +31,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-messaging:24.0.0'
     implementation 'com.google.android.play:review:2.0.1'
 
-    implementation 'com.huawei.hms:push:6.12.0.300'
+    implementation 'com.huawei.hms:push:6.13.0.300'
     implementation 'com.huawei.hms:ads-identifier:3.4.62.300'
-    implementation 'com.huawei.hms:location:6.11.0.301'
+    implementation 'com.huawei.hms:location:6.16.0.302'
 }

package/src/ios/InsiderPlugin.h

@@ -61,6 +61,7 @@
 - (void) unsetCustomAttribute:(CDVInvokedUrlCommand *)command;
 - (void) login:(CDVInvokedUrlCommand *)command;
 - (void) logout:(CDVInvokedUrlCommand *)command;
+- (void) logoutResettingInsiderID:(CDVInvokedUrlCommand *)command;
 - (void) signUpConfirmation:(CDVInvokedUrlCommand *)command;
 - (void) putException:(CDVInvokedUrlCommand *)command;
 - (void) handleNotification:(CDVInvokedUrlCommand *)command;

package/src/ios/InsiderPlugin.m

@@ -772,6 +772,31 @@
     }
 }
 
+- (void)logoutResettingInsiderID:(CDVInvokedUrlCommand *)command {
+    @try {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            NSArray *identifiersArray = nil;
+            if ([command.arguments count] > 0 && [command.arguments objectAtIndex:0] != [NSNull null]) {
+                identifiersArray = [command.arguments objectAtIndex:0];
+            }
+
+            NSArray<InsiderIdentifiers *> *identifiers = [self convertArrayToInsiderIdentifiersArray:identifiersArray];
+
+            if ([command.arguments count] > 1) {
+                [[Insider getCurrentUser] logoutResettingInsiderID:identifiers insiderIDResult:^(NSString *insiderID) {
+                    NSString *insiderIDToPass = insiderID ? insiderID : @"";
+                    [self sendSuccessResultWithString:insiderIDToPass andCommand:command];
+                }];
+            } else {
+                [[Insider getCurrentUser] logoutResettingInsiderID:identifiers];
+                [self sendSuccessResultWithString:@"SUCCESS" andCommand:command];
+            }
+        });
+    } @catch (NSException *e) {
+        [Insider sendError:e desc:[NSString stringWithFormat:@"%s:%d", __func__, __LINE__]];
+    }
+}
+
 - (void)signUpConfirmation:(CDVInvokedUrlCommand *)command {
     @try {
         dispatch_async(dispatch_get_main_queue(), ^{
@@ -979,4 +1004,28 @@
     [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }
 
+- (NSArray<InsiderIdentifiers *> *)convertArrayToInsiderIdentifiersArray:(NSArray *)identifiersArray {
+    if (identifiersArray == nil || identifiersArray.count == 0) {
+        return nil;
+    }
+
+    NSMutableArray<InsiderIdentifiers *> *identifiers = [NSMutableArray array];
+    for (NSDictionary *identifierDict in identifiersArray) {
+        InsiderIdentifiers *insiderIdentifiers = [[InsiderIdentifiers alloc] init];
+        for (NSString *key in identifierDict.allKeys) {
+            if ([key isEqualToString:@"addEmail"]) {
+                insiderIdentifiers.addEmail([identifierDict objectForKey:key]);
+            } else if ([key isEqualToString:@"addPhoneNumber"]) {
+                insiderIdentifiers.addPhoneNumber([identifierDict objectForKey:key]);
+            } else if ([key isEqualToString:@"addUserID"]) {
+                insiderIdentifiers.addUserID([identifierDict objectForKey:key]);
+            } else {
+                insiderIdentifiers.addCustomIdentifier(key, [identifierDict objectForKey:key]);
+            }
+        }
+        [identifiers addObject:insiderIdentifiers];
+    }
+    return identifiers;
+}
+
 @end

package/types/User.d.ts

@@ -17,6 +17,7 @@ export interface User {
     setWhatsappOptin(whatsappOptin: boolean): User;
     login(identifiers:object, insiderIDResult: Function): void;
     logout(): void;
+    logoutResettingInsiderID(identifiers?: object[] | null, insiderIDResult?: (insiderID: string) => void): void;
     setCustomAttributeWithString(key: string, value: string): User;
     setCustomAttributeWithInt(key: string, value: number): User;
     setCustomAttributeWithDouble(key: string, value: number): User;

package/www/Constants.js

@@ -22,6 +22,7 @@ module.exports = {
   SET_WHATSAPP_OPTIN: 'setWhatsappOptin',
   LOGIN: 'login',
   LOGOUT: 'logout',
+  LOGOUT_RESETTING_INSIDER_ID: 'logoutResettingInsiderID',
   SET_CUSTOM_ATTRIBUTE_WITH_STRING: 'setCustomAttributeWithString',
   SET_CUSTOM_ATTRIBUTE_WITH_INT: 'setCustomAttributeWithInt',
   SET_CUSTOM_ATTRIBUTE_WITH_DOUBLE: 'setCustomAttributeWithDouble',
@@ -109,5 +110,5 @@ module.exports = {
   // Reinit
   REINIT_WITH_PARTNER_NAME: 'reinitWithPartnerName',
   // SDK Version
-  SDK_VERSION: 'CDV-3.0.0'
+  SDK_VERSION: 'CDV-3.0.2'
 };

package/www/User.js

@@ -319,6 +319,27 @@ var User = /*#__PURE__*/function () {
         Utils.asyncExec(InsiderCordovaPlugin, InsiderConstants.PUT_ERROR_LOG, [Utils.generateJSONErrorString(error)]);
       }
     }
+  }, {
+    key: "logoutResettingInsiderID",
+    value: function logoutResettingInsiderID(identifiers, insiderIDResult) {
+      try {
+        var identifiersArray = identifiers && Array.isArray(identifiers) ? identifiers.map(function (id) {
+          return id.identifiers;
+        }) : null;
+        if (!Utils.checkParameters([{
+          type: 'function',
+          value: insiderIDResult
+        }])) {
+          Utils.asyncExec(InsiderConstants.CLASS, InsiderConstants.LOGOUT_RESETTING_INSIDER_ID, [identifiersArray, insiderIDResult]).then(function (id) {
+            return insiderIDResult(id);
+          });
+        } else {
+          Utils.asyncExec(InsiderConstants.CLASS, InsiderConstants.LOGOUT_RESETTING_INSIDER_ID, [identifiersArray]);
+        }
+      } catch (error) {
+        Utils.asyncExec(InsiderConstants.CLASS, InsiderConstants.PUT_ERROR_LOG, [Utils.generateJSONErrorString(error)]);
+      }
+    }
   }, {
     key: "setCustomAttributeWithString",
     value: function setCustomAttributeWithString(key, value) {

package/github_release.sh

@@ -1,114 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-# Minimal GitHub Release Script
-# Gereksinim: gh (GitHub CLI) -> gh auth login
-# Bulunduğun branch'in HEAD'inden release oluşturur.
-# Tag   = --version (örn: 1.2.3)
-# Notes = --generate-notes (varsayılan) | --notes-file | --no-notes
-
-VERSION=""
-ASSETS=()
-DRY_RUN="false"
-NOTES_FILE=""
-NO_NOTES="false"
-TITLE=""
-flags=""
-
-usage() {
-  cat <<EOF
-Kullanım: $(basename "$0") -v <versiyon> [opsiyonlar]
-
-Zorunlu:
-  -v, --version <semver>       Örn: 1.2.3  (release tag adı)
-
-Opsiyonel:
-  -a, --asset <path>       Framework dosyası (tekrarlanabilir)
-  -t, --title <string>     Release başlığı (yok ise version kullanılır)
-  --notes-file <path>      Notları dosyadan al (--generate-notes devre dışı)
-  --no-notes               Not ekleme veya oluşturma
-  --dry-run                Komutları yazdır, çalıştırma
-
-Örnekler:
-  $(basename "$0") -v 1.2.3
-  $(basename "$0") -v 1.2.3 --title Title --notes-file CHANGELOG.md
-  $(basename "$0") -v 1.2.3 --asset build/ios/InsiderMobile.xcframework.zip
-EOF
-}
-
-# Check validity of arguments
-while [[ $# -gt 0 ]]; do
-  case "$1" in
-    -v|--version) VERSION="$2"; shift 2;;
-    -a|--asset) ASSETS+=("$2"); shift 2;;
-    -t|--title) TITLE="$2"; shift 2;;
-    --notes-file) NOTES_FILE="$2"; shift 2;;
-    --no-notes) NO_NOTES="true"; shift;;
-    --dry-run) DRY_RUN="true"; shift;;
-    -h|--help) usage; exit 0;;
-    *) echo "⛔ Error: Bilinmeyen argüman: $1"; usage; exit 1;;
-  esac
-done
-
-if [[ -z "${VERSION}" ]]; then
-  echo "⛔ Error: --version parametresi zorunludur. Örn: -v 1.2.3"
-  usage
-  exit 1
-fi
-
-if ! command -v gh >/dev/null 2>&1; then
-  echo "⛔ Error: GitHub CLI (gh) bulunamadı."
-  echo "ℹ️ Kurulum: https://cli.github.com ve 'gh auth login' komutunu çalıştırın."
-  exit 1
-fi
-
-# Dry run method
-run() {
-  echo "+ $*"
-  if [[ "${DRY_RUN}" == "false" ]]; then
-    eval "$@"
-  fi
-}
-
-# Check if there exists a release with same version
-if gh release view "${VERSION}" >/dev/null 2>&1; then
-  echo "⛔ Error: Bu tag için zaten bir release mevcut: ${VERSION}"
-  exit 1
-fi
-
-# Assign title
-if [[ -z "${TITLE}" ]]; then
-  flags+="--title \"${VERSION}\""
-else
-  flags+="--title \"${TITLE}\""
-fi
-
-# Construct release flags
-if [[ "${NO_NOTES}" == "true" ]]; then
-  flags+=" --notes \"\""
-elif [[ -n "${NOTES_FILE}" ]]; then
-  if [[ ! -f "${NOTES_FILE}" ]]; then
-    echo "⛔ Error: Not dosyası bulunamadı: ${NOTES_FILE}"
-    exit 1
-  fi
-  flags+=" --notes-file \"${NOTES_FILE}\""
-else
-  flags+=" --generate-notes"
-fi
-
-# Create the release on Github
-run "gh release create \"${VERSION}\" ${flags}"
-
-# Upload Framework file
-if [[ ${#ASSETS[@]} -gt 0 ]]; then
-  echo "📦 Framework dosyası yükleniyor..."
-  for a in "${ASSETS[@]}"; do
-    if [[ -f "${a}" ]]; then
-      run "gh release upload \"${VERSION}\" \"${a}\" --clobber"
-    else
-      echo "⚠️ Warning: Asset bulunamadı, atlanıyor: ${a}"
-    fi
-  done
-fi
-
-echo "✅ Sürüm oluşturuldu: ${VERSION}"

package/insider-cordova-plugin.iml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/android" isTestSource="false" packagePrefix="com.useinsider.cordova" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>