Make error optional on the onFailure closure to indicate cancelled state

Also use `onWillDismiss` in the iOS web view controller to indicate that the closure will be called analog to a "viewWillDisappear" message. There currently is no "onDidDismiss" closure.

Author: p2

OAuth2/OAuth2.swift

@@ -56,8 +56,8 @@ public class OAuth2 {
 	/** Closure called on successful authentication. */
 	public var onAuthorize: ((parameters: NSDictionary) -> Void)?
 
-	/** When authorization fails. */
-	public var onFailure: ((error: NSError) -> Void)?
+	/** When authorization fails (if error is not nil) or is cancelled. */
+	public var onFailure: ((error: NSError?) -> Void)?
 
 	/** Closure called after onAuthorize OR onFailure, useful for cleanup operations. */
 	public var afterAuthorizeOrFailure: ((wasFailure: Bool) -> Void)?
@@ -204,12 +204,7 @@ public class OAuth2 {
 	}
 
 	func didFail(error: NSError?) {
-		if nil == error {
-			onFailure?(error: genOAuth2Error("I failed, sorry"))
-		}
-		else {
-			onFailure?(error: error!)
-		}
+		onFailure?(error: error)
 		afterAuthorizeOrFailure?(wasFailure: true)
 	}
 

OAuth2/OAuth2WebViewController.swift

@@ -33,7 +33,7 @@ extension OAuth2 {
 			self.handleRedirectURL(url)
 			return true
 		}
-		web.onDismiss = { didCancel in
+		web.onWillDismiss = { didCancel in
 			if didCancel {
 				self.didFail(nil)
 			}
@@ -74,8 +74,8 @@ public class OAuth2WebViewController: UIViewController, UIWebViewDelegate
 	/** Closure called when the web view gets asked to load the redirect URL, specified in `interceptURLString`. */
 	var onIntercept: ((url: NSURL) -> Bool)?
 
-	/** Called when the web view gets dismissed. */
-	var onDismiss: ((didCancel: Bool) -> Void)?
+	/** Called when the web view is about to be dismissed. */
+	var onWillDismiss: ((didCancel: Bool) -> Void)?
 
 	var cancelButton: UIBarButtonItem?
 	var webView: UIWebView!
@@ -174,11 +174,10 @@ public class OAuth2WebViewController: UIViewController, UIWebViewDelegate
 	func dismiss(# asCancel: Bool, animated: Bool) {
 		webView.stopLoading()
 
-		presentingViewController?.dismissViewControllerAnimated(animated) {
-			if nil != self.onDismiss {
-				self.onDismiss!(didCancel: asCancel)
-			}
+		if nil != self.onWillDismiss {
+			self.onWillDismiss!(didCancel: asCancel)
 		}
+		presentingViewController?.dismissViewControllerAnimated(animated, nil)
 	}
 
 

OSX.playground/section-1.swift

@@ -36,7 +36,9 @@ oauth.onAuthorize = { parameters in
 	task.resume()
 }
 oauth.onFailure = { error in
-	println("Authorization failed: \(error.localizedDescription)")
+	if nil != error {
+		println("Authorization failed: \(error!.localizedDescription)")
+	}
 }
 
 // construct the authorize URL which you would then load in a browser or web view

README.md

@@ -32,8 +32,10 @@ The steps for other flows are mostly the same short of instantiating a different
     oauth.onAuthorize = { parameters in
         println("Did authorize with parameters: \(parameters)")
     }
-    oauth.onFailure = { error in
-        println("Authorization went wrong: \(error.localizedDescription)")
+    oauth.onFailure = { error in		// `error` is nil on cancel
+		if nil != error {
+			println("Authorization went wrong: \(error!.localizedDescription)")
+		}
     }
     ```