Merge branch 'master' of github.com:p2/OAuth2

Author: ossus-lib

CONTRIBUTORS.md

@@ -3,6 +3,7 @@ Contributors
 
 Contributors to the codebase, in reverse chronological order:
 
+- James Addyman, @james-rantmedia
 - Foti Dim, @fotidim
 - Denis, @telipskiy
 - Larry Brunet, @larrybrunet

README.md

@@ -123,6 +123,16 @@ func application(_ app: UIApplication,
 }
 ```
 
+For iOS 13 make the callback in `SceneDelegate.swift`
+
+```swift
+func scene(_ scene: UIScene, openURLContexts URLContexts: Set<UIOpenURLContext>) {
+	if let url = URLContexts.first?.url {
+		AppDelegate.shared.oauth2?.handleRedirectURL(url)
+	}
+}
+```
+
 You’re all set!
 
 ---

Sources/iOS/OAuth2Authorizer+iOS.swift

@@ -42,7 +42,10 @@ open class OAuth2Authorizer: OAuth2AuthorizerUI {
 
 	/// Used to store the authentication session.
 	private var authenticationSession: AnyObject?
-	
+
+	/// Used to store the ASWebAuthenticationPresentationContextProvider
+	private var webAuthenticationPresentationContextProvider: AnyObject?
+
 	public init(oauth2: OAuth2Base) {
 		self.oauth2 = oauth2
 	}
@@ -142,9 +145,10 @@ open class OAuth2Authorizer: OAuth2AuthorizerUI {
 					self.oauth2.logger?.warn("OAuth2", msg: "Cannot intercept redirect URL: \(err)")
 				}
 			} else {
-				self.oauth2.didFail(with: nil)
+				self.oauth2.didFail(with: error?.asOAuth2Error)
 			}
 			self.authenticationSession = nil
+			self.webAuthenticationPresentationContextProvider = nil
 		}
 
 #if targetEnvironment(macCatalyst)
@@ -153,6 +157,10 @@ open class OAuth2Authorizer: OAuth2AuthorizerUI {
 #else
 		if #available(iOS 12, *) {
 			authenticationSession = ASWebAuthenticationSession(url: url, callbackURLScheme: redirect, completionHandler: completionHandler)
+			if #available(iOS 13.0, *) {
+				webAuthenticationPresentationContextProvider = OAuth2ASWebAuthenticationPresentationContextProvider(authorizer: self)
+				(authenticationSession as! ASWebAuthenticationSession).presentationContextProvider = webAuthenticationPresentationContextProvider as! OAuth2ASWebAuthenticationPresentationContextProvider
+			}
 			return (authenticationSession as! ASWebAuthenticationSession).start()
 		} else {
 			authenticationSession = SFAuthenticationSession(url: url, callbackURLScheme: redirect, completionHandler: completionHandler)
@@ -291,4 +299,22 @@ class OAuth2SFViewControllerDelegate: NSObject, SFSafariViewControllerDelegate {
 	}
 }
 
+@available(iOS 13.0, *)
+class OAuth2ASWebAuthenticationPresentationContextProvider: NSObject, ASWebAuthenticationPresentationContextProviding {
+
+	private let authorizer: OAuth2Authorizer
+
+	init(authorizer: OAuth2Authorizer) {
+		self.authorizer = authorizer
+	}
+
+	public func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor {
+		guard let context = authorizer.oauth2.authConfig.authorizeContext as? ASPresentationAnchor else {
+			fatalError("Invalid authorizeContext -- must be ASPresentationAnchor (AKA, UIWindow)")
+		}
+
+		return context
+	}
+}
+
 #endif