Add visionOS support

Authored-by: Joseph Quigley <[email protected]>

Author: josephquigley

CONTRIBUTORS.md

@@ -3,6 +3,7 @@ Contributors
 
 Contributors to the codebase, in reverse chronological order:
 
+- Joseph Quigley, @josephquigley
 - Martin Pittenauer, @m4p
 - Lars, @longinius
 - Christian Gossain, @cgossain

Sources/Base/OAuth2AuthConfig.swift

@@ -40,11 +40,19 @@ public struct OAuth2AuthConfig {
 		/// If true it makes the login cancellable, otherwise the cancel button is not shown in the embedded web view.
 		public var showCancelButton = true
 
+		#if os(visionOS) // Must come first per Apple documentation
+		/// Starting with iOS 9, `SFSafariViewController` will be used for embedded authorization instead of our custom class. You can turn this off here.
+		public var useSafariView = false
+		
+		/// Starting with iOS 12, `ASWebAuthenticationSession` can be used for embedded authorization instead of our custom class. You can turn this on here.
+		public var useAuthenticationSession = true
+		#else
 		/// Starting with iOS 9, `SFSafariViewController` will be used for embedded authorization instead of our custom class. You can turn this off here.
 		public var useSafariView = true
 
 		/// Starting with iOS 12, `ASWebAuthenticationSession` can be used for embedded authorization instead of our custom class. You can turn this on here.
 		public var useAuthenticationSession = false
+		#endif
 
 		/// May be passed through to [ASWebAuthenticationSession](https://developer.apple.com/documentation/authenticationservices/aswebauthenticationsession/3237231-prefersephemeralwebbrowsersessio).
 		public var prefersEphemeralWebBrowserSession = false

Sources/Base/OAuth2AuthorizerUI.swift

@@ -29,13 +29,16 @@ public protocol OAuth2AuthorizerUI {
 	/// The OAuth2 instance this authorizer belongs to.
 	var oauth2: OAuth2Base { get }
 
+	#if os(visionOS) // Intentionally blank per Apple documentation
+	#elseif os(iOS)
 	/**
 	Open the authorize URL in the OS browser.
 
 	- parameter url: The authorize URL to open
 	- throws:        UnableToOpenAuthorizeURL on failure
 	*/
 	func openAuthorizeURLInBrowser(_ url: URL) throws
+	#endif
 
 	/**
 	Tries to use the given context to present the authorization screen. Context could be a UIViewController for iOS or an NSWindow on macOS.

Sources/Flows/OAuth2.swift

@@ -23,7 +23,7 @@ import Foundation
  import Base
  #if os(macOS)
   import macOS
- #elseif os(iOS)
+ #elseif os(iOS) || os(visionOS)
   import iOS
  #elseif os(tvOS)
   import tvOS
@@ -220,14 +220,20 @@ open class OAuth2: OAuth2Base {
 	- parameter params: Optional key/value pairs to pass during authorization
 	*/
 	open func doAuthorize(params: OAuth2StringDict? = nil) throws {
+		#if os(visionOS) // Must come first per Apple documentation
+		try doAuthorizeEmbedded(with: authConfig, params: params)
+		#elseif os(iOS)
 		if authConfig.authorizeEmbedded {
 			try doAuthorizeEmbedded(with: authConfig, params: params)
 		}
 		else {
 			try doOpenAuthorizeURLInBrowser(params: params)
 		}
+		#endif
 	}
 
+	#if os(visionOS) // Intentionally blank per Apple documentation
+	#elseif os(iOS)
 	/**
 	Open the authorize URL in the OS's browser. Forwards to the receiver's `authorizer`, which is a platform-dependent implementation of
 	`OAuth2AuthorizerUI`.
@@ -240,6 +246,7 @@ open class OAuth2: OAuth2Base {
 		logger?.debug("OAuth2", msg: "Opening authorize URL in system browser: \(url)")
 		try authorizer.openAuthorizeURLInBrowser(url)
 	}
+	#endif
 
 	/**
 	Tries to use the current auth config context, which on iOS should be a UIViewController and on OS X a NSViewController, to present the

Sources/Flows/OAuth2PasswordGrant.swift

@@ -23,7 +23,7 @@ import Foundation
  import Base
  #if os(macOS)
   import macOS
- #elseif os(iOS)
+ #elseif os(iOS) || os(visionOS)
   import iOS
  #elseif os(tvOS)
   import tvOS

Sources/iOS/OAuth2Authorizer+iOS.swift

@@ -17,7 +17,7 @@
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
 //
-#if os(iOS)
+#if os(visionOS) || os(iOS)
 
 import UIKit
 import SafariServices
@@ -37,8 +37,11 @@ open class OAuth2Authorizer: OAuth2AuthorizerUI {
 	/// The OAuth2 instance this authorizer belongs to.
 	public unowned let oauth2: OAuth2Base
 
+	#if os(visionOS) // Intentionally blank per Apple documentation
+	#elseif os(iOS)
 	/// Used to store the `SFSafariViewControllerDelegate`.
 	private var safariViewDelegate: AnyObject?
+	#endif
 
 	/// Used to store the authentication session.
 	private var authenticationSession: AnyObject?
@@ -53,6 +56,8 @@ open class OAuth2Authorizer: OAuth2AuthorizerUI {
 
 	// MARK: - OAuth2AuthorizerUI
 
+	#if os(visionOS) // Intentionally blank per Apple documentation
+	#elseif os(iOS)
 	/**
 	Uses `UIApplication` to open the authorize URL in iOS's browser.
 
@@ -69,6 +74,7 @@ open class OAuth2Authorizer: OAuth2AuthorizerUI {
 		throw OAuth2Error.unableToOpenAuthorizeURL
 		#endif
 	}
+	#endif
 
 	/**
 	Tries to use the current auth config context, which on iOS should be a UIViewController, to present the authorization screen.
@@ -78,6 +84,14 @@ open class OAuth2Authorizer: OAuth2AuthorizerUI {
 	- parameter at:   The authorize URL to open
 	*/
 	public func authorizeEmbedded(with config: OAuth2AuthConfig, at url: URL) throws {
+		#if os(visionOS) // visionOS must be first per Apple documentation
+		// On visionOS we can only use authentication session, so ignore any configs that say otherwise.
+		guard let redirect = oauth2.redirect else {
+			throw OAuth2Error.noRedirectURL
+		}
+		
+		authenticationSessionEmbedded(at: url, withRedirect: redirect, prefersEphemeralWebBrowserSession: config.ui.prefersEphemeralWebBrowserSession)
+		#elseif os(iOS)
 		if #available(iOS 11, *), config.ui.useAuthenticationSession {
 			guard let redirect = oauth2.redirect else {
 				throw OAuth2Error.noRedirectURL
@@ -106,6 +120,7 @@ open class OAuth2Authorizer: OAuth2AuthorizerUI {
 				}
 			}
 		}
+		#endif
 	}
 
 	/**
@@ -185,7 +200,8 @@ open class OAuth2Authorizer: OAuth2AuthorizerUI {
 
 
 	// MARK: - Safari Web View Controller
-	
+	#if os(visionOS) // Intentionally blank per Apple documentation
+	#elseif os(iOS)
 	/**
 	Presents a Safari view controller from the supplied view controller, loading the authorize URL.
 
@@ -293,9 +309,12 @@ open class OAuth2Authorizer: OAuth2AuthorizerUI {
 
 		return web
 	}
+	#endif
 }
 
 
+#if os(visionOS) // Intentionally blank per Apple documentation
+#elseif os(iOS)
 /**
 A custom `SFSafariViewControllerDelegate` that we use with the safari view controller.
 */
@@ -312,6 +331,7 @@ class OAuth2SFViewControllerDelegate: NSObject, SFSafariViewControllerDelegate {
 		authorizer.safariViewControllerDidCancel(controller)
 	}
 }
