fix: support for expo client

customerio · Oct 31, 2022 · b641fd8 · b641fd8
1 parent c95ddb7
commit b641fd8
Show file tree

Hide file tree

Showing 10 changed files with 153 additions and 92 deletions.
diff --git a/android/src/main/java/io/customer/reactnative/sdk/CustomerIOReactNativeInstance.kt b/android/src/main/java/io/customer/reactnative/sdk/CustomerIOReactNativeInstance.kt
@@ -30,7 +30,7 @@ object CustomerIOReactNativeInstance {
                 context = context,
                 environment = preferencesStorage.loadEnvironmentSettings(),
                 configuration = preferencesStorage.loadConfigurationSettings(),
-                sdkVersion = preferencesStorage.loadSDKVersion(),
+                packageConfig = preferencesStorage.loadPackageConfigurations(),
             )
             logger.info("Customer.io instance initialized successfully from preferences")
         } catch (ex: Exception) {
@@ -43,7 +43,7 @@ object CustomerIOReactNativeInstance {
         context: Context,
         environment: Map<String, Any?>,
         configuration: Map<String, Any?>?,
-        sdkVersion: String?,
+        packageConfig: Map<String, Any?>?,
     ): CustomerIO {
         val siteId = environment.getString(Keys.Environment.SITE_ID)
         val apiKey = environment.getString(Keys.Environment.API_KEY)
@@ -60,7 +60,7 @@ object CustomerIOReactNativeInstance {
             region = region,
             appContext = context.applicationContext as Application,
         ).apply {
-            setClient(Client.ReactNative(sdkVersion = sdkVersion ?: "n/a"))
+            setClient(client = getUserAgentClient(packageConfig = packageConfig))
             setupConfig(configuration)
             addCustomerIOModule(module = configureModuleMessagingPushFCM(configuration))
             if (!organizationId.isNullOrBlank()) {
@@ -69,6 +69,23 @@ object CustomerIOReactNativeInstance {
         }.build()
     }
 
+    private fun getUserAgentClient(packageConfig: Map<String, Any?>?): Client {
+        val sourceSDK = packageConfig?.getProperty<String>(
+            Keys.PackageConfig.SOURCE_SDK
+        )?.takeIfNotBlank()
+        val sourceSDKVersion = packageConfig?.getProperty<String>(
+            Keys.PackageConfig.SOURCE_SDK_VERSION
+        )?.takeIfNotBlank() ?: packageConfig?.getProperty<String>(
+            Keys.PackageConfig.SOURCE_SDK_VERSION_COMPAT
+        )?.takeIfNotBlank() ?: "n/a"
+        return when {
+            sourceSDK?.equals(
+                other = "expo", ignoreCase = true,
+            ) == true -> Client.Expo(sdkVersion = sourceSDKVersion)
+            else -> Client.ReactNative(sdkVersion = sourceSDKVersion)
+        }
+    }
+
     private fun CustomerIO.Builder.setupConfig(config: Map<String, Any?>?): CustomerIO.Builder {
         if (config == null) return this
 

diff --git a/android/src/main/java/io/customer/reactnative/sdk/CustomerIOReactNativeModule.kt b/android/src/main/java/io/customer/reactnative/sdk/CustomerIOReactNativeModule.kt
@@ -39,26 +39,27 @@ class CustomerIOReactNativeModule(
     fun initialize(
         environment: ReadableMap,
         configuration: ReadableMap? = null,
-        sdkVersion: String? = null,
+        packageConfiguration: ReadableMap? = null,
     ) {
         if (isInstanceValid()) {
             logger.info("Customer.io instance already initialized, reinitializing")
         }
 
         val env = environment.toMap()
         val config = configuration?.toMap()
+        val packageConfig = packageConfiguration?.toMap()
 
         preferencesStorage.saveSettings(
             environment = env,
             configuration = config,
-            sdkVersion = sdkVersion
+            packageConfig = packageConfig
         )
         try {
             customerIO = CustomerIOReactNativeInstance.initialize(
                 context = reactApplicationContext,
                 environment = env,
                 configuration = config,
-                sdkVersion = sdkVersion,
+                packageConfig = packageConfig,
             )
             logger.info("Customer.io instance initialized successfully from app")
         } catch (ex: Exception) {

diff --git a/android/src/main/java/io/customer/reactnative/sdk/constant/Keys.kt b/android/src/main/java/io/customer/reactnative/sdk/constant/Keys.kt
@@ -16,4 +16,10 @@ internal object Keys {
         const val BACKGROUND_QUEUE_MIN_NUMBER_OF_TASKS = "backgroundQueueMinNumberOfTasks"
         const val BACKGROUND_QUEUE_SECONDS_DELAY = "backgroundQueueSecondsDelay"
     }
+
+    object PackageConfig {
+        const val SOURCE_SDK = "source"
+        const val SOURCE_SDK_VERSION = "version"
+        const val SOURCE_SDK_VERSION_COMPAT = "sdkVersion"
+    }
 }
diff --git a/android/src/main/java/io/customer/reactnative/sdk/storage/PreferencesStorage.kt b/android/src/main/java/io/customer/reactnative/sdk/storage/PreferencesStorage.kt
@@ -23,6 +23,9 @@ class PreferencesStorage(context: Context) {
             BACKGROUND_QUEUE_SECONDS_DELAY,
         )
     }
+    private val packageConfigKeys = with(Keys.PackageConfig) {
+        arrayOf(SOURCE_SDK, SOURCE_SDK_VERSION)
+    }
 
     init {
         sharedPref = context.getSharedPreferences(
@@ -33,7 +36,7 @@ class PreferencesStorage(context: Context) {
     fun saveSettings(
         environment: Map<String, Any?>,
         configuration: Map<String, Any?>?,
-        sdkVersion: String?,
+        packageConfig: Map<String, Any?>?,
     ) = with(sharedPref.edit()) {
         for (key in environmentKeys) {
             putString(key, environment[key]?.toString()?.encodeToBase64())
@@ -43,7 +46,11 @@ class PreferencesStorage(context: Context) {
                 putString(key, configuration[key]?.toString()?.encodeToBase64())
             }
         }
-        putString(SDK_VERSION_KEY, sdkVersion?.encodeToBase64())
+        if (packageConfig != null) {
+            for (key in packageConfigKeys) {
+                putString(key, packageConfig[key]?.toString()?.encodeToBase64())
+            }
+        }
         apply()
     }
 
@@ -62,7 +69,10 @@ class PreferencesStorage(context: Context) {
         return map
     }
 
-    fun loadSDKVersion() = sharedPref.getString(SDK_VERSION_KEY, null)?.decodeFromBase64()
+    fun loadPackageConfigurations() = loadSettings(
+        keys = packageConfigKeys.plus(Keys.PackageConfig.SOURCE_SDK_VERSION_COMPAT),
+    )
+
     fun loadEnvironmentSettings() = loadSettings(environmentKeys)
     fun loadConfigurationSettings() = loadSettings(configKeys) { key, value ->
         with(Keys.Config) {
@@ -81,8 +91,6 @@ class PreferencesStorage(context: Context) {
     }
 
     companion object {
-        private const val SDK_VERSION_KEY = "sdkVersion"
-
         private fun String.encodeToBase64(): String {
             return Base64.encodeToString(toByteArray(Charsets.UTF_8), Base64.NO_WRAP)
         }

diff --git a/customerio-reactnative.podspec b/customerio-reactnative.podspec
@@ -16,6 +16,6 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
   s.dependency "React-Core"
-  s.dependency "CustomerIOTracking", '~> 1.2.0'
-  s.dependency "CustomerIOMessagingInApp", '~> 1.2.0'
+  s.dependency "CustomerIOTracking", '~> 1.2.1'
+  s.dependency "CustomerIOMessagingInApp", '~> 1.2.1'
 end
diff --git a/ios/CustomerioReactnative.m b/ios/CustomerioReactnative.m
@@ -4,7 +4,7 @@ @interface RCT_EXTERN_MODULE(CustomerioReactnative, NSObject)
 
 RCT_EXTERN_METHOD(initialize: (nonnull NSDictionary *) env
                   configData : (NSDictionary *) configData
-                  pversion: (nonnull NSString *) pversion)
+                  packageConfig: (nonnull NSDictionary *) packageConfig)
 
 RCT_EXTERN_METHOD(identify: (nonnull NSString *) identifier
                   body : (NSDictionary *) body)

diff --git a/ios/CustomerioReactnative.swift b/ios/CustomerioReactnative.swift
@@ -13,13 +13,24 @@ class CustomerioReactnative: NSObject {
     /**
      Initialize the package before sending any calls to the package
      */
-    @objc(initialize:configData:pversion:)
-    func initialize(env: Dictionary<String, AnyHashable>, configData: Dictionary<String, AnyHashable>, pversion: String) -> Void {
+    @objc(initialize:configData:packageConfig:)
+    func initialize(env: Dictionary<String, AnyHashable>, configData: Dictionary<String, AnyHashable>, packageConfig: Dictionary<String, AnyHashable>) -> Void {
+
         guard let siteId = env["siteId"] as? String, let apiKey = env["apiKey"] as? String, let region = env["region"] as? String, let organizationId = env["organizationId"] as? String else {
             return
         }
+
+        guard let pversion = packageConfig["version"] as? String, let source = packageConfig["source"] as? String else {
+            return
+        }
+
+        var sdkSource = SdkWrapperConfig.Source.reactNative
+        if source.lowercased() == "expo" {
+            sdkSource = SdkWrapperConfig.Source.expo
+        }
+
         CustomerIO.initialize(siteId: siteId, apiKey: apiKey, region: Region.getLocation(from: region)) { config in
-            config._sdkWrapperConfig = SdkWrapperConfig(source: SdkWrapperConfig.Source.reactNative, version: pversion )
+            config._sdkWrapperConfig = SdkWrapperConfig(source: sdkSource, version: pversion )
             config.autoTrackDeviceAttributes = configData["autoTrackDeviceAttributes"] as! Bool
             config.logLevel = CioLogLevel.getLogValue(for: configData["logLevel"] as! Int)
             config.autoTrackPushEvents = configData["autoTrackPushEvents"] as! Bool

diff --git a/package.json b/package.json
@@ -7,6 +7,7 @@
   "types": "lib/typescript/index.d.ts",
   "react-native": "src/index",
   "source": "src/index",
+  "expoVersion": "",
   "files": [
     "src",
     "lib",

diff --git a/src/CustomerioConfig.tsx b/src/CustomerioConfig.tsx
@@ -26,7 +26,13 @@ class CustomerIOEnv {
     organizationId: string = ""
 }
 
+class PackageConfig {
+    version: string = ""
+    source: string = ""
+}
+
 export {
     CustomerioConfig,
-    CustomerIOEnv
+    CustomerIOEnv,
+    PackageConfig
 }