@dashx/react-native 1.0.8 → 1.1.0

package/android/gradlew.bat

@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

package/android/src/main/AndroidManifest.xml

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

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

@@ -1,15 +1,11 @@
 package com.dashx.rn.sdk
 
-import android.content.pm.PackageInfo
-import android.content.pm.PackageManager.NameNotFoundException
 import android.net.Uri
 import com.dashx.rn.sdk.util.*
-import com.dashx.sdk.DashXClient as DashX
-import com.dashx.sdk.DashXLog
-import com.dashx.sdk.DashXLog.LogLevel
-import com.dashx.sdk.data.LibraryInfo
+import com.dashx.android.DashX
+import com.dashx.android.DashXLog
+import com.dashx.android.DashXLog.LogLevel
 import com.facebook.react.bridge.*
-import java.io.File
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -17,7 +13,6 @@ import kotlinx.serialization.json.JsonObject
 
 class DashXReactNativeModule(private val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
     private val tag = DashXReactNativeModule::class.java.simpleName
-    private var dashXClient: DashX? = null
 
     override fun getName(): String {
         return "DashXReactNative"
@@ -31,29 +26,28 @@ class DashXReactNativeModule(private val reactContext: ReactApplicationContext)
 
     @ReactMethod
     fun configure(options: ReadableMap) {
-        dashXClient = DashX.configure(
+        DashX.configure(
             reactContext,
             options.getString("publicKey")!!,
             options.getStringIfPresent("baseURI"),
-            options.getStringIfPresent("targetEnvironment"),
-            LibraryInfo("dashx-react-native", BuildConfig.VERSION_NAME)
+            options.getStringIfPresent("targetEnvironment")
         )
     }
 
     @ReactMethod
     fun identify(options: ReadableMap?) {
         val optionsHashMap = options?.toHashMap()
-        dashXClient?.identify(optionsHashMap as HashMap<String, String>?)
+        DashX.identify(optionsHashMap as HashMap<String, String>?)
     }
 
     @ReactMethod
     fun setIdentity(uid: String?, token: String?) {
-        dashXClient?.setIdentity(uid, token)
+        DashX.setIdentity(uid, token)
     }
 
     @ReactMethod
     fun reset() {
-        dashXClient?.reset()
+        DashX.reset()
     }
 
     @ReactMethod
@@ -65,25 +59,22 @@ class DashXReactNativeModule(private val reactContext: ReactApplicationContext)
             return
         }
 
-        dashXClient?.track(event, jsonData)
+        DashX.track(event, jsonData)
     }
 
     @ReactMethod
     fun screen(screenName: String, data: ReadableMap?) {
-        dashXClient?.screen(screenName, data?.toHashMap() as HashMap<String, String>)
+        DashX.screen(screenName, data?.toHashMap() as HashMap<String, String>)
     }
 
     @ReactMethod
     fun fetchContent(urn: String, options: ReadableMap?, promise: Promise) {
-        dashXClient?.fetchContent(
+        DashX.fetchRecord(
             urn,
             options?.getBooleanIfPresent("preview"),
             options?.getStringIfPresent("language"),
-            listOf(options?.getArray("fields")) as List<String>?,
-            listOf(options?.getArray("include")) as List<String>?,
-            listOf(options?.getArray("exclude")) as List<String>?,
             onError = {
-                promise.reject("EUNSPECIFIED", it)
+                promise.reject("EUNSPECIFIED", it.message)
             },
             onSuccess = {
                 promise.resolve(convertJsonToMap(convertKJsonToJson(it)))
@@ -107,19 +98,11 @@ class DashXReactNativeModule(private val reactContext: ReactApplicationContext)
             throw Exception("Encountered an error while parsing order")
         }
 
-        dashXClient?.searchContent(
+        DashX.searchRecords(
             contentType,
-            options?.getString("returnType") ?: "all",
             convertJsonToKJson(jsonFilter),
-            convertJsonToKJson(jsonOrder),
-            options?.getIntIfPresent("limit"),
-            options?.getBooleanIfPresent("preview"),
-            options?.getStringIfPresent("language"),
-            listOf(options?.getArray("fields")) as List<String>?,
-            listOf(options?.getArray("include")) as List<String>?,
-            listOf(options?.getArray("exclude")) as List<String>?,
             onError = {
-                promise.reject("EUNSPECIFIED", it)
+                promise.reject("EUNSPECIFIED", it.message)
             },
             onSuccess = { content ->
                 val readableArray = Arguments.createArray()
@@ -131,54 +114,11 @@ class DashXReactNativeModule(private val reactContext: ReactApplicationContext)
         )
     }
 
-    @ReactMethod
-    fun addItemToCart(
-        itemId: String,
-        pricingId: String,
-        quantity: String,
-        reset: Boolean? = false,
-        custom: ReadableMap? = null,
-        promise: Promise
-    ) {
-        val jsonCustom = try {
-            convertMapToJson(custom)
-        } catch (e: Exception) {
-            DashXLog.d(tag, e.message)
-            throw Exception("Encountered an error while parsing custom")
-        }
-
-        dashXClient?.addItemToCart(
-            itemId,
-            pricingId,
-            quantity,
-            reset ?: false,
-            convertJsonToKJson(jsonCustom),
-            onError = {
-                promise.reject("EUNSPECIFIED", it)
-            },
-            onSuccess = { content ->
-                promise.resolve(convertJsonToMap(convertKJsonToJson(Json.decodeFromString<JsonObject>(Json.encodeToString(content)))))
-            }
-        )
-    }
-
-    @ReactMethod
-    fun fetchCart(promise: Promise) {
-        dashXClient?.fetchCart(
-            onError = {
-                promise.reject("EUNSPECIFIED", it)
-            },
-            onSuccess = { content ->
-                promise.resolve(convertJsonToMap(convertKJsonToJson(Json.decodeFromString<JsonObject>(Json.encodeToString(content)))))
-            }
-        )
-    }
-
     @ReactMethod
     fun fetchStoredPreferences(promise: Promise) {
-        dashXClient?.fetchStoredPreferences(
+        DashX.fetchStoredPreferences(
             onError = {
-                promise.reject("EUNSPECIFIED", it)
+                promise.reject("EUNSPECIFIED", it.message)
             },
             onSuccess = { content ->
                 promise.resolve(convertJsonToMap(convertKJsonToJson(Json.decodeFromString<JsonObject>(Json.encodeToString(content)))))
@@ -190,10 +130,10 @@ class DashXReactNativeModule(private val reactContext: ReactApplicationContext)
     fun saveStoredPreferences(preferenceData: ReadableMap?, promise: Promise) {
         val preferencesString = MapUtil.toJSONElement(preferenceData).toString()
 
-        dashXClient?.saveStoredPreferences(
+        DashX.saveStoredPreferences(
             Json.decodeFromString<JsonObject>(preferencesString),
             onError = {
-                promise.reject("EUNSPECIFIED", it)
+                promise.reject("EUNSPECIFIED", it.message)
             },
             onSuccess = { content ->
                 promise.resolve(convertJsonToMap(convertKJsonToJson(Json.decodeFromString<JsonObject>(Json.encodeToString(content)))))
@@ -203,27 +143,11 @@ class DashXReactNativeModule(private val reactContext: ReactApplicationContext)
 
     @ReactMethod
     fun subscribe() {
-        dashXClient?.subscribe()
+        DashX.subscribe()
     }
 
     @ReactMethod
     fun unsubscribe() {
-        dashXClient?.unsubscribe()
-    }
-
-    //FIXME Amend the logic to work with React Native content URIs
-    fun getFilePathFromURIString(contentUriString: String): String {
-        val sanitizedURI = contentUriString.replace("\"", "")
-        val path = Uri.parse(sanitizedURI).path
-        val index = path?.indexOf(':')
-
-        if (index == null) {
-            return ""
-        }
-
-        // Remove unnecessary URI component
-        val filePath = path!!.substring(index!! + 1)
-
-        return filePath
+        DashX.unsubscribe()
     }
 }

package/babel.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  presets: ['module:metro-react-native-babel-preset'],
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dashx/react-native",
   "title": "DashX React Native",
-  "version": "1.0.8",
+  "version": "1.1.0",
   "description": "DashX SDK for React Native",
   "main": "index.js",
   "files": [
@@ -54,7 +54,7 @@
   },
   "devDependencies": {
     "@commitlint/config-conventional": "^17.0.2",
-    "@react-native/eslint-config": "^0.72.2",
+    "@react-native/eslint-config": "0.77.3",
     "del-cli": "^5.0.0",
     "eslint": "^8.4.1",
     "eslint-config-prettier": "^8.5.0",
@@ -62,15 +62,14 @@
     "jest": "^28.1.1",
     "pod-install": "^0.1.0",
     "prettier": "^2.0.5",
-    "react": "18.2.0",
-    "react-native": "0.72.3",
+    "react": "18.3.1",
+    "react-native": "0.77.3",
     "react-native-builder-bob": "^0.21.3",
     "turbo": "^1.10.7"
   },
   "engines": {
     "node": ">= 16.0.0"
   },
-  "packageManager": "^yarn@1.22.15",
   "dependencies": {
     "react-native-get-real-path": "github:Wraptime/react-native-get-real-path"
   },

package/utils/RestAPIClient.js

@@ -0,0 +1,154 @@
+import { Platform } from 'react-native'
+import RNFetchBlob from 'rn-fetch-blob'
+import axios from 'axios'
+
+/** Prepare headers headers for the authenticated calls */
+const getNetworkHeaders = (config, customHeaders) => {
+  return {
+    'X-Public-Key': `${config.publicKey}`,
+    //TODO Include identity token as well in the request in future. Currently backend returns "incorrect format" error
+    // "X-Identity-Token": `${config.identityToken}`,
+    'X-Target-Environment': `${config.targetEnvironment}`,
+    Accept: '*/*',
+    ...customHeaders,
+  }
+}
+
+const getNetworkRequestData = (config, customHeaders = {}) => {
+  return {
+    url: config.baseUri,
+    headers: getNetworkHeaders(config, customHeaders),
+  }
+}
+
+export const prepareExternalAsset = async (externalColumnId, config) => {
+  const request = {
+    ...getNetworkRequestData(config),
+    method: 'POST',
+    data: {
+      query: `mutation PrepareExternalAsset($input: PrepareExternalAssetInput!) {
+                prepareExternalAsset(input: $input) {
+                  id
+                  installationId
+                  externalColumnId
+                  storageProviderId
+                  status
+                  data
+                  createdAt
+                  updatedAt
+                }
+              }`,
+      variables: {
+        input: {
+          externalColumnId,
+        },
+      },
+    },
+  }
+
+  const response = await axios.request(request)
+
+  return response?.data?.data?.prepareExternalAsset
+}
+
+export const queryExternalAsset = async (assetId, config) => {
+  const response = await axios.request({
+    ...getNetworkRequestData(config),
+    method: 'POST',
+    data: {
+      query: `query ExternalAsset($id: ID!) {
+                externalAsset(id: $id) {
+                  id
+                  status
+                  data
+                }
+              }`,
+      variables: {
+        id: assetId,
+      },
+    },
+  })
+
+  return response?.data?.data?.externalAsset
+}
+
+export const uploadFile = async (url, file, config) => {
+  if (!file || Object.keys(file).length === 0) {
+    throw new Error('File is empty')
+  }
+
+  let { uri, path, type } = file
+  const uriTransformer = Platform.select({
+    ios: () => (uri || path).replace('file://', ''),
+    android: () => {
+      return uri || path
+    },
+  })
+
+  const fileName =
+    file.filename || file.name || `${(uri || path).split('/').pop()}`
+
+  const transformedFile = {
+    filename: fileName,
+    name: fileName,
+    uri: uriTransformer(),
+    type,
+  }
+
+  const response = await RNFetchBlob.fetch(
+    'PUT',
+    config.baseUri,
+    getNetworkHeaders(config, { type }),
+    RNFetchBlob.wrap(transformedFile.uri)
+  )
+  return response.data?.data
+}
+
+const pollTillAssetIsReady = async (assetId, config, retryCount) => {
+  return new Promise(function (resolve, reject) {
+    const retryWindowMillis = 3000
+
+    function queryAssetWithRetryTimeout(retry) {
+      if (retry === 0) {
+        return resolve({ id: assetId })
+      }
+
+      queryExternalAsset(assetId, config)
+        .then((assetResponse) => {
+          if (assetResponse?.status === 'ready') {
+            resolve(assetResponse)
+          } else {
+            setTimeout(function () {
+              queryAssetWithRetryTimeout(retry - 1)
+            }, retryWindowMillis)
+          }
+        })
+        .catch(reject)
+    }
+
+    queryAssetWithRetryTimeout(retryCount)
+  })
+}
+
+export const uploadExternalAsset = async (
+  file,
+  externalColumnId,
+  config,
+  onSuccess,
+  onFailure
+) => {
+  try {
+    const preparedAsset = await prepareExternalAsset(externalColumnId, config)
+
+    const uploadUrl = preparedAsset?.data?.upload?.url,
+      assetId = preparedAsset?.id
+
+    await uploadFile(uploadUrl, file, config)
+
+    const response = await pollTillAssetIsReady(assetId, config, 10)
+
+    onSuccess(response)
+  } catch (error) {
+    onFailure(error)
+  }
+}