Merge pull request #492 from Iterable/eudc-updates

[MOB-6321] prepare EUDC updates for release

Author: evantk91

android/src/main/java/com/iterable/reactnative/Serialization.java

@@ -15,6 +15,7 @@
 import com.iterable.iterableapi.IterableAction;
 import com.iterable.iterableapi.IterableActionContext;
 import com.iterable.iterableapi.IterableConfig;
+import com.iterable.iterableapi.IterableDataRegion;
 import com.iterable.iterableapi.IterableInAppCloseAction;
 import com.iterable.iterableapi.IterableInAppDeleteActionType;
 import com.iterable.iterableapi.IterableInAppHandler;
@@ -198,6 +199,24 @@ static IterableConfig.Builder getConfigFromReadableMap(ReadableMap iterableConte
                 configBuilder.setLogLevel(logLevel);
             }
 
+            if(iterableContextJSON.has("dataRegion")) {
+                int dataRegion = iterableContextJSON.getInt("dataRegion");
+                IterableDataRegion iterableDataRegion = IterableDataRegion.US;
+                switch (dataRegion) {
+                    case 0:
+                        iterableDataRegion = IterableDataRegion.US;
+                        break;
+                    case 1:
+                        iterableDataRegion = IterableDataRegion.EU;
+                        break;
+                    default:
+                        iterableDataRegion = IterableDataRegion.US;
+                        break;
+                }
+
+                configBuilder.setDataRegion(iterableDataRegion);
+            }
+          
             if (iterableContextJSON.has("encryptionEnforced")) {
                 configBuilder.setEncryptionEnforced(iterableContextJSON.optBoolean("encryptionEnforced"));
             }

ios/RNIterableAPI/Serialization.swift

@@ -70,6 +70,18 @@ extension IterableConfig {
         if let useInMemoryStorageForInApp = dict["useInMemoryStorageForInApps"] as? Bool {
             config.useInMemoryStorageForInApps = useInMemoryStorageForInApp
         }
+
+        if let dataRegion = dict["dataRegion"] as? NSNumber {
+            switch dataRegion {
+            case 0:
+                config.dataRegion = IterableDataRegion.US
+            case 1:
+                config.dataRegion = IterableDataRegion.EU
+            default:
+                config.dataRegion = IterableDataRegion.US
+            }
+        }
+        
 
         return config
     }

ts/IterableConfig.ts

@@ -10,6 +10,8 @@ import { IterableInAppShowResponse } from './IterableInAppClasses'
 
 import IterableInAppMessage from './IterableInAppMessage'
 
+import { IterableDataRegion } from './IterableDataRegion'
+
 type AuthCallBack = (() => void)
 
 /**
@@ -115,6 +117,11 @@ class IterableConfig {
    */
   useInMemoryStorageForInApps: boolean = false
 
+  /**
+   * This specifies the data region which determines the data center and associated endpoints used by the SDK
+   */
+  dataRegion: IterableDataRegion = IterableDataRegion.US
+  
   /**
    * Android only feature: This controls whether the SDK should enforce encryption for all PII stored on disk.
    * By default, the SDK will not enforce encryption and may fallback to unencrypted storage in case the encryption fails.
@@ -135,6 +142,7 @@ class IterableConfig {
       "allowedProtocols": this.allowedProtocols,
       "androidSdkUseInMemoryStorageForInApps": this.androidSdkUseInMemoryStorageForInApps,
       "useInMemoryStorageForInApps": this.useInMemoryStorageForInApps,
+      "dataRegion": this.dataRegion,
       "encryptionEnforced": this.encryptionEnforced
     }
   }

ts/IterableDataRegion.ts

@@ -0,0 +1,8 @@
+enum IterableDataRegion {
+    US = 0,
+    EU = 1
+  }
+
+export {
+    IterableDataRegion
+}

ts/__tests__/Iterable.spec.ts

@@ -19,6 +19,7 @@ import {
   IterableActionSource
 } from '../Iterable'
 import { IterableLogger } from '../IterableLogger'
+import { IterableDataRegion } from '../IterableDataRegion'
 
 beforeEach(() => {
   jest.clearAllMocks()
@@ -239,6 +240,7 @@ test('iterableConfig_noParams_defaultValues', () => {
   expect(config.allowedProtocols).toEqual([])
   expect(config.androidSdkUseInMemoryStorageForInApps).toBe(false)
   expect(config.useInMemoryStorageForInApps).toBe(false)
+  expect(config.dataRegion).toBe(IterableDataRegion.US)
   expect(config.encryptionEnforced).toBe(false)
 })
 
@@ -262,6 +264,7 @@ test('iterableConfig_noParams_defaultDictValues', () => {
   expect(configDict.allowedProtocols).toEqual([])
   expect(configDict.androidSdkUseInMemoryStorageForInApps).toBe(false)
   expect(configDict.useInMemoryStorageForInApps).toBe(false)
+  expect(configDict.dataRegion).toBe(IterableDataRegion.US)
   expect(configDict.encryptionEnforced).toBe(false)
 })
 

ts/index.ts

@@ -40,6 +40,7 @@ import useDeviceOrientation from './useDeviceOrientation'
 import InboxImpressionRowInfo from './InboxImpressionRowInfo'
 
 import IterableConfig from './IterableConfig'
+import { IterableDataRegion } from './IterableDataRegion'
 
 export {
   Iterable,
@@ -63,7 +64,8 @@ export {
   IterableInboxEmptyState,
   IterableInboxMessageCell,
   useAppStateListener,
-  useDeviceOrientation
+  useDeviceOrientation,
+  IterableDataRegion
 }
 export type {
   IterableInAppContent,