Skip to content

Commit f9e47e3

Browse files
tapashmajumdertapashmajumder
committed
Move NetworkSession to separate file.
1 parent 6fe861a commit f9e47e3

File tree

2 files changed

+121
-116
lines changed

2 files changed

+121
-116
lines changed

‎swift-sdk/Internal/NetworkHelper.swift

Lines changed: 0 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -27,122 +27,6 @@ extension NetworkError: LocalizedError {
2727
}
2828
}
2929

30-
protocol DataTaskProtocol {
31-
var state: URLSessionDataTask.State { get }
32-
func resume()
33-
func cancel()
34-
}
35-
36-
extension URLSessionDataTask: DataTaskProtocol {}
37-
38-
protocol NetworkSessionProtocol {
39-
typealias CompletionHandler = (Data?, URLResponse?, Error?) -> Void
40-
func makeRequest(_ request: URLRequest, completionHandler: @escaping CompletionHandler)
41-
func makeDataRequest(with url: URL, completionHandler: @escaping CompletionHandler)
42-
func createDataTask(with url: URL, completionHandler: @escaping CompletionHandler) -> DataTaskProtocol
43-
}
44-
45-
extension URLSession: NetworkSessionProtocol {
46-
func makeRequest(_ request: URLRequest, completionHandler: @escaping CompletionHandler) {
47-
let task = dataTask(with: request) { data, response, error in
48-
completionHandler(data, response, error)
49-
}
50-
51-
task.resume()
52-
}
53-
54-
func makeDataRequest(with url: URL, completionHandler: @escaping CompletionHandler) {
55-
let task = dataTask(with: url) { data, response, error in
56-
completionHandler(data, response, error)
57-
}
58-
59-
task.resume()
60-
}
61-
62-
func createDataTask(with url: URL, completionHandler: @escaping CompletionHandler) -> DataTaskProtocol {
63-
dataTask(with: url, completionHandler: completionHandler)
64-
}
65-
}
66-
67-
protocol RedirectNetworkSessionDelegate: AnyObject {
68-
func onRedirect(deeplinkLocation: URL?, campaignId: NSNumber?, templateId: NSNumber?, messageId: String?)
69-
}
70-
71-
protocol RedirectNetworkSessionProvider {
72-
func createRedirectNetworkSession(delegate: RedirectNetworkSessionDelegate) -> NetworkSessionProtocol
73-
}
74-
75-
class RedirectNetworkSession: NSObject, NetworkSessionProtocol {
76-
func makeRequest(_ request: URLRequest, completionHandler: @escaping CompletionHandler) {
77-
networkSession.makeRequest(request, completionHandler: completionHandler)
78-
}
79-
80-
func makeDataRequest(with url: URL, completionHandler: @escaping CompletionHandler) {
81-
networkSession.makeDataRequest(with: url, completionHandler: completionHandler)
82-
}
83-
84-
func createDataTask(with url: URL, completionHandler: @escaping CompletionHandler) -> DataTaskProtocol {
85-
networkSession.createDataTask(with: url, completionHandler: completionHandler)
86-
}
87-
88-
private lazy var networkSession: NetworkSessionProtocol = {
89-
URLSession(configuration: .default, delegate: self, delegateQueue: OperationQueue.main)
90-
} ()
91-
92-
init(delegate: RedirectNetworkSessionDelegate?) {
93-
self.delegate = delegate
94-
}
95-
96-
private weak var delegate: RedirectNetworkSessionDelegate?
97-
}
98-
99-
extension RedirectNetworkSession: URLSessionDelegate, URLSessionTaskDelegate {
100-
internal func urlSession(_: URLSession,
101-
task _: URLSessionTask,
102-
willPerformHTTPRedirection response: HTTPURLResponse,
103-
newRequest request: URLRequest,
104-
completionHandler: @escaping (URLRequest?) -> Void) {
105-
var deepLinkLocation: URL? = nil
106-
var campaignId: NSNumber? = nil
107-
var templateId: NSNumber? = nil
108-
var messageId: String? = nil
109-
110-
deepLinkLocation = request.url
111-
112-
guard let headerFields = response.allHeaderFields as? [String: String] else {
113-
delegate?.onRedirect(deeplinkLocation: deepLinkLocation, campaignId: campaignId, templateId: templateId, messageId: messageId)
114-
return
115-
}
116-
117-
guard let url = response.url else {
118-
delegate?.onRedirect(deeplinkLocation: deepLinkLocation, campaignId: campaignId, templateId: templateId, messageId: messageId)
119-
return
120-
}
121-
122-
for cookie in HTTPCookie.cookies(withResponseHeaderFields: headerFields, for: url) {
123-
if cookie.name == Const.CookieName.campaignId {
124-
campaignId = number(fromString: cookie.value)
125-
} else if cookie.name == Const.CookieName.templateId {
126-
templateId = number(fromString: cookie.value)
127-
} else if cookie.name == Const.CookieName.messageId {
128-
messageId = cookie.value
129-
}
130-
}
131-
132-
delegate?.onRedirect(deeplinkLocation: deepLinkLocation, campaignId: campaignId, templateId: templateId, messageId: messageId)
133-
completionHandler(nil)
134-
}
135-
136-
private func number(fromString str: String) -> NSNumber {
137-
if let intValue = Int(str) {
138-
return NSNumber(value: intValue)
139-
}
140-
141-
return NSNumber(value: 0)
142-
}
143-
144-
}
145-
14630
struct NetworkHelper {
14731
static func getData(fromUrl url: URL, usingSession networkSession: NetworkSessionProtocol) -> Pending<Data, Error> {
14832
let fulfill = Fulfill<Data, Error>()

‎swift-sdk/Internal/NetworkSession.swift

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
//
2+
// Copyright © 2022 Iterable. All rights reserved.
3+
//
4+
5+
import Foundation
6+
7+
protocol DataTaskProtocol {
8+
var state: URLSessionDataTask.State { get }
9+
func resume()
10+
func cancel()
11+
}
12+
13+
extension URLSessionDataTask: DataTaskProtocol {}
14+
15+
protocol NetworkSessionProtocol {
16+
typealias CompletionHandler = (Data?, URLResponse?, Error?) -> Void
17+
func makeRequest(_ request: URLRequest, completionHandler: @escaping CompletionHandler)
18+
func makeDataRequest(with url: URL, completionHandler: @escaping CompletionHandler)
19+
func createDataTask(with url: URL, completionHandler: @escaping CompletionHandler) -> DataTaskProtocol
20+
}
21+
22+
extension URLSession: NetworkSessionProtocol {
23+
func makeRequest(_ request: URLRequest, completionHandler: @escaping CompletionHandler) {
24+
let task = dataTask(with: request) { data, response, error in
25+
completionHandler(data, response, error)
26+
}
27+
28+
task.resume()
29+
}
30+
31+
func makeDataRequest(with url: URL, completionHandler: @escaping CompletionHandler) {
32+
let task = dataTask(with: url) { data, response, error in
33+
completionHandler(data, response, error)
34+
}
35+
36+
task.resume()
37+
}
38+
39+
func createDataTask(with url: URL, completionHandler: @escaping CompletionHandler) -> DataTaskProtocol {
40+
dataTask(with: url, completionHandler: completionHandler)
41+
}
42+
}
43+
44+
protocol RedirectNetworkSessionDelegate: AnyObject {
45+
func onRedirect(deeplinkLocation: URL?, campaignId: NSNumber?, templateId: NSNumber?, messageId: String?)
46+
}
47+
48+
protocol RedirectNetworkSessionProvider {
49+
func createRedirectNetworkSession(delegate: RedirectNetworkSessionDelegate) -> NetworkSessionProtocol
50+
}
51+
52+
class RedirectNetworkSession: NSObject, NetworkSessionProtocol {
53+
func makeRequest(_ request: URLRequest, completionHandler: @escaping CompletionHandler) {
54+
networkSession.makeRequest(request, completionHandler: completionHandler)
55+
}
56+
57+
func makeDataRequest(with url: URL, completionHandler: @escaping CompletionHandler) {
58+
networkSession.makeDataRequest(with: url, completionHandler: completionHandler)
59+
}
60+
61+
func createDataTask(with url: URL, completionHandler: @escaping CompletionHandler) -> DataTaskProtocol {
62+
networkSession.createDataTask(with: url, completionHandler: completionHandler)
63+
}
64+
65+
private lazy var networkSession: NetworkSessionProtocol = {
66+
URLSession(configuration: .default, delegate: self, delegateQueue: OperationQueue.main)
67+
} ()
68+
69+
init(delegate: RedirectNetworkSessionDelegate?) {
70+
self.delegate = delegate
71+
}
72+
73+
private weak var delegate: RedirectNetworkSessionDelegate?
74+
}
75+
76+
extension RedirectNetworkSession: URLSessionDelegate, URLSessionTaskDelegate {
77+
internal func urlSession(_: URLSession,
78+
task _: URLSessionTask,
79+
willPerformHTTPRedirection response: HTTPURLResponse,
80+
newRequest request: URLRequest,
81+
completionHandler: @escaping (URLRequest?) -> Void) {
82+
var deepLinkLocation: URL? = nil
83+
var campaignId: NSNumber? = nil
84+
var templateId: NSNumber? = nil
85+
var messageId: String? = nil
86+
87+
deepLinkLocation = request.url
88+
89+
guard let headerFields = response.allHeaderFields as? [String: String] else {
90+
delegate?.onRedirect(deeplinkLocation: deepLinkLocation, campaignId: campaignId, templateId: templateId, messageId: messageId)
91+
return
92+
}
93+
94+
guard let url = response.url else {
95+
delegate?.onRedirect(deeplinkLocation: deepLinkLocation, campaignId: campaignId, templateId: templateId, messageId: messageId)
96+
return
97+
}
98+
99+
for cookie in HTTPCookie.cookies(withResponseHeaderFields: headerFields, for: url) {
100+
if cookie.name == Const.CookieName.campaignId {
101+
campaignId = number(fromString: cookie.value)
102+
} else if cookie.name == Const.CookieName.templateId {
103+
templateId = number(fromString: cookie.value)
104+
} else if cookie.name == Const.CookieName.messageId {
105+
messageId = cookie.value
106+
}
107+
}
108+
109+
delegate?.onRedirect(deeplinkLocation: deepLinkLocation, campaignId: campaignId, templateId: templateId, messageId: messageId)
110+
completionHandler(nil)
111+
}
112+
113+
private func number(fromString str: String) -> NSNumber {
114+
if let intValue = Int(str) {
115+
return NSNumber(value: intValue)
116+
}
117+
118+
return NSNumber(value: 0)
119+
}
120+
121+
}

0 commit comments

Comments
 (0)