@capgo/inappbrowser 8.1.18 → 8.1.20

package/ios/Sources/InAppBrowserPlugin/InAppBrowserPlugin.swift

@@ -1,6 +1,7 @@
 import Foundation
 import Capacitor
 import WebKit
+import AuthenticationServices
 
 extension UIColor {
 
@@ -28,7 +29,7 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         case aware = "AWARE"
         case fakeVisible = "FAKE_VISIBLE"
     }
-    private let pluginVersion: String = "8.1.18"
+    private let pluginVersion: String = "8.1.20"
     public let identifier = "InAppBrowserPlugin"
     public let jsName = "InAppBrowser"
     public let pluginMethods: [CAPPluginMethod] = [
@@ -47,7 +48,8 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         CAPPluginMethod(name: "executeScript", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "postMessage", returnType: CAPPluginReturnPromise),
         CAPPluginMethod(name: "updateDimensions", returnType: CAPPluginReturnPromise),
-        CAPPluginMethod(name: "getPluginVersion", returnType: CAPPluginReturnPromise)
+        CAPPluginMethod(name: "getPluginVersion", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "openSecureWindow", returnType: CAPPluginReturnPromise),
     ]
     var navigationWebViewController: UINavigationController?
     private var navigationControllers: [String: UINavigationController] = [:]
@@ -68,6 +70,7 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
     private var closeModalDescription: String?
     private var closeModalOk: String?
     private var closeModalCancel: String?
+    private var openSecureWindowCall: CAPPluginCall?
 
     private func setup() {
         self.isSetupDone = true
@@ -195,8 +198,12 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
             ? webViewController.view.safeAreaLayoutGuide.bottomAnchor
             : webViewController.view.bottomAnchor
 
+        let topAnchor = webViewController.enabledSafeTopMargin
+            ? webViewController.view.safeAreaLayoutGuide.topAnchor
+            : webViewController.view.topAnchor
+
         NSLayoutConstraint.activate([
-            webView.topAnchor.constraint(equalTo: webViewController.view.safeAreaLayoutGuide.topAnchor),
+            webView.topAnchor.constraint(equalTo: topAnchor),
             webView.leadingAnchor.constraint(equalTo: webViewController.view.leadingAnchor),
             webView.trailingAnchor.constraint(equalTo: webViewController.view.trailingAnchor),
             webView.bottomAnchor.constraint(equalTo: bottomAnchor)
@@ -494,6 +501,7 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         let preventDeeplink = call.getBool("preventDeeplink", false)
         let isAnimated = call.getBool("isAnimated", true)
         let enabledSafeBottomMargin = call.getBool("enabledSafeBottomMargin", false)
+        let enabledSafeTopMargin = call.getBool("enabledSafeTopMargin", true)
         let hidden = call.getBool("hidden", false)
         self.isHidden = hidden
         let allowWebViewJsVisibilityControl = self.getConfig().getBoolean("allowWebViewJsVisibilityControl", false)
@@ -572,6 +580,10 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
 
         let credentials = self.readCredentials(call)
 
+        // Read HTTP method and body for custom requests
+        let httpMethod = call.getString("method")
+        let httpBody = call.getString("body")
+
         // Read dimension options
         let width = call.getFloat("width")
         let height = call.getFloat("height")
@@ -601,6 +613,7 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
                 preventDeeplink: preventDeeplink,
                 blankNavigationTab: toolbarType == "blank",
                 enabledSafeBottomMargin: enabledSafeBottomMargin,
+                enabledSafeTopMargin: enabledSafeTopMargin,
                 blockedHosts: blockedHosts,
                 authorizedAppLinks: authorizedAppLinks,
                 )
@@ -614,6 +627,14 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
             webViewController.instanceId = webViewId
             webViewController.allowWebViewJsVisibilityControl = allowWebViewJsVisibilityControl
 
+            // Set HTTP method and body if provided
+            if let method = httpMethod {
+                webViewController.httpMethod = method
+            }
+            if let body = httpBody {
+                webViewController.httpBody = body
+            }
+
             // Set dimensions if provided
             if let width = width {
                 webViewController.customWidth = CGFloat(width)
@@ -1154,7 +1175,7 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
                 return
             }
 
-            self.webViewController = WKWebViewController.init(url: url, headers: headers, isInspectable: isInspectable, credentials: credentials, preventDeeplink: preventDeeplink, blankNavigationTab: true, enabledSafeBottomMargin: false)
+            self.webViewController = WKWebViewController.init(url: url, headers: headers, isInspectable: isInspectable, credentials: credentials, preventDeeplink: preventDeeplink, blankNavigationTab: true, enabledSafeBottomMargin: false, enabledSafeTopMargin: true)
 
             guard let webViewController = self.webViewController else {
                 call.reject("Failed to initialize WebViewController")
@@ -1336,4 +1357,62 @@ public class InAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         }
     }
 
+    @objc func openSecureWindow(_ call: CAPPluginCall) {
+        guard let urlString = call.getString("authEndpoint") else {
+            call.reject("authEndpoint is required")
+            return
+        }
+
+        guard let url = URL(string: urlString) else {
+            call.reject("Invalid URL")
+            return
+        }
+
+        guard let redirectUri = call.getString("redirectUri") else {
+            call.reject("Redirect URI is required")
+            return
+        }
+
+        // Store the call for later resolution
+        self.openSecureWindowCall = call
+
+        // Open the URL in a secure browser window
+        DispatchQueue.main.async {
+            let session = ASWebAuthenticationSession(url: url, callbackURLScheme: url.scheme) {
+                callbackURL, error in
+
+                // Clean up the stored call
+                self.openSecureWindowCall = nil
+
+                if let error = error {
+                    // Handle error (e.g., user cancelled)
+                    call.reject(error.localizedDescription)
+                    return
+                }
+
+                guard let callbackURL = callbackURL else {
+                    call.reject("No callback URL received")
+                    return
+                }
+
+                if !callbackURL.absoluteString.hasPrefix(redirectUri) {
+                    call.reject("Redirect URI does not match, expected " + redirectUri + " but got " + callbackURL.absoluteString)
+                    return
+                }
+
+                // Resolve the call with the callback URL
+                call.resolve(["redirectedUri": callbackURL.absoluteString])
+            }
+
+            // Present the session
+            session.presentationContextProvider = self
+            session.start()
+        }
+    }
+}
+
+extension InAppBrowserPlugin: ASWebAuthenticationPresentationContextProviding {
+    public func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor {
+        return self.bridge?.viewController?.view.window ?? ASPresentationAnchor()
+    }
 }