+#endif
 
 @available(iOS 13.0, *)
 class OAuth2ASWebAuthenticationPresentationContextProvider: NSObject, ASWebAuthenticationPresentationContextProviding {

Sources/iOS/OAuth2CustomAuthorizer+iOS.swift

@@ -17,8 +17,7 @@
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
 //
-#if os(iOS)
-
+#if os(visionOS) || os(iOS)
 import Foundation
 import UIKit
 #if !NO_MODULE_IMPORT
@@ -30,7 +29,7 @@ import Base
 An iOS and tvOS-specific implementation of the `OAuth2CustomAuthorizerUI` protocol which modally presents the login controller.
 */
 public class OAuth2CustomAuthorizer: OAuth2CustomAuthorizerUI {
-	
+
 	private var presentingController: UIViewController?
 
 	public init() {  }

Sources/iOS/OAuth2WebViewController+iOS.swift

@@ -17,7 +17,8 @@
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
 //
-#if os(iOS)
+#if os(visionOS) // Intentionally blank per Apple documentation
+#elseif os(iOS)
 
 import UIKit
 import WebKit
@@ -102,7 +103,10 @@ open class OAuth2WebViewController: UIViewController, WKNavigationDelegate {
 	override open func loadView() {
 		edgesForExtendedLayout = .all
 		extendedLayoutIncludesOpaqueBars = true
+		#if os(visionOS) // Intentionally blank per Apple documentation
+		#elseif os(iOS)
 		automaticallyAdjustsScrollViewInsets = true
+		#endif
 
 		super.loadView()
 		view.backgroundColor = UIColor.white