Skip to content
This repository has been archived by the owner on Sep 25, 2021. It is now read-only.

added additional headers feature #153

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions Turbolinks/Session.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ public protocol SessionDelegate: class {
func sessionDidFinishRequest(_ session: Session)
}

public protocol SessionDataSource: class {
func session(_ session: Session, additionalHeadersForRequestWithURL url: URL) -> [String: String]?
}

public extension SessionDelegate {
func sessionDidLoadWebView(_ session: Session) {
session.webView.navigationDelegate = session
Expand All @@ -26,8 +30,15 @@ public extension SessionDelegate {
}
}

public extension SessionDataSource {
func session(_ session: Session, additionalHeadersForRequestWithURL url: URL) -> [String: String]? {
return nil
}
}

open class Session: NSObject {
open weak var delegate: SessionDelegate?
open weak var dataSource: SessionDataSource?

open var webView: WKWebView {
return _webView
Expand Down Expand Up @@ -78,6 +89,7 @@ open class Session: NSObject {
currentVisit = visit

visit.delegate = self
visit.dataSource = self
visit.start()
}

Expand Down Expand Up @@ -195,6 +207,12 @@ extension Session: VisitDelegate {
}
}

extension Session: VisitDataSource {
func visit(_ visit: Visit, additionalHeadersForRequestWithURL url: URL) -> [String : String]? {
return dataSource?.session(self, additionalHeadersForRequestWithURL: url)
}
}

extension Session: VisitableDelegate {
public func visitableViewWillAppear(_ visitable: Visitable) {
guard let topmostVisit = self.topmostVisit, let currentVisit = self.currentVisit else { return }
Expand Down
12 changes: 11 additions & 1 deletion Turbolinks/Visit.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ protocol VisitDelegate: class {
func visitRequestDidFinish(_ visit: Visit)
}

protocol VisitDataSource: class {
func visit(_ visit: Visit, additionalHeadersForRequestWithURL url: URL) -> [String: String]?
}

enum VisitState {
case initialized
case started
Expand All @@ -27,6 +31,7 @@ enum VisitState {

class Visit: NSObject {
weak var delegate: VisitDelegate?
weak var dataSource: VisitDataSource?

var visitable: Visitable
var action: Action
Expand Down Expand Up @@ -141,7 +146,12 @@ class ColdBootVisit: Visit, WKNavigationDelegate, WebViewPageLoadDelegate {
webView.navigationDelegate = self
webView.pageLoadDelegate = self

let request = URLRequest(url: location)
var request = URLRequest(url: location)
if let headers = dataSource?.visit(self, additionalHeadersForRequestWithURL: location) {
for header in headers {
request.setValue(header.value, forHTTPHeaderField: header.key)
}
}
navigation = webView.load(request)

delegate?.visitDidStart(self)
Expand Down