package/ios/Sources/InAppBrowserPlugin/WKWebViewController.swift

@@ -76,10 +76,11 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         self.initWebview(isInspectable: isInspectable)
     }
 
-    public init(url: URL, headers: [String: String], isInspectable: Bool, credentials: WKWebViewCredentials? = nil, preventDeeplink: Bool, blankNavigationTab: Bool, enabledSafeBottomMargin: Bool) {
+    public init(url: URL, headers: [String: String], isInspectable: Bool, credentials: WKWebViewCredentials? = nil, preventDeeplink: Bool, blankNavigationTab: Bool, enabledSafeBottomMargin: Bool, enabledSafeTopMargin: Bool = true) {
         super.init(nibName: nil, bundle: nil)
         self.blankNavigationTab = blankNavigationTab
         self.enabledSafeBottomMargin = enabledSafeBottomMargin
+        self.enabledSafeTopMargin = enabledSafeTopMargin
         self.source = .remote(url)
         self.credentials = credentials
         self.setHeaders(headers: headers)
@@ -87,10 +88,11 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         self.initWebview(isInspectable: isInspectable)
     }
 
-    public init(url: URL, headers: [String: String], isInspectable: Bool, credentials: WKWebViewCredentials? = nil, preventDeeplink: Bool, blankNavigationTab: Bool, enabledSafeBottomMargin: Bool, blockedHosts: [String]) {
+    public init(url: URL, headers: [String: String], isInspectable: Bool, credentials: WKWebViewCredentials? = nil, preventDeeplink: Bool, blankNavigationTab: Bool, enabledSafeBottomMargin: Bool, enabledSafeTopMargin: Bool = true, blockedHosts: [String]) {
         super.init(nibName: nil, bundle: nil)
         self.blankNavigationTab = blankNavigationTab
         self.enabledSafeBottomMargin = enabledSafeBottomMargin
+        self.enabledSafeTopMargin = enabledSafeTopMargin
         self.source = .remote(url)
         self.credentials = credentials
         self.setHeaders(headers: headers)
@@ -99,10 +101,11 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         self.initWebview(isInspectable: isInspectable)
     }
 
-    public init(url: URL, headers: [String: String], isInspectable: Bool, credentials: WKWebViewCredentials? = nil, preventDeeplink: Bool, blankNavigationTab: Bool, enabledSafeBottomMargin: Bool, blockedHosts: [String], authorizedAppLinks: [String]) {
+    public init(url: URL, headers: [String: String], isInspectable: Bool, credentials: WKWebViewCredentials? = nil, preventDeeplink: Bool, blankNavigationTab: Bool, enabledSafeBottomMargin: Bool, enabledSafeTopMargin: Bool = true, blockedHosts: [String], authorizedAppLinks: [String]) {
         super.init(nibName: nil, bundle: nil)
         self.blankNavigationTab = blankNavigationTab
         self.enabledSafeBottomMargin = enabledSafeBottomMargin
+        self.enabledSafeTopMargin = enabledSafeTopMargin
         self.source = .remote(url)
         self.credentials = credentials
         self.setHeaders(headers: headers)
@@ -123,6 +126,8 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
     open var bypassedSSLHosts: [String]?
     open var cookies: [HTTPCookie]?
     open var headers: [String: String]?
+    open var httpMethod: String?
+    open var httpBody: String?
     open var capBrowserPlugin: InAppBrowserPlugin?
     var instanceId: String = ""
     var shareDisclaimer: [String: Any]?
@@ -143,6 +148,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
     var blankNavigationTab: Bool = false
     var capacitorStatusBar: UIView?
     var enabledSafeBottomMargin: Bool = false
+    var enabledSafeTopMargin: Bool = true
     var blockedHosts: [String] = []
     var authorizedAppLinks: [String] = []
     var activeNativeNavigationForWebview: Bool = true
@@ -731,17 +737,22 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
 
         // Then set up constraints
         webView.translatesAutoresizingMaskIntoConstraints = false
-        var bottomPadding = self.view.bottomAnchor
+        var bottomAnchor = self.view.bottomAnchor
+        var topAnchor = self.view.safeAreaLayoutGuide.topAnchor
 
         if self.enabledSafeBottomMargin {
-            bottomPadding = self.view.safeAreaLayoutGuide.bottomAnchor
+            bottomAnchor = self.view.safeAreaLayoutGuide.bottomAnchor
+        }
+
+        if !self.enabledSafeTopMargin {
+            topAnchor = self.view.topAnchor
         }
 
         NSLayoutConstraint.activate([
-            webView.topAnchor.constraint(equalTo: self.view.safeAreaLayoutGuide.topAnchor),
+            webView.topAnchor.constraint(equalTo: topAnchor),
             webView.leadingAnchor.constraint(equalTo: self.view.leadingAnchor),
             webView.trailingAnchor.constraint(equalTo: self.view.trailingAnchor),
-            webView.bottomAnchor.constraint(equalTo: bottomPadding)
+            webView.bottomAnchor.constraint(equalTo: bottomAnchor)
         ])
 
         webView.uiDelegate = self
@@ -1079,6 +1090,16 @@ fileprivate extension WKWebViewController {
     func createRequest(url: URL) -> URLRequest {
         var request = URLRequest(url: url)
 
+        // Set up HTTP method if specified
+        if let method = httpMethod {
+            request.httpMethod = method.uppercased()
+        }
+
+        // Set up HTTP body if specified
+        if let body = httpBody, let data = body.data(using: .utf8) {
+            request.httpBody = data
+        }
+
         // Set up headers
         if let headers = headers {
             for (field, value) in headers {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/inappbrowser",
-  "version": "8.1.18",
+  "version": "8.1.20",
   "description": "Capacitor plugin in app browser",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",