Merge pull request #520 from Iterable/tapash/mob-3725-opening-links

[MOB-3725] - Allow opening of url from universal links also.

Author: tapashmajumder

swift-sdk/Internal/InternalIterableAPI.swift

@@ -77,7 +77,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
     @discardableResult func handleUniversalLink(_ url: URL) -> Bool {
         let (result, future) = deepLinkManager.handleUniversalLink(url,
                                                                    urlDelegate: config.urlDelegate,
-                                                                   urlOpener: AppUrlOpener(),
+                                                                   urlOpener: urlOpener,
                                                                    allowedProtocols: config.allowedProtocols)
         future.onSuccess { attributionInfo in
             if let attributionInfo = attributionInfo {

swift-sdk/Internal/IterableActionRunner.swift

@@ -77,8 +77,7 @@ struct IterableActionRunner {
     private static func shouldOpenUrl(url: URL,
                                       from source: IterableActionSource,
                                       withAllowedProtocols allowedProtocols: [String]) -> Bool {
-        if source == .push || source == .inApp,
-           let scheme = url.scheme,
+        if let scheme = url.scheme,
            scheme == "https" || allowedProtocols.contains(scheme) {
             return true
         } else {

tests/unit-tests/IterableActionRunnerTests.swift

@@ -11,34 +11,11 @@ let testExpectationTimeoutForInverted = 1.0 // How long to wait when we expect t
 
 class IterableActionRunnerTests: XCTestCase {
     func testUrlOpenAction() {
-        let urlString = "https://example.com"
-        let action = IterableAction.action(fromDictionary: ["type": "openUrl", "data": urlString])!
-        let context = IterableActionContext(action: action, source: .push)
-        let urlOpener = MockUrlOpener()
-        let expectation = XCTestExpectation(description: "call UrlHandler")
-        let urlHandler: UrlHandler = { url in
-            XCTAssertEqual(url.absoluteString, urlString)
-            expectation.fulfill()
-            return false
-        }
-        
-        let handled = IterableActionRunner.execute(action: action,
-                                                   context: context,
-                                                   urlHandler: urlHandler,
-                                                   urlOpener: urlOpener)
-        
-        wait(for: [expectation], timeout: testExpectationTimeout)
-        XCTAssertTrue(handled)
-        
-        if #available(iOS 10.0, *) {
-            XCTAssertEqual(urlOpener.ios10OpenedUrl?.absoluteString, urlString)
-            XCTAssertNil(urlOpener.preIos10openedUrl)
-        } else {
-            XCTAssertEqual(urlOpener.preIos10openedUrl?.absoluteString, urlString)
-            XCTAssertNil(urlOpener.ios10OpenedUrl)
-        }
+        validateUrlOpenAction(source: .push)
+        validateUrlOpenAction(source: .inApp)
+        validateUrlOpenAction(source: .universalLink)
     }
-    
+
     func testUrlHandlingOverride() {
         let urlString = "https://example.com"
         let action = IterableAction.action(fromDictionary: ["type": "openUrl", "data": urlString])!
@@ -171,4 +148,33 @@ class IterableActionRunnerTests: XCTestCase {
 
         wait(for: [expectation1], timeout: testExpectationTimeout)
     }
+    
+    private func validateUrlOpenAction(source: IterableActionSource) {
+        let urlString = "https://example.com"
+        let action = IterableAction.action(fromDictionary: ["type": "openUrl", "data": urlString])!
+        let context = IterableActionContext(action: action, source: source)
+        let urlOpener = MockUrlOpener()
+        let expectation = XCTestExpectation(description: "call UrlHandler")
+        let urlHandler: UrlHandler = { url in
+            XCTAssertEqual(url.absoluteString, urlString)
+            expectation.fulfill()
+            return false
+        }
+        
+        let handled = IterableActionRunner.execute(action: action,
+                                                   context: context,
+                                                   urlHandler: urlHandler,
+                                                   urlOpener: urlOpener)
+        
+        wait(for: [expectation], timeout: testExpectationTimeout)
+        XCTAssertTrue(handled)
+        
+        if #available(iOS 10.0, *) {
+            XCTAssertEqual(urlOpener.ios10OpenedUrl?.absoluteString, urlString)
+            XCTAssertNil(urlOpener.preIos10openedUrl)
+        } else {
+            XCTAssertEqual(urlOpener.preIos10openedUrl?.absoluteString, urlString)
+            XCTAssertNil(urlOpener.ios10OpenedUrl)
+        }
+    }
 }