@capgo/capacitor-inappbrowser 8.17.2 → 8.18.0

package/ios/Sources/InAppBrowserPlugin/InAppBrowserPlugin.swift

@@ -446,7 +446,7 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         case aware = "AWARE"
         case fakeVisible = "FAKE_VISIBLE"
     }
-    private let pluginVersion: String = "8.17.2"
+    private let pluginVersion: String = "8.18.0"
     public let identifier = "CapgoInAppBrowserPlugin"
     public let jsName = "CapgoInAppBrowser"
     public let pluginMethods: [CAPPluginMethod] = [
@@ -507,6 +507,7 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
     private var safariViewController: SFSafariViewController?
     private var safariOpenedUrl: String?
     private var openSecureWindowCall: CAPPluginCall?
+    private var authSession: ASWebAuthenticationSession?
 
     private func setup() {
         self.isSetupDone = true
@@ -1368,6 +1369,17 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         self.isHidden = hidden
         let hiddenPopupWindow = call.getBool("hiddenPopupWindow", false)
         let allowWebViewJsVisibilityControl = self.getConfig().getBoolean("allowWebViewJsVisibilityControl", false)
+        if let rawPreferredContentMode = call.getString("preferredContentMode"),
+           PreferredContentModeSupport.normalizedMode(rawPreferredContentMode) == nil {
+            call.reject("preferredContentMode must be 'recommended', 'mobile', or 'desktop'")
+            return
+        }
+        let preferredContentMode = PreferredContentModeSupport.resolve(
+            perOpenValue: call.getString("preferredContentMode"),
+            pluginConfigValue: self.getConfig().getString("preferredContentMode"),
+            legacyPluginConfigValue: self.bridge?.config.getPluginConfig("InAppBrowser").getString("preferredContentMode"),
+            capacitorConfigValue: self.bridge?.config.preferredContentMode
+        )
         let allowScreenshotsFromWebPage = call.getBool("allowScreenshotsFromWebPage", false)
         let screenshotOnHide = call.getBool("screenshotOnHide", false)
         let captureConsoleLogs = call.getBool("captureConsoleLogs", false)
@@ -1526,6 +1538,7 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
             webViewController.source = webSource
             webViewController.setCredentials(credentials: credentials)
             webViewController.allowWebViewJsVisibilityControl = allowWebViewJsVisibilityControl
+            webViewController.preferredContentMode = preferredContentMode
             webViewController.allowScreenshotsFromWebPage = allowScreenshotsFromWebPage
             webViewController.captureConsoleLogs = captureConsoleLogs
             webViewController.proxyRequests = legacyProxyRequests.isEnabled
@@ -2751,6 +2764,11 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
             return
         }
 
+        if self.openSecureWindowCall != nil || self.authSession != nil {
+            call.reject("An authentication session is already in progress")
+            return
+        }
+
         // Store the call for later resolution
         self.openSecureWindowCall = call
 
@@ -2759,9 +2777,11 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
         // Open the URL in a secure browser window
         DispatchQueue.main.async {
             let session = ASWebAuthenticationSession(url: url, callbackURLScheme: callbackURLScheme) {
-                callbackURL, error in
-
-                // Clean up the stored call
+                [weak self] callbackURL, error in
+                guard let self = self, self.openSecureWindowCall === call else {
+                    return
+                }
+                self.authSession = nil
                 self.openSecureWindowCall = nil
 
                 if let error = error {
@@ -2787,7 +2807,12 @@ public class CapgoInAppBrowserPlugin: CAPPlugin, CAPBridgedPlugin {
             // Present the session
             session.prefersEphemeralWebBrowserSession = prefersEphemeral
             session.presentationContextProvider = self
-            session.start()
+            self.authSession = session
+            if !session.start() {
+                self.authSession = nil
+                self.openSecureWindowCall = nil
+                call.reject("Failed to start authentication session")
+            }
         }
     }
 }

package/ios/Sources/InAppBrowserPlugin/PreferredContentModeSupport.swift

@@ -0,0 +1,50 @@
+import Foundation
+import WebKit
+
+/// Maps Capacitor and plugin `preferredContentMode` values onto WKWebpagePreferences.
+enum PreferredContentModeSupport {
+    static func normalizedMode(_ value: String) -> String? {
+        switch value.lowercased() {
+        case "recommended", "mobile", "desktop":
+            return value.lowercased()
+        default:
+            return nil
+        }
+    }
+
+    static func resolve(
+        perOpenValue: String?,
+        pluginConfigValue: String?,
+        legacyPluginConfigValue: String?,
+        capacitorConfigValue: String?
+    ) -> String? {
+        if let perOpenValue, let normalized = normalizedMode(perOpenValue) {
+            return normalized
+        }
+        if let pluginConfigValue, let normalized = normalizedMode(pluginConfigValue) {
+            return normalized
+        }
+        if let legacyPluginConfigValue, let normalized = normalizedMode(legacyPluginConfigValue) {
+            return normalized
+        }
+        if let capacitorConfigValue, let normalized = normalizedMode(capacitorConfigValue) {
+            return normalized
+        }
+        return nil
+    }
+
+    static func webpageContentMode(for mode: String) -> WKWebpagePreferences.ContentMode {
+        switch mode.lowercased() {
+        case "mobile":
+            return .mobile
+        case "desktop":
+            return .desktop
+        default:
+            return .recommended
+        }
+    }
+
+    static func apply(to configuration: WKWebViewConfiguration, mode: String) {
+        configuration.defaultWebpagePreferences.preferredContentMode = webpageContentMode(for: mode)
+    }
+}

package/ios/Sources/InAppBrowserPlugin/WKWebViewController.swift

@@ -435,6 +435,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
     open var clearCookiesOnOpen = false
     open var clearCacheOnOpen = false
     open var handleDownloads = false
+    open var preferredContentMode: String?
     open var delegate: WKWebViewControllerDelegate?
     open var bypassedSSLHosts: [String]?
     open var cookies: [HTTPCookie]?
@@ -2051,6 +2052,9 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         self.edgesForExtendedLayout = [.bottom]
 
         let webConfiguration = initialWebConfiguration ?? WKWebViewConfiguration()
+        if let preferredContentMode {
+            PreferredContentModeSupport.apply(to: webConfiguration, mode: preferredContentMode)
+        }
         webConfiguration.websiteDataStore = BrowsingDataStoreSupport.websiteDataStore(
             persistWebViewData: persistWebViewData,
             useSharedDataStore: useSharedDataStore
@@ -2340,6 +2344,7 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
         self.captureConsoleLogs = parent.captureConsoleLogs
         self.allowWebViewJsVisibilityControl = parent.allowWebViewJsVisibilityControl
         self.allowScreenshotsFromWebPage = parent.allowScreenshotsFromWebPage
+        self.preferredContentMode = parent.preferredContentMode
         self.handleDownloads = parent.handleDownloads
         self.websiteTitleInNavigationBar = parent.websiteTitleInNavigationBar
         self.doneBarButtonItemPosition = parent.doneBarButtonItemPosition

package/package.json

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