Skip to content

Commit

Permalink
handler가 있는 delegate function -> closure 로 변경
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kofktu
Kofktu committed Jun 28, 2017
1 parent 657e745 commit 21d50a9
Show file tree
Hide file tree
Showing 2 changed files with 85 additions and 60 deletions.
18 changes: 11 additions & 7 deletions Example/Example/ViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class ViewController: UIViewController {

lazy var webView: WKCookieWebView = {
let webView: WKCookieWebView = WKCookieWebView(frame: self.view.bounds)
webView.wkNavigationDelegate = self
// webView.wkNavigationDelegate = self
return webView
}()

Expand All @@ -27,7 +27,16 @@ class ViewController: UIViewController {
super.viewDidLoad()
// Do any additional setup after loading the view, typically from a nib.

webView.onCookieStorageUpdateHandler = { [weak self] (webView) in
webView.onDecidePolicyForNavigationAction = { (webView, navigationAction, decisionHandler) in
decisionHandler(.allow)
}

webView.onDecidePolicyForNavigationResponse = { (webView, navigationResponse, decisionHandler) in
print("allHeaderFields : \((navigationResponse.response as? HTTPURLResponse)?.allHeaderFields ?? [:])")
decisionHandler(.allow)
}

webView.onUpdateCookieStorage = { [weak self] (webView) in
self?.printCookie()
}

Expand Down Expand Up @@ -60,8 +69,3 @@ class ViewController: UIViewController {
print("=================================================")
}
}


extension ViewController: WKNavigationDelegate {

}
127 changes: 74 additions & 53 deletions WKCookieWebView/WKCookieWebView/WKCookieWebView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,16 @@ fileprivate class WKCookieProcessPool: WKProcessPool {

open class WKCookieWebView: WKWebView {

// Must use this instead of navigationDelegate
public weak var wkNavigationDelegate: WKNavigationDelegate?
public var onCookieStorageUpdateHandler: ((WKCookieWebView) -> Void)?

// If necessary, use clousre instead of delegate
public var onDecidePolicyForNavigationAction: ((WKWebView, WKNavigationAction, @escaping (WKNavigationActionPolicy) -> Swift.Void) -> Void)?
public var onDecidePolicyForNavigationResponse: ((WKWebView, WKNavigationResponse, @escaping (WKNavigationResponsePolicy) -> Swift.Void) -> Void)?
public var onDidReceiveChallenge: ((WKWebView, URLAuthenticationChallenge, @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Swift.Void) -> Void)?

// The closure where cookie information is called at update time
public var onUpdateCookieStorage: ((WKCookieWebView) -> Void)?

fileprivate var updatedCookies = [String]()

Expand Down Expand Up @@ -63,65 +71,60 @@ open class WKCookieWebView: WKWebView {

fileprivate func update(webView: WKWebView) {
webView.evaluateJavaScript("document.cookie;") { [weak self] (result, error) in
guard let documentCookie = result as? String else {
guard let `self` = self,
let documentCookie = result as? String else {
return
}

DispatchQueue.global(qos: .background).async(execute: {
guard let `self` = self else {
return
}
let cookieValues = documentCookie.components(separatedBy: "; ")

for value in cookieValues {
let comps = value.components(separatedBy: "=")
if comps.count < 2 { continue }

let cookieValues = documentCookie.components(separatedBy: "; ")
let localCookie = HTTPCookieStorage.shared.cookies?.filter { $0.name == comps[0] }.first

for value in cookieValues {
let comps = value.components(separatedBy: "=")
if comps.count < 2 { continue }

let localCookie = HTTPCookieStorage.shared.cookies?.filter { $0.name == comps[0] }.first

if let localCookie = localCookie {
if !comps[1].isEmpty && localCookie.value != comps[1] {
// cookie value is different
if self.updatedCookies.contains(localCookie.name) {
webView.evaluateJavaScript("document.cookie='\(localCookie.name)=\(localCookie.value);domain=\(localCookie.domain);path=\(localCookie.path);'", completionHandler: nil)
} else {
// set cookie
var properties: [HTTPCookiePropertyKey: Any] = [
.name: localCookie.name,
.value: comps[1],
.domain: localCookie.domain,
.path: "/"
]

if let expireDate = localCookie.expiresDate {
properties[.expires] = expireDate
}

if let cookie = HTTPCookie(properties: properties) {
HTTPCookieStorage.shared.setCookie(cookie)
self.onCookieStorageUpdateHandler?(self)
}
}
}
} else {
if let rootDomain = webView.url?.host, !comps[0].isEmpty && !comps[1].isEmpty {
let properties: [HTTPCookiePropertyKey: Any] = [
.name: comps[0],
if let localCookie = localCookie {
if !comps[1].isEmpty && localCookie.value != comps[1] {
// cookie value is different
if self.updatedCookies.contains(localCookie.name) {
webView.evaluateJavaScript("document.cookie='\(localCookie.name)=\(localCookie.value);domain=\(localCookie.domain);path=\(localCookie.path);'", completionHandler: nil)
} else {
// set cookie
var properties: [HTTPCookiePropertyKey: Any] = [
.name: localCookie.name,
.value: comps[1],
.domain: rootDomain,
.path: "/",
.domain: localCookie.domain,
.path: "/"
]

if let expireDate = localCookie.expiresDate {
properties[.expires] = expireDate
}

if let cookie = HTTPCookie(properties: properties) {
// set cookie
HTTPCookieStorage.shared.setCookie(cookie)
self.onCookieStorageUpdateHandler?(self)
self.onUpdateCookieStorage?(self)
}
}
}
} else {
if let rootDomain = webView.url?.host, !comps[0].isEmpty && !comps[1].isEmpty {
let properties: [HTTPCookiePropertyKey: Any] = [
.name: comps[0],
.value: comps[1],
.domain: rootDomain,
.path: "/",
]

if let cookie = HTTPCookie(properties: properties) {
// set cookie
HTTPCookieStorage.shared.setCookie(cookie)
self.onUpdateCookieStorage?(self)
}
}
}
})
}
}
}

Expand All @@ -131,7 +134,7 @@ open class WKCookieWebView: WKWebView {
updatedCookies.append($0.name)
}

onCookieStorageUpdateHandler?(self)
onUpdateCookieStorage?(self)
}
}

Expand All @@ -140,17 +143,20 @@ extension WKCookieWebView: WKNavigationDelegate {

// MARK: - WKNavigationDelegate
public func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Swift.Void) {
if let function = wkNavigationDelegate?.webView?(_:decidePolicyFor:decisionHandler:) {
wkNavigationDelegate?.webView?(webView, decidePolicyFor: navigationAction, decisionHandler: decisionHandler)
if let handler = onDecidePolicyForNavigationAction {
handler(webView, navigationAction, decisionHandler)
} else {
decisionHandler(.allow)
}
}

public func webView(_ webView: WKWebView, decidePolicyFor navigationResponse: WKNavigationResponse, decisionHandler: @escaping (WKNavigationResponsePolicy) -> Swift.Void) {
defer {
decisionHandler(.allow)
wkNavigationDelegate?.webView?(webView, decidePolicyFor: navigationResponse, decisionHandler: decisionHandler)
if let handler = onDecidePolicyForNavigationResponse {
handler(webView, navigationResponse, decisionHandler)
} else {
decisionHandler(.allow)
}
}

guard let response = navigationResponse.response as? HTTPURLResponse,
Expand Down Expand Up @@ -188,10 +194,25 @@ extension WKCookieWebView: WKNavigationDelegate {
}

public func webView(_ webView: WKWebView, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Swift.Void) {
wkNavigationDelegate?.webView?(webView, didReceive: challenge, completionHandler: completionHandler)
if let handler = onDidReceiveChallenge {
handler(webView, challenge, completionHandler)
} else {
var disposition: URLSession.AuthChallengeDisposition = .performDefaultHandling
var credential: URLCredential?

if challenge.protectionSpace.authenticationMethod == NSURLAuthenticationMethodServerTrust {
if let serverTrust = challenge.protectionSpace.serverTrust {
credential = URLCredential(trust: serverTrust)
disposition = .useCredential
}
} else {
disposition = .cancelAuthenticationChallenge
}

completionHandler(disposition, credential)
}
}


@available(iOS 9.0, *)
public func webViewWebContentProcessDidTerminate(_ webView: WKWebView) {
wkNavigationDelegate?.webViewWebContentProcessDidTerminate?(webView)
Expand Down

0 comments on commit 21d50a9

Please sign in to comment.