@dashx/react-native 1.0.2 → 1.0.4

package/DashXReactNative.podspec

@@ -0,0 +1,24 @@
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+
+Pod::Spec.new do |s|
+  s.name         = "DashXReactNative"
+  s.version      = package["version"]
+  s.summary      = package["description"]
+  s.description  = <<-DESC
+                  @dashx/react-native
+                   DESC
+  s.homepage     = "https://github.com/github_account/@dashx/react-native"
+  # brief license entry:
+  s.license      = "MIT"
+  s.authors      = { "DashXDev" => "dev@dashx.com" }
+  s.platforms    = { :ios => "10.0" }
+  s.source       = { :git => "https://github.com/dashxhq/dashx-react-native.git", :tag => "#{s.version}" }
+
+  s.source_files = "ios/**/*.{h,c,m,swift}"
+  s.requires_arc = true
+
+  s.dependency "DashX", "1.0.5"
+  s.dependency "React"
+end

package/android/build.gradle

@@ -1,7 +1,8 @@
+import groovy.json.JsonSlurper
 
 buildscript {
     ext {
-        kotlinVersion = '1.5.31'
+        kotlinVersion = '1.6.0'
         androidToolsVersion = '7.0.4'
     }
 
@@ -19,6 +20,14 @@ buildscript {
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
+def getVersionFromNpm() {
+    //  Read and parse package.json file from project root
+    def inputFile = new File("../node_modules/@dashx/react-native/package.json")
+    def packageJson = new JsonSlurper().parseText(inputFile.text)
+
+    return packageJson["version"]
+}
+
 android {
     compileSdkVersion 30
     buildToolsVersion '28.0.3'
@@ -28,7 +37,9 @@ android {
         targetSdkVersion 30
         compileSdkVersion 30
         versionCode 1
-        versionName "1.0"
+        versionName getVersionFromNpm()
+
+        buildConfigField 'String', 'VERSION_NAME', "\"$versionName\""
     }
     lintOptions {
         abortOnError false
@@ -45,6 +56,5 @@ dependencies {
     implementation 'com.facebook.react:react-native:+'
     implementation 'com.google.code.gson:gson:2.9.0'
 
-    implementation "com.dashx:dashx-android:1.0.3"
+    implementation "com.dashx:dashx-android:1.0.7"
 }
-  

package/android/gradle.properties

@@ -0,0 +1 @@
+android.useAndroidX=true

package/android/src/main/AndroidManifest.xml

@@ -2,5 +2,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.dashx.rn.sdk">
 
-</manifest>
-  
+</manifest>  

package/android/src/main/java/com/dashx/rn/sdk/DashXReactNativeModule.kt

@@ -1,15 +1,12 @@
 package com.dashx.rn.sdk
 
-import android.annotation.TargetApi
-import android.content.Context
-import android.database.Cursor
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager.NameNotFoundException
 import android.net.Uri
-import android.os.Build
-import android.provider.DocumentsContract
-import android.provider.MediaStore
 import com.dashx.rn.sdk.util.*
 import com.dashx.sdk.DashXLog
 import com.dashx.sdk.data.ExternalAsset
+import com.dashx.sdk.data.LibraryInfo
 import com.facebook.react.bridge.*
 import com.google.gson.Gson
 import java.io.File
@@ -31,17 +28,18 @@ class DashXReactNativeModule(private val reactContext: ReactApplicationContext)
 
     @ReactMethod
     fun configure(options: ReadableMap) {
-        dashXClient = DashX.createInstance(
-            reactContext, 
+        dashXClient = DashX.configure(
+            reactContext,
             options.getString("publicKey")!!,
             options.getStringIfPresent("baseURI"),
-            options.getStringIfPresent("targetEnvironment")
+            options.getStringIfPresent("targetEnvironment"),
+            LibraryInfo("dashx-react-native", BuildConfig.VERSION_NAME)
         )
     }
 
     @ReactMethod
     fun identify(options: ReadableMap?) {
-        val optionsHashMap = MapUtil.toMap(options)
+        val optionsHashMap = options?.toHashMap()
         dashXClient?.identify(optionsHashMap as HashMap<String, String>?)
     }
 
@@ -58,7 +56,7 @@ class DashXReactNativeModule(private val reactContext: ReactApplicationContext)
     @ReactMethod
     fun track(event: String, data: ReadableMap?) {
         val jsonData = try {
-            MapUtil.toMap(data) as HashMap<String, String>
+            data?.toHashMap() as HashMap<String, String>
         } catch (e: Exception) {
             DashXLog.d(tag, e.message)
             return
@@ -69,7 +67,7 @@ class DashXReactNativeModule(private val reactContext: ReactApplicationContext)
 
     @ReactMethod
     fun screen(screenName: String, data: ReadableMap?) {
-        dashXClient?.screen(screenName, MapUtil.toMap(data) as HashMap<String, String>)
+        dashXClient?.screen(screenName, data?.toHashMap() as HashMap<String, String>)
     }
 
     @ReactMethod
@@ -185,6 +183,21 @@ class DashXReactNativeModule(private val reactContext: ReactApplicationContext)
         )
     }
 
+    @ReactMethod
+    fun saveStoredPreferences(preferenceData: ReadableMap?, promise: Promise) {
+        val preferencesString = MapUtil.toJSONElement(preferenceData).toString()
+
+        dashXClient?.saveStoredPreferences(
+            preferencesString,
+            onError = {
+                promise.reject("EUNSPECIFIED", it)
+            },
+            onSuccess = { content ->
+                promise.resolve(convertJsonToMap(content))
+            }
+        )
+    }
+
     @ReactMethod
     fun uploadExternalAsset(
         file: ReadableMap, 
@@ -215,23 +228,6 @@ class DashXReactNativeModule(private val reactContext: ReactApplicationContext)
         )
     }
 
-    @ReactMethod
-    fun externalAsset(
-            id: String,
-            promise: Promise
-    ) {
-        dashXClient?.externalAsset(
-            id,
-            onError = {
-                promise.reject("EUNSPECIFIED", it)
-            },
-            onSuccess = { content ->
-                val jsonObject = Gson().toJsonTree(content, ExternalAsset::class.java).asJsonObject
-                promise.resolve(convertJsonToMap(jsonObject))
-            }
-        )
-    }
-
     @ReactMethod
     fun subscribe() {
         dashXClient?.subscribe()

package/android/src/main/java/com/dashx/rn/sdk/util/ArrayUtil.java

@@ -43,38 +43,6 @@ import org.json.JSONObject;
 import org.json.JSONException;
 
 public class ArrayUtil {
-
-  public static JSONArray toJSONArray(ReadableArray readableArray) throws JSONException {
-    JSONArray jsonArray = new JSONArray();
-
-    for (int i = 0; i < readableArray.size(); i++) {
-      ReadableType type = readableArray.getType(i);
-
-      switch (type) {
-        case Null:
-          jsonArray.put(i, null);
-          break;
-        case Boolean:
-          jsonArray.put(i, readableArray.getBoolean(i));
-          break;
-        case Number:
-          jsonArray.put(i, readableArray.getDouble(i));
-          break;
-        case String:
-          jsonArray.put(i, readableArray.getString(i));
-          break;
-        case Map:
-          jsonArray.put(i, MapUtil.toJSONObject(readableArray.getMap(i)));
-          break;
-        case Array:
-          jsonArray.put(i, ArrayUtil.toJSONArray(readableArray.getArray(i)));
-          break;
-      }
-    }
-
-    return jsonArray;
-  }
-
   public static Object[] toArray(JSONArray jsonArray) throws JSONException {
     Object[] array = new Object[jsonArray.length()];
 

package/android/src/main/java/com/dashx/rn/sdk/util/MapUtil.java

@@ -32,6 +32,9 @@ import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
 import com.facebook.react.bridge.ReadableType;
 import com.facebook.react.bridge.WritableMap;
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
 
 import java.util.Map;
 import java.util.HashMap;
@@ -43,38 +46,9 @@ import org.json.JSONException;
 
 public class MapUtil {
 
-  public static JSONObject toJSONObject(ReadableMap readableMap) throws JSONException {
-    JSONObject jsonObject = new JSONObject();
-
-    ReadableMapKeySetIterator iterator = readableMap.keySetIterator();
-
-    while (iterator.hasNextKey()) {
-      String key = iterator.nextKey();
-      ReadableType type = readableMap.getType(key);
-
-      switch (type) {
-        case Null:
-          jsonObject.put(key, null);
-          break;
-        case Boolean:
-          jsonObject.put(key, readableMap.getBoolean(key));
-          break;
-        case Number:
-          jsonObject.put(key, readableMap.getDouble(key));
-          break;
-        case String:
-          jsonObject.put(key, readableMap.getString(key));
-          break;
-        case Map:
-          jsonObject.put(key, MapUtil.toJSONObject(readableMap.getMap(key)));
-          break;
-        case Array:
-          jsonObject.put(key, ArrayUtil.toJSONArray(readableMap.getArray(key)));
-          break;
-      }
-    }
-
-    return jsonObject;
+  public static JsonElement toJSONElement(ReadableMap readableMap) throws JSONException {
+    HashMap<String, Object> hashMap = readableMap.toHashMap();
+    return new Gson().toJsonTree(hashMap);
   }
 
   public static Map<String, Object> toMap(JSONObject jsonObject) throws JSONException {

package/index.js

@@ -1,5 +1,6 @@
 import { NativeEventEmitter, NativeModules } from "react-native";
 import { parseFilterObject, toContentSingleton } from "./utils";
+import { getRealPathFromURI } from "react-native-get-real-path";
 
 import ContentOptionsBuilder from "./ContentOptionsBuilder";
 
@@ -16,6 +17,8 @@ const {
 	uploadExternalAsset,
 	prepareExternalAsset,
 	externalAsset,
+	fetchStoredPreferences,
+	saveStoredPreferences,
 } = DashX;
 
 DashX.identify = (options) => {
@@ -50,8 +53,13 @@ DashX.fetchContent = (contentType, options) => {
 	return fetchContent(contentType, options);
 };
 
-DashX.uploadExternalAsset = (file, externalColumnId) => {
-	return uploadExternalAsset(file, externalColumnId);
+DashX.uploadExternalAsset = async (file, externalColumnId) => {
+  // Convert content uri to file uri
+  if (file.uri.startsWith("content://")) {
+    file.uri = `file://${await getRealPathFromURI(file.uri)}`;
+  }
+
+  return uploadExternalAsset(file, externalColumnId);
 };
 
 DashX.prepareExternalAsset = (externalColumnId) => {
@@ -62,6 +70,14 @@ DashX.externalAsset = (assetId) => {
 	return externalAsset(assetId);
 };
 
+DashX.fetchStoredPreferences = () => {
+	return fetchStoredPreferences();
+};
+
+DashX.saveStoredPreferences = (preferenceData) => {
+	return saveStoredPreferences(preferenceData);
+};
+
 DashX.onMessageReceived = (callback) => {
 	dashXEventEmitter.addListener("messageReceived", callback);
 };

package/ios/DashX.swift

@@ -92,7 +92,6 @@ class DashXReactNative: RCTEventEmitter {
 
     @objc(addItemToCart:pricingId:quantity:reset:custom:resolver:rejecter:)
     func addItemToCart(_ itemId: String, _ pricingId: String, _ quantity: String, _ reset: Bool, _ custom: NSDictionary?, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
-
         dashXClient.addItemToCart(
             itemId: itemId,
             pricingId: pricingId,
@@ -106,7 +105,6 @@ class DashXReactNative: RCTEventEmitter {
 
     @objc(fetchCart:rejecter:)
     func fetchCart(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
-
         dashXClient.fetchCart(
             successCallback: CBU.resolveToSuccessCallback(resolve),
             failureCallback: CBU.rejectToFailureCallback(reject)
@@ -115,13 +113,22 @@ class DashXReactNative: RCTEventEmitter {
 
     @objc(fetchStoredPreferences:rejecter:)
     func fetchStoredPreferences(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
-
         dashXClient.fetchStoredPreferences(
             successCallback: CBU.resolveToSuccessCallback(resolve),
             failureCallback: CBU.rejectToFailureCallback(reject)
         )
     }
 
+    @objc(saveStoredPreferences:resolve:rejecter:)
+    func saveStoredPreferences(_ preferenceData: NSDictionary, _ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+        dashXClient.saveStoredPreferences(
+            preferenceData: preferenceData,
+            successCallback: CBU.resolveToSuccessCallback(resolve),
+            failureCallback: CBU.rejectToFailureCallback(reject)
+        )
+    }
+
+
     @objc(uploadExternalAsset:externalColumnId:resolver:rejecter:)
     func uploadExternalAsset(_ file: NSDictionary, _ externalColumnId: String, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
         if let fileDictionary = file as? [String: Any], let fileURI = fileDictionary["uri"] as? String {

package/ios/DashXReactNative.m

@@ -18,6 +18,7 @@ RCT_EXTERN_METHOD(fetchContent:(NSString *)urn options:(NSDictionary *)options r
 RCT_EXTERN_METHOD(addItemToCart:(NSString *)itemId pricingId:(NSString *)pricingId quantity:(NSString *)quantity reset:(BOOL)reset custom:(NSDictionary *)custom resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(fetchCart:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(fetchStoredPreferences:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(saveStoredPreferences:(NSDictionary *)preferenceData resolve:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(uploadExternalAsset:(NSDictionary *)file externalColumnId:(NSString *)externalColumnId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(externalAsset:(NSString *)assetId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(subscribe)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dashx/react-native",
   "title": "DashX React Native",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "DashX SDK for React Native",
   "main": "index.js",
   "files": [
@@ -11,14 +11,14 @@
     "ContentOptionsBuilder.js",
     "utils.js",
     "ios",
-    "DashX.podspec"
+    "DashXReactNative.podspec"
   ],
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/dashxhq/dashx-react-native"
+    "url": "https://github.com/dashxhq/dashx-react-native"
   },
   "keywords": [
     "react-native"
@@ -35,5 +35,8 @@
   "devDependencies": {
     "eslint": "^8.21.0",
     "eslint-plugin-react": "^7.30.1"
+  },
+  "dependencies": {
+    "react-native-get-real-path": "github:Wraptime/react-native-get-real-path"
   }
 }