fix: open browser sync for ios

Author: michaellee8

ios/WebBrowser.m

@@ -1,19 +1,17 @@
 #import <React/RCTBridgeModule.h>
 
+
 @interface RCT_EXTERN_MODULE(NativeWebBrowser, NSObject)
 
+
 RCT_EXTERN_METHOD(openBrowserAsync:(NSString*)urlStr
-                 withOptionsDict:(NSDictionary*)optionsDict
-                 withResolver:(RCTPromiseResolveBlock)resolve
-                 withRejecter:(RCTPromiseRejectBlock)reject)
+                  withOptionsDict:(NSDictionary*)optionsDict
+                  withResolver:(RCTPromiseResolveBlock)resolve
+                  withRejector:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(dismissBrowser:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
 
-//RCT_EXTERN_METHOD(openAuthSessionAsync:(NSString*)authUrlStr
-//                 withRedirectUrl:(NSString*)redirectUrlStr
-//                 withResolver:(RCTPromiseResolveBlock)resolve
-//                 withRejecter:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(openAuthSessionAsync:(NSString*)authUrlStr
                   withRedirectUrl:(NSString*)redirectUrlStr
@@ -25,16 +23,21 @@ @interface RCT_EXTERN_MODULE(NativeWebBrowser, NSObject)
 RCT_EXTERN_METHOD(dismissAuthSession:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
 
+
 RCT_EXTERN_METHOD(warmUpAsync:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
 
+
 RCT_EXTERN_METHOD(coolDownAsync:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
 
+
 RCT_EXTERN_METHOD(mayInitWithUrlAsync:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
 
+
 RCT_EXTERN_METHOD(getCustomTabsSupportingBrowsers:(RCTPromiseResolveBlock)resolve
                  withRejecter:(RCTPromiseRejectBlock)reject)
 
+
 @end

ios/WebBrowser.swift

@@ -8,9 +8,9 @@ class NativeWebBrowser: NSObject {
     private var currentAuthSession: WebAuthSession?
 
     @objc(openBrowserAsync:withOptionsDict:withResolver:withRejector:)
-    func openBrowserAsync(urlStr: String, optionsDict: [String: Any], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+    func openBrowserAsync(_ urlStr: NSString, optionsDict: [String: Any], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         guard
-            let url = URL(string: urlStr),
+            let url = URL(string: urlStr as String),
             let options = try? JSONDecoder().decode(WebBrowserOptions.self, from: JSONSerialization.data(withJSONObject: optionsDict))
         else {
             reject(ReactNativeWebBrowserErrorCode, "Invalid Argument: url or options is invalid.", ReactNativeWebBrowserError.invalidArgument("url or options"))
@@ -38,7 +38,7 @@ class NativeWebBrowser: NSObject {
         guard
             let authUrl = URL(string: authUrlStr as String),
             let redirectUrl = URL(string: redirectUrlStr as String),
-            var options = try? JSONDecoder().decode(AuthSessionOptions.self, from: JSONSerialization.data(withJSONObject: optionsDict))
+            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"))
             return

ios/WebBrowserOptions.swift

@@ -8,7 +8,7 @@
 import Foundation
 import SafariServices
 
-struct WebBrowserOptions: Codable {
+class WebBrowserOptions: Codable {
     var readerMode: Bool = false
 
     var enableBarCollapsing: Bool = false
@@ -18,6 +18,39 @@ struct WebBrowserOptions: Codable {
     var toolbarColor: CodableColor?
 
     var controlsColor: CodableColor?
+    
+    required init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        if let readerMode = try container.decodeIfPresent(Bool.self, forKey: .readerMode) {
+            self.readerMode = readerMode
+        } else {
+            self.readerMode = false
+        }
+        
+        if let enableBarCollapsing = try container.decodeIfPresent(Bool.self, forKey: .enableBarCollapsing) {
+            self.enableBarCollapsing = enableBarCollapsing
+        } else {
+            self.enableBarCollapsing = false
+        }
+        
+        if let dismissButtonStyle = try container.decodeIfPresent(DismissButtonStyle.self, forKey: .dismissButtonStyle) {
+            self.dismissButtonStyle = dismissButtonStyle
+        } else {
+            self.dismissButtonStyle = .done
+        }
+        
+        if let toolbarColor = try container.decodeIfPresent(CodableColor.self, forKey: .toolbarColor) {
+            self.toolbarColor = toolbarColor
+        } else {
+            self.toolbarColor = nil
+        }
+        
+        if let controlsColor = try container.decodeIfPresent(CodableColor.self, forKey: .controlsColor) {
+            self.controlsColor = controlsColor
+        } else {
+            self.controlsColor = nil
+        }
+    }
 }
 
 class AuthSessionOptions: Codable {