iOS changes

Author: dhruvTor

ios/Promise.swift

@@ -6,7 +6,6 @@
 //
 
 import Foundation
-
 // Original Implementation:  https://github.com/expo/expo/blob/168ee43f71f005baa11edf98e518593443e1807a/packages/expo-modules-core/ios/Swift/Promise.swift
 
 struct Promise {

ios/WebAuthSession.swift

@@ -5,17 +5,17 @@
 //  Created by Michael Lee on 23/3/2022.
 //
 
+//https://github.com/expo/expo/blob/main/packages/expo-web-browser/ios/WebAuthSession.swift
+
 import AuthenticationServices
 import Foundation
 
-@available(iOS 12.0, *)
 private class PresentationContextProvider: NSObject, ASWebAuthenticationPresentationContextProviding {
     func presentationAnchor(for _: ASWebAuthenticationSession) -> ASPresentationAnchor {
         return UIApplication.shared.keyWindow ?? ASPresentationAnchor()
     }
 }
 
-@available(iOS 12.0, *)
 internal final class WebAuthSession {
     var authSession: ASWebAuthenticationSession?
     var promise: Promise?
@@ -26,10 +26,10 @@ internal final class WebAuthSession {
     // It must be initialized before hand as `ASWebAuthenticationSession` holds it as a weak property
     private var presentationContextProvider = PresentationContextProvider()
 
-    init(authUrl: URL, redirectUrl: URL, options: AuthSessionOptions) {
+    init(authUrl: URL, redirectUrl: URL?, options: AuthSessionOptions) {
         authSession = ASWebAuthenticationSession(
             url: authUrl,
-            callbackURLScheme: redirectUrl.scheme,
+            callbackURLScheme: redirectUrl?.scheme,
             completionHandler: { callbackUrl, error in
                 self.finish(with: [
                     "type": callbackUrl != nil ? "success" : "cancel",

ios/WebBrowser.swift

@@ -34,10 +34,9 @@ class NativeWebBrowser: NSObject {
     }
 
     @objc(openAuthSessionAsync:withRedirectUrl:withOptionsDict:withResolver:withRejector:)
-    func openAuthSessionAsync(_ authUrlStr: NSString, redirectUrlStr: NSString, optionsDict: [String: Any], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+    func openAuthSessionAsync(_ authUrlStr: NSString, redirectUrlStr: NSString?, optionsDict: [String: Any], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         guard
             let authUrl = URL(string: authUrlStr as String),
-            let redirectUrl = URL(string: redirectUrlStr as String),
             let options = try? JSONDecoder().decode(AuthSessionOptions.self, from: JSONSerialization.data(withJSONObject: optionsDict))
         else {
             reject(ReactNativeWebBrowserErrorCode, "Invalid Argument: authUrl or redirectUrl or options is invalid.", ReactNativeWebBrowserError.invalidArgument("authUrl or redirectUrl or options"))
@@ -50,6 +49,7 @@ class NativeWebBrowser: NSObject {
             reject(ReactNativeWebBrowserErrorCode, "AuthSession is already opened.", ReactNativeWebBrowserError.alreadyOpen)
             return
         }
+        let redirectUrl = URL(string: redirectUrlStr as? String ?? "")
         self.currentAuthSession = WebAuthSession(authUrl: authUrl, redirectUrl: redirectUrl, options: options)
         self.currentAuthSession?.open(promise)
     } 

ios/WebBrowserOptions.swift

@@ -5,6 +5,8 @@
 //  Created by Michael Lee on 23/3/2022.
 //
 
+//https://github.com/expo/expo/blob/main/packages/expo-web-browser/ios/WebBrowserOptions.swift
+
 import Foundation
 import SafariServices
 
@@ -19,6 +21,12 @@ class WebBrowserOptions: Codable {
 
     var controlsColor: CodableColor?
 
+    var presentationStyle:PresentationStyle = .overFullScreen
+    
+    struct AuthSessionOptions:Codable{
+        var preferEphemeralSession: Bool = false
+    }
+    
     required init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         if let readerMode = try container.decodeIfPresent(Bool.self, forKey: .readerMode) {
@@ -83,6 +91,45 @@ enum DismissButtonStyle: String, Codable {
     }
 }
 
+internal enum PresentationStyle: String ,Codable{
+  case fullScreen
+  case pageSheet
+  case formSheet
+  case currentContext
+  case overFullScreen
+  case overCurrentContext
+  case popover
+  case none
+  case automatic
+
+  func toPresentationStyle() -> UIModalPresentationStyle {
+    switch self {
+    case .fullScreen:
+      return .fullScreen
+    case .pageSheet:
+      return .pageSheet
+    case .formSheet:
+      return .formSheet
+    case .currentContext:
+      return .currentContext
+    case .overFullScreen:
+      return .overFullScreen
+    case .overCurrentContext:
+      return .overCurrentContext
+    case .popover:
+      return .popover
+    case .none:
+      return .none
+    case .automatic:
+      if #available(iOS 13.0, *) {
+        return .automatic
+      }
+      // default prior iOS 13
+      return .fullScreen
+    }
+  }
+}
+
 // https://github.com/expo/expo/blob/168ee43f71f005baa11edf98e518593443e1807a/packages/expo-modules-core/ios/Swift/Arguments/Convertibles.swift
 // https://stackoverflow.com/questions/50928153/make-uicolor-codable
 

ios/WebBrowserSession.swift

@@ -5,6 +5,8 @@
 //  Created by Michael Lee on 23/3/2022.
 //
 
+// https://github.com/expo/expo/blob/main/packages/expo-web-browser/ios/WebBrowserSession.swift
+
 import Foundation
 import SafariServices
 
@@ -27,7 +29,6 @@ internal class WebBrowserSession: NSObject, SFSafariViewControllerDelegate {
 
         super.init()
         viewController.delegate = self
-
         // By setting the modal presentation style to OverFullScreen, we disable the "Swipe to dismiss"
         // gesture that is causing a bug where sometimes `safariViewControllerDidFinish` is not called.
         // There are bugs filed already about it on OpenRadar.
@@ -55,6 +56,11 @@ internal class WebBrowserSession: NSObject, SFSafariViewControllerDelegate {
     func safariViewControllerDidFinish(_: SFSafariViewController) {
         finish(type: "cancel")
     }
+    
+    // MARK: - UIAdaptivePresentationControllerDelegate
+     func presentationControllerDidDismiss(_ presentationController: UIPresentationController) {
+       finish(type: "cancel")
+     }
 
     // MARK: - Private