Merge pull request #638 from Iterable/eudc-updates

[MOB-6320] prepare EUDC updates for release

Author: evantk91

swift-sdk/Constants.swift

@@ -267,6 +267,11 @@ enum JsonValue {
     }
 }
 
+public enum IterableDataRegion {
+    public static let US = "https://api.iterable.com/api/"
+    public static let EU = "https://api.eu.iterable.com/api/"
+}
+
 public protocol JsonValueRepresentable {
     var jsonValue: Any { get }
 }

swift-sdk/Internal/InternalIterableAPI.swift

@@ -82,6 +82,12 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
         self.dependencyContainer.createAuthManager(config: self.config)
     }()
 
+    var apiEndPointForTest: String {
+        get {
+            apiEndPoint
+        }
+    }
+    
     // MARK: - SDK Functions
 
     @discardableResult func handleUniversalLink(_ url: URL) -> Bool {
@@ -583,6 +589,11 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
         }
     }
 
+    private static func setApiEndpoint(apiEndPointOverride: String?, config: IterableConfig) -> String {
+        let apiEndPoint = config.dataRegion
+        return apiEndPointOverride ?? apiEndPoint
+    }
+    
     init(apiKey: String,
          launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil,
          config: IterableConfig = IterableConfig(),
@@ -593,7 +604,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
         self.apiKey = apiKey
         self.launchOptions = launchOptions
         self.config = config
-        apiEndPoint = apiEndPointOverride ?? Endpoint.api
+        apiEndPoint = InternalIterableAPI.setApiEndpoint(apiEndPointOverride: apiEndPointOverride, config: config)
         self.dependencyContainer = dependencyContainer
         dateProvider = dependencyContainer.dateProvider
         networkSession = dependencyContainer.networkSession

swift-sdk/IterableConfig.swift

@@ -124,4 +124,7 @@ public class IterableConfig: NSObject {
 
     /// Set whether the SDK should store in-apps only in memory, or in file storage
     public var useInMemoryStorageForInApps = false
+    
+    /// Sets data region which determines data center and endpoints used by the SDK
+    public var dataRegion: String = IterableDataRegion.US
 }

tests/unit-tests/IterableAPITests.swift

@@ -11,6 +11,8 @@ class IterableAPITests: XCTestCase {
     private static let apiKey = "zeeApiKey"
     private static let email = "[email protected]"
     private static let userId = "testUserId"
+    private static let apiEndPointUS = "https://api.iterable.com/api/"
+    private static let apiEndPointEU = "https://api.eu.iterable.com/api/"
 
     override func setUp() {
         super.setUp()
@@ -34,6 +36,32 @@ class IterableAPITests: XCTestCase {
         XCTAssertEqual(internalAPI.apiKey, IterableAPITests.apiKey)
     }
 
+    func testInitializeWithDefaultDataRegion() {
+        let prodIntegrationName = "the-best-app-ever"
+
+        let config = IterableConfig()
+        config.pushIntegrationName = prodIntegrationName
+        config.inAppDisplayInterval = 1.0
+        config.dataRegion = IterableDataRegion.US
+
+        let internalAPI = InternalIterableAPI.initializeForTesting(apiKey: IterableAPITests.apiKey, config: config)
+
+        XCTAssertEqual(internalAPI.apiEndPointForTest, IterableAPITests.apiEndPointUS)
+    }
+    
+    func testInitializeWithEUDataRegion() {
+        let prodIntegrationName = "the-best-app-ever"
+
+        let config = IterableConfig()
+        config.pushIntegrationName = prodIntegrationName
+        config.inAppDisplayInterval = 1.0
+        config.dataRegion = IterableDataRegion.EU
+
+        let internalAPI = InternalIterableAPI.initializeForTesting(apiKey: IterableAPITests.apiKey, config: config)
+
+        XCTAssertEqual(internalAPI.apiEndPointForTest, IterableAPITests.apiEndPointEU)
+    }
+    
     func testInitializeCheckEndpoint() {
         let expectation1 = XCTestExpectation(description: "api endpoint called")