Merge branch 'master' into jay/MOB-4239-updateEmail-withToken

roninopf · roninopf · commit d0e03903709d · 2022-04-19T10:46:25.000-07:00
diff --git a/swift-sdk.xcodeproj/project.pbxproj b/swift-sdk.xcodeproj/project.pbxproj
diff --git a/swift-sdk.xcodeproj/xcshareddata/xcschemes/ios9-tests.xcscheme b/swift-sdk.xcodeproj/xcshareddata/xcschemes/ios9-tests.xcscheme
diff --git a/swift-sdk/Internal/ActionRunner.swift b/swift-sdk/Internal/ActionRunner.swift
@@ -20,7 +20,7 @@ class AppUrlOpener: UrlOpenerProtocol {
     }
 }
 
-struct IterableActionRunner {
+struct ActionRunner {
     // returns true if an action is performed either by us or by the calling app.
     @discardableResult
     static func execute(action: IterableAction,
diff --git a/swift-sdk/Internal/ApiClient.swift b/swift-sdk/Internal/ApiClient.swift
@@ -82,7 +82,7 @@ class ApiClient {
             return .failure(IterableError.general(description: "authProvider is missing"))
         }
         
-        return .success(RequestCreator(apiKey: apiKey, auth: authProvider.auth, deviceMetadata: deviceMetadata))
+        return .success(RequestCreator(auth: authProvider.auth, deviceMetadata: deviceMetadata))
     }
     
     private let apiKey: String
diff --git a/swift-sdk/Internal/DeepLinkManager.swift b/swift-sdk/Internal/DeepLinkManager.swift
@@ -4,10 +4,11 @@
 
 import Foundation
 
-class IterableDeepLinkManager: NSObject {
+class DeepLinkManager: NSObject {
     init(redirectNetworkSessionProvider: RedirectNetworkSessionProvider) {
         self.redirectNetworkSessionProvider = redirectNetworkSessionProvider
     }
+    
     /// Handles a Universal Link
     /// For Iterable links, it will track the click and retrieve the original URL,
     /// pass it to `IterableURLDelegate` for handling
@@ -28,7 +29,7 @@ class IterableDeepLinkManager: NSObject {
                 if let action = IterableAction.actionOpenUrl(fromUrlString: resolvedUrlString) {
                     let context = IterableActionContext(action: action, source: .universalLink)
                     
-                    IterableActionRunner.execute(action: action,
+                    ActionRunner.execute(action: action,
                                                  context: context,
                                                  urlHandler: IterableUtil.urlHandler(fromUrlDelegate: urlDelegate,
                                                                                      inContext: context),
@@ -45,7 +46,7 @@ class IterableDeepLinkManager: NSObject {
             if let action = IterableAction.actionOpenUrl(fromUrlString: url.absoluteString) {
                 let context = IterableActionContext(action: action, source: .universalLink)
                 
-                IterableActionRunner.execute(action: action,
+                ActionRunner.execute(action: action,
                                              context: context,
                                              urlHandler: IterableUtil.urlHandler(fromUrlDelegate: urlDelegate,
                                                                                  inContext: context),
@@ -107,7 +108,7 @@ class IterableDeepLinkManager: NSObject {
     private var deepLinkMessageId: String?
 }
 
-extension IterableDeepLinkManager: RedirectNetworkSessionDelegate {
+extension DeepLinkManager: RedirectNetworkSessionDelegate {
     func onRedirect(deepLinkLocation: URL?, campaignId: NSNumber?, templateId: NSNumber?, messageId: String?) {
         self.deepLinkLocation = deepLinkLocation
         self.deepLinkCampaignId = campaignId
diff --git a/swift-sdk/Internal/InAppManager.swift b/swift-sdk/Internal/InAppManager.swift
@@ -433,7 +433,7 @@ class InAppManager: NSObject, IterableInternalInAppManagerProtocol {
         
         let context = IterableActionContext(action: action, source: .inApp)
         DispatchQueue.main.async { [weak self] in
-            IterableActionRunner.execute(action: action,
+            ActionRunner.execute(action: action,
                                          context: context,
                                          urlHandler: IterableUtil.urlHandler(fromUrlDelegate: self?.urlDelegate, inContext: context),
                                          customActionHandler: IterableUtil.customActionHandler(fromCustomActionDelegate: self?.customActionDelegate, inContext: context),
diff --git a/swift-sdk/Internal/InternalIterableAPI.swift b/swift-sdk/Internal/InternalIterableAPI.swift
@@ -397,7 +397,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
     private var networkSession: NetworkSessionProtocol
     private var urlOpener: UrlOpenerProtocol
     
-    private var deepLinkManager: IterableDeepLinkManager
+    private var deepLinkManager: DeepLinkManager
     
     private var _email: String?
     private var _userId: String?
@@ -547,7 +547,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
         localStorage = dependencyContainer.localStorage
         inAppDisplayer = dependencyContainer.inAppDisplayer
         urlOpener = dependencyContainer.urlOpener
-        deepLinkManager = IterableDeepLinkManager(redirectNetworkSessionProvider: dependencyContainer)
+        deepLinkManager = DeepLinkManager(redirectNetworkSessionProvider: dependencyContainer)
     }
     
     func start() -> Pending<Bool, Error> {
diff --git a/swift-sdk/Internal/InternalIterableAppIntegration.swift b/swift-sdk/Internal/InternalIterableAppIntegration.swift
@@ -194,7 +194,7 @@ struct InternalIterableAppIntegration {
         // Execute the action
         if let action = action {
             let context = IterableActionContext(action: action, source: .push)
-            IterableActionRunner.execute(action: action,
+            ActionRunner.execute(action: action,
                                          context: context,
                                          urlHandler: IterableUtil.urlHandler(fromUrlDelegate: urlDelegate, inContext: context),
                                          customActionHandler: IterableUtil.customActionHandler(fromCustomActionDelegate: customActionDelegate, inContext: context),
@@ -289,7 +289,7 @@ struct InternalIterableAppIntegration {
         if let action = InternalIterableAppIntegration.createDefaultAction(userInfo: userInfo, iterableElement: itbl) {
             let context = IterableActionContext(action: action, source: .push)
             
-            IterableActionRunner.execute(action: action,
+            ActionRunner.execute(action: action,
                                          context: context,
                                          urlHandler: IterableUtil.urlHandler(fromUrlDelegate: urlDelegate, inContext: context),
                                          customActionHandler: IterableUtil.customActionHandler(fromCustomActionDelegate: customActionDelegate, inContext: context),
diff --git a/swift-sdk/Internal/OfflineRequestProcessor.swift b/swift-sdk/Internal/OfflineRequestProcessor.swift
@@ -246,7 +246,7 @@ struct OfflineRequestProcessor: RequestProcessorProtocol {
     private let taskRunner: IterableTaskRunner
     
     private func createRequestCreator(authProvider: AuthProvider) -> RequestCreator {
-        return RequestCreator(apiKey: apiKey, auth: authProvider.auth, deviceMetadata: deviceMetadata)
+        return RequestCreator(auth: authProvider.auth, deviceMetadata: deviceMetadata)
     }
     
     private func sendIterableRequest(requestGenerator: (RequestCreator) -> Result<IterableRequest, IterableError>,
diff --git a/swift-sdk/Internal/RequestCreator.swift b/swift-sdk/Internal/RequestCreator.swift
@@ -9,7 +9,6 @@ import UIKit
 /// This will create IterableRequest
 /// The API Endpoint and request endpoint is not defined yet
 struct RequestCreator {
-    let apiKey: String
     let auth: Auth
     let deviceMetadata: DeviceMetadata
     
@@ -449,7 +448,7 @@ struct RequestCreator {
     
     private func createPostRequest(path: String, body: [AnyHashable: Any]? = nil) -> PostRequest {
         PostRequest(path: path,
-                    args: [JsonKey.Header.apiKey: apiKey],
+                    args: nil,
                     body: body)
     }
     
diff --git a/tests/offline-events-tests/TaskProcessorTests.swift b/tests/offline-events-tests/TaskProcessorTests.swift
@@ -19,8 +19,7 @@ class TaskProcessorTests: XCTestCase {
         let networkSession = MockNetworkSession()
         let internalAPI = InternalIterableAPI.initializeForTesting(apiKey: apiKey, config: config, networkSession: networkSession)
         
-        let requestCreator = RequestCreator(apiKey: apiKey,
-                                            auth: auth,
+        let requestCreator = RequestCreator(auth: auth,
                                             deviceMetadata: internalAPI.deviceMetadata)
         guard case let Result.success(trackEventRequest) = requestCreator.createTrackEventRequest(eventName, dataFields: dataFields) else {
             XCTFail("Could not create trackEvent request")
@@ -223,8 +222,7 @@ class TaskProcessorTests: XCTestCase {
         let dataFields = ["var1": "val1", "var2": "val2"]
         
         let auth = Auth(userId: nil, email: email, authToken: nil)
-        let requestCreator = RequestCreator(apiKey: apiKey,
-                                            auth: auth,
+        let requestCreator = RequestCreator(auth: auth,
                                             deviceMetadata: deviceMetadata)
         guard case let Result.success(trackEventRequest) = requestCreator.createTrackEventRequest(eventName, dataFields: dataFields) else {
             XCTFail("Could not create trackEvent request")
diff --git a/tests/offline-events-tests/TaskRunnerTests.swift b/tests/offline-events-tests/TaskRunnerTests.swift
@@ -328,7 +328,7 @@ class TaskRunnerTests: XCTestCase {
         let eventName = "CustomEvent1"
         let dataFields = ["var1": "val1", "var2": "val2"]
         
-        let requestCreator = RequestCreator(apiKey: apiKey, auth: auth, deviceMetadata: deviceMetadata)
+        let requestCreator = RequestCreator(auth: auth, deviceMetadata: deviceMetadata)
         guard case let Result.success(trackEventRequest) = requestCreator.createTrackEventRequest(eventName, dataFields: dataFields) else {
             throw IterableError.general(description: "Could not create trackEvent request")
         }
diff --git a/tests/offline-events-tests/TaskSchedulerTests.swift b/tests/offline-events-tests/TaskSchedulerTests.swift
@@ -31,7 +31,7 @@ class TaskSchedulerTests: XCTestCase {
             expectation1.fulfill()
         }
         XCTAssertNotNil(reference)
-        let requestCreator = RequestCreator(apiKey: apiKey, auth: auth, deviceMetadata: deviceMetadata)
+        let requestCreator = RequestCreator(auth: auth, deviceMetadata: deviceMetadata)
         guard case let Result.success(trackEventRequest) = requestCreator.createTrackEventRequest(eventName, dataFields: dataFields) else {
             throw IterableError.general(description: "Could not create trackEvent request")
         }
diff --git a/tests/unit-tests/ActionRunnerTests.swift b/tests/unit-tests/ActionRunnerTests.swift
@@ -9,7 +9,7 @@ import XCTest
 let testExpectationTimeout = 15.0 // How long to wait when we expect to succeed
 let testExpectationTimeoutForInverted = 1.0 // How long to wait when we expect to fail
 
-class IterableActionRunnerTests: XCTestCase {
+class ActionRunnerTests: XCTestCase {
     func testUrlOpenAction() {
         validateUrlOpenAction(source: .push)
         validateUrlOpenAction(source: .inApp)
@@ -28,7 +28,7 @@ class IterableActionRunnerTests: XCTestCase {
             return true
         }
         
-        let handled = IterableActionRunner.execute(action: action,
+        let handled = ActionRunner.execute(action: action,
                                                    context: context,
                                                    urlHandler: urlHandler,
                                                    urlOpener: urlOpener)
@@ -50,7 +50,7 @@ class IterableActionRunnerTests: XCTestCase {
             return true
         }
         
-        let handled = IterableActionRunner.execute(action: action,
+        let handled = ActionRunner.execute(action: action,
                                                    context: context,
                                                    customActionHandler: customActionHandler)
         
@@ -69,7 +69,7 @@ class IterableActionRunnerTests: XCTestCase {
             return false
         }
         
-        let handled = IterableActionRunner.execute(action: action,
+        let handled = ActionRunner.execute(action: action,
                                                    context: context,
                                                    customActionHandler: customActionHandler)
         
@@ -94,7 +94,7 @@ class IterableActionRunnerTests: XCTestCase {
             expectation1.fulfill()
         }
 
-        let handled = IterableActionRunner.execute(action: action,
+        let handled = ActionRunner.execute(action: action,
                                                    context: context,
                                                    urlHandler: nil,
                                                    urlOpener: urlOpener)
@@ -115,7 +115,7 @@ class IterableActionRunnerTests: XCTestCase {
             expectation1.fulfill()
         }
 
-        IterableActionRunner.execute(action: action,
+        ActionRunner.execute(action: action,
                                      context: context,
                                      urlHandler: nil,
                                      urlOpener: urlOpener)
@@ -134,7 +134,7 @@ class IterableActionRunnerTests: XCTestCase {
             expectation1.fulfill()
         }
 
-        IterableActionRunner.execute(action: action,
+        ActionRunner.execute(action: action,
                                      context: context,
                                      urlHandler: nil,
                                      urlOpener: urlOpener,
@@ -155,7 +155,7 @@ class IterableActionRunnerTests: XCTestCase {
             return false
         }
         
-        let handled = IterableActionRunner.execute(action: action,
+        let handled = ActionRunner.execute(action: action,
                                                    context: context,
                                                    urlHandler: urlHandler,
                                                    urlOpener: urlOpener)
diff --git a/tests/unit-tests/AutoRegistrationTests.swift b/tests/unit-tests/AutoRegistrationTests.swift
diff --git a/tests/unit-tests/DeepLinkTests.swift b/tests/unit-tests/DeepLinkTests.swift
diff --git a/tests/unit-tests/NotificationResponseTests.swift b/tests/unit-tests/NotificationResponseTests.swift
diff --git a/tests/unit-tests/RequestCreatorTests.swift b/tests/unit-tests/RequestCreatorTests.swift

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class AppUrlOpener: UrlOpenerProtocol {`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
`23`		`-struct IterableActionRunner {`
	`23`	`+struct ActionRunner {`
`24`	`24`	`// returns true if an action is performed either by us or by the calling app.`
`25`	`25`	`@discardableResult`
`26`	`26`	`static func execute(action: IterableAction,`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ class ApiClient {`
`82`	`82`	`return .failure(IterableError.general(description: "authProvider is missing"))`
`83`	`83`	`}`
`84`	`84`
`85`		`- return .success(RequestCreator(apiKey: apiKey, auth: authProvider.auth, deviceMetadata: deviceMetadata))`
	`85`	`+ return .success(RequestCreator(auth: authProvider.auth, deviceMetadata: deviceMetadata))`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`private let apiKey: String`
Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ struct OfflineRequestProcessor: RequestProcessorProtocol {`
`246`	`246`	`private let taskRunner: IterableTaskRunner`
`247`	`247`
`248`	`248`	`private func createRequestCreator(authProvider: AuthProvider) -> RequestCreator {`
`249`		`- return RequestCreator(apiKey: apiKey, auth: authProvider.auth, deviceMetadata: deviceMetadata)`
	`249`	`+ return RequestCreator(auth: authProvider.auth, deviceMetadata: deviceMetadata)`
`250`	`250`	`}`
`251`	`251`
`252`	`252`	`private func sendIterableRequest(requestGenerator: (RequestCreator) -> Result<IterableRequest, IterableError>,`