More tests. Remove warning for Codable.

Author: tapashmajumder

Tests/swift-sdk-swift-tests/InAppHelperTests.swift

@@ -518,31 +518,38 @@ class InAppHelperTests: XCTestCase {
     }
 
     // nil host
-    func testCallbackUrlParsingCustomScheme1() {
+    func testCallbackUrlParsingAppleWebdataScheme1() {
         let url = URL(string: "applewebdata://")!
-        XCTAssertNil(InAppHelper.getCallbackAndDestinationUrl(url: url))
+        XCTAssertNil(InAppHelper.parse(inAppUrl: url))
     }
 
 
-    func testCallbackUrlParsingCustomScheme2() {
+    func testCallbackUrlParsingAppleWebdataScheme2() {
         let url = URL(string: "applewebdata://this-is-uuid/the-real-url")!
-        let (callbackUrl, destinationUrl) = InAppHelper.getCallbackAndDestinationUrl(url: url)!
-        XCTAssertEqual(callbackUrl, "the-real-url")
-        XCTAssertEqual(destinationUrl, "the-real-url")
+        let parsed = InAppHelper.parse(inAppUrl: url)!
+        if case let InAppHelper.InAppClickedUrl.localResource(name: name) = parsed {
+            XCTAssertEqual(name, "the-real-url")
+        } else {
+            XCTFail("could not parse")
+        }
     }
 
-    func testCallbackUrlParsingIterableScheme() {
-        let url = URL(string: "itbl://buyProduct")!
-        let (callbackUrl, destinationUrl) = InAppHelper.getCallbackAndDestinationUrl(url: url)!
-        XCTAssertEqual(callbackUrl, "buyProduct")
-        XCTAssertEqual(destinationUrl, "itbl://buyProduct")
+    func testCallbackUrlParsingCustomActionScheme() {
+        let url = URL(string: "action://buyProduct")!
+        if case let InAppHelper.InAppClickedUrl.customAction(name: name) = InAppHelper.parse(inAppUrl: url)! {
+            XCTAssertEqual(name, "buyProduct")
+        } else {
+            XCTFail("Could not parse")
+        }
     }
 
     func testCallbackUrlParsingRegularScheme() {
         let url = URL(string: "https://host/path")!
-        let (callbackUrl, destinationUrl) = InAppHelper.getCallbackAndDestinationUrl(url: url)!
-        XCTAssertEqual(callbackUrl, "https://host/path")
-        XCTAssertEqual(destinationUrl, "https://host/path")
+        if case let InAppHelper.InAppClickedUrl.regularUrl(parsedUrl) = InAppHelper.parse(inAppUrl: url)! {
+            XCTAssertEqual(parsedUrl, url)
+        } else {
+            XCTFail("Could not parse")
+        }
     }
 
     private static let apiKey = "zeeApiKey"

swift-sdk/Internal/InAppHelper.swift

@@ -281,30 +281,6 @@ struct InAppHelper {
         }
     }
 
-    // Given the clicked url in inApp get the callbackUrl and destinationUrl
-    static func getCallbackAndDestinationUrl(url: URL) -> (callbackUrl: String, destinationUrl: String)? {
-        if url.scheme == UrlScheme.applewebdata.rawValue {
-            // Since we are calling loadHTMLString with a nil baseUrl, any request url without a valid scheme get treated as a local resource.
-            // Url looks like applewebdata://abc-def/something
-            // Removes the extra applewebdata scheme/host data that is appended to the original url.
-            // So in this case (callback = something, destination = something)
-            // Warn the client that the request url does not contain a valid scheme
-            ITBError("Request url contains an invalid scheme: \(url)")
-            
-            guard let urlPath = getUrlPath(url: url) else {
-                return nil
-            }
-            return (callbackUrl: urlPath, destinationUrl: urlPath)
-        } else if url.scheme == UrlScheme.itbl.rawValue {
-            // itbl://something => (callback = something, destination = itbl://something)
-            let callbackUrl = dropScheme(urlString: url.absoluteString, scheme: UrlScheme.itbl.rawValue)
-            return (callbackUrl: callbackUrl, destinationUrl: url.absoluteString)
-        } else {
-            // http, https etc, return unchanged
-            return (url.absoluteString, url.absoluteString)
-        }
-    }
-    
     static func getInAppMessagesFromServer(internalApi: IterableAPIInternal, number: Int) -> Future<[IterableInAppMessage]> {
         return internalApi.getInAppMessages(NSNumber(value: number)).map {
             inAppMessages(fromPayload: $0, internalApi: internalApi)

swift-sdk/Internal/InAppPersistence.swift

@@ -7,7 +7,7 @@
 import Foundation
 
 // Adhering to Codable
-extension UIEdgeInsets : Codable {
+extension UIEdgeInsets {
     enum CodingKeys: String, CodingKey {
         case top
         case left