Fix for XCode9 assertion error (#227)

markmarkswell · p2 · commit 409d0844acbe · 2017-09-15T09:29:04.000-07:00
When running in iOS 11/XCode 9,  you get an exception if you call 'decisionHandler()' twice.
This strategic return prevents that.

Also - swift 3.2 compile fix for unneeded !
diff --git a/Sources/iOS/OAuth2WebViewController.swift b/Sources/iOS/OAuth2WebViewController.swift
@@ -51,7 +51,7 @@ open class OAuth2WebViewController: UIViewController, WKNavigationDelegate {
 					interceptComponents = URLComponents(url: url, resolvingAgainstBaseURL: true)
 				}
 				else {
-					oauth?.logger?.debug("OAuth2", msg: "Failed to parse URL \(interceptURLString!), discarding")
+					oauth?.logger?.debug("OAuth2", msg: "Failed to parse URL \(interceptURLString), discarding")
 					self.interceptURLString = nil
 				}
 			}
@@ -209,6 +209,7 @@ open class OAuth2WebViewController: UIViewController, WKNavigationDelegate {
 				else {
 					decisionHandler(.allow)
 				}
+				return
 			}
 		}
 		decisionHandler(.allow)

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ open class OAuth2WebViewController: UIViewController, WKNavigationDelegate {`
`51`	`51`	`interceptComponents = URLComponents(url: url, resolvingAgainstBaseURL: true)`
`52`	`52`	`}`
`53`	`53`	`else {`
`54`		`- oauth?.logger?.debug("OAuth2", msg: "Failed to parse URL \(interceptURLString!), discarding")`
	`54`	`+ oauth?.logger?.debug("OAuth2", msg: "Failed to parse URL \(interceptURLString), discarding")`
`55`	`55`	`self.interceptURLString = nil`
`56`	`56`	`}`
`57`	`57`	`}`
`@@ -209,6 +209,7 @@ open class OAuth2WebViewController: UIViewController, WKNavigationDelegate {`
`209`	`209`	`else {`
`210`	`210`	`decisionHandler(.allow)`
`211`	`211`	`}`
	`212`	`+ return`
`212`	`213`	`}`
`213`	`214`	`}`
`214`	`215`	`decisionHandler(.allow)`