Merge pull request #301 from SourcePointUSA/SP-7045_configurable_timeout

[SP-7045] Add configurable timeout

Author: vilasma

ConsentViewController/Classes/SPConsentManager.swift

@@ -26,6 +26,7 @@ import Foundation
     public var userData: SPUserData { storage.userData }
     var messageControllersStack: [SPMessageViewController] = []
     var idfaStatus: SPIDFAStatus { SPIDFAStatus.current() }
+    static let DefaultTimeout = TimeInterval(30)
 
     var ccpaUUID: String { storage.localState["ccpa"]?.dictionaryValue?["uuid"] as? String ?? "" }
     var gdprUUID: String { storage.localState["gdpr"]?.dictionaryValue?["uuid"] as? String ?? "" }
@@ -35,13 +36,20 @@ import Foundation
         SPUserDefaults(storage: UserDefaults.standard).clear()
     }
 
+    /// The timeout interval in seconds for the message being displayed
+    public var messageTimeoutInSeconds = SPConsentManager.DefaultTimeout {
+        didSet {
+            spClient.setRequestTimeout(self.messageTimeoutInSeconds)
+        }
+    }
+
     public convenience init(accountId: Int, propertyName: SPPropertyName, campaigns: SPCampaigns, delegate: SPDelegate?) {
         self.init(
             accountId: accountId,
             propertyName: propertyName,
             campaigns: campaigns,
             delegate: delegate,
-            spClient: SourcePointClient(accountId: accountId, propertyName: propertyName, timeout: 30),
+            spClient: SourcePointClient(accountId: accountId, propertyName: propertyName, timeout: SPConsentManager.DefaultTimeout),
             storage: SPUserDefaults(storage: UserDefaults.standard)
         )
     }
@@ -101,6 +109,7 @@ import Foundation
             messageId: messageId,
             contents: content,
             campaignType: type,
+            timeout: messageTimeoutInSeconds,
             delegate: self
         )
         #endif
@@ -278,6 +287,7 @@ import Foundation
             messageId: messageId,
             contents: SPJson(),
             campaignType: campaignType,
+            timeout: messageTimeoutInSeconds,
             delegate: self
         ).loadPrivacyManager(url: pmURL)
     }

ConsentViewController/Classes/SPMessageViewController.swift

@@ -64,11 +64,13 @@ extension RenderingAppEvents: ExpressibleByStringLiteral {
     weak var messageUIDelegate: SPMessageUIDelegate?
     public var campaignType: SPCampaignType
     public var messageId: Int?
+    public var timeout: TimeInterval
 
-    init(messageId: Int?, campaignType: SPCampaignType, delegate: SPMessageUIDelegate?, nibName: String? = nil) {
+    init(messageId: Int?, campaignType: SPCampaignType, timeout: TimeInterval, delegate: SPMessageUIDelegate?, nibName: String? = nil) {
         self.campaignType = campaignType
         self.messageUIDelegate = delegate
         self.messageId = messageId
+        self.timeout = timeout
         super.init(nibName: nibName, bundle: Bundle.framework)
     }
 

ConsentViewController/Classes/Views/iOS/SPWebMessageViewController.swift

@@ -9,7 +9,6 @@ import Foundation
 import WebKit
 
 @objcMembers class SPWebMessageViewController: SPMessageViewController, WKUIDelegate, WKNavigationDelegate, WKScriptMessageHandler, UIScrollViewDelegate {
-    var timeout: TimeInterval?
     var webviewConfig: WKWebViewConfiguration? { nil }
     let url: URL
     let contents: SPJson
@@ -35,10 +34,10 @@ import WebKit
         return nil
     }()
 
-    init(url: URL, messageId: Int?, contents: SPJson, campaignType: SPCampaignType, delegate: SPMessageUIDelegate?) {
+    init(url: URL, messageId: Int?, contents: SPJson, campaignType: SPCampaignType, timeout: TimeInterval, delegate: SPMessageUIDelegate?) {
         self.url = url
         self.contents = contents
-        super.init(messageId: messageId, campaignType: campaignType, delegate: delegate)
+        super.init(messageId: messageId, campaignType: campaignType, timeout: timeout, delegate: delegate)
     }
 
     required init?(coder: NSCoder) {
@@ -134,11 +133,11 @@ import WebKit
     var isFirstLayerMessage = true
 
     override func loadMessage() {
-        webview?.load(URLRequest(url: url))
+        webview?.load(URLRequest(url: url, timeoutInterval: timeout))
     }
 
     override func loadPrivacyManager(url: URL) {
-        webview?.load(URLRequest(url: url))
+        webview?.load(URLRequest(url: url, timeoutInterval: timeout))
     }
 
     override func closePrivacyManager() {

Example/ConsentViewController_ExampleTests/SPErrorSpec.swift

@@ -61,7 +61,7 @@ class SPErrorSpec: QuickSpec {
 
             describe("ConnectionTimeOutError") {
                 it("has spCode: connection_timeout") {
-                    expect(ConnectionTimeOutError(url: nil, timeout: nil).spCode).to(equal("sp_metric_connection_timeout"))
+                    expect(ConnectionTimeOutError(url: nil, timeout: nil, campaignType: .unknown).spCode).to(equal("sp_metric_connection_timeout"))
                 }
             }