@capgo/inappbrowser 7.10.10 → 7.11.1

package/android/src/main/java/ee/forgr/capacitor_inappbrowser/WebViewDialog.java

@@ -24,6 +24,8 @@ import android.print.PrintAttributes;
 import android.print.PrintDocumentAdapter;
 import android.print.PrintManager;
 import android.provider.MediaStore;
+import android.security.KeyChain;
+import android.security.KeyChainAliasCallback;
 import android.text.TextUtils;
 import android.util.Base64;
 import android.util.Log;
@@ -65,6 +67,8 @@ import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
+import java.security.PrivateKey;
+import java.security.cert.X509Certificate;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -186,19 +190,7 @@ public class WebViewDialog extends Dialog {
 
         activity.runOnUiThread(() -> {
           try {
-            String currentUrl = "";
-            if (_webView != null) {
-              try {
-                currentUrl = _webView.getUrl();
-                if (currentUrl == null) {
-                  currentUrl = "";
-                }
-              } catch (Exception e) {
-                Log.e("InAppBrowser", "Error getting URL: " + e.getMessage());
-                currentUrl = "";
-              }
-            }
-
+            String currentUrl = getUrl();
             dismiss();
 
             if (_options != null && _options.getCallbacks() != null) {
@@ -444,11 +436,7 @@ public class WebViewDialog extends Dialog {
           // DEBUG: Log details about the file chooser request
           Log.d("InAppBrowser", "onShowFileChooser called");
           Log.d("InAppBrowser", "Accept type: " + acceptType);
-          Log.d(
-            "InAppBrowser",
-            "Current URL: " +
-            (webView.getUrl() != null ? webView.getUrl() : "null")
-          );
+          Log.d("InAppBrowser", "Current URL: " + getUrl());
           Log.d(
             "InAppBrowser",
             "Original URL: " +
@@ -477,7 +465,7 @@ public class WebViewDialog extends Dialog {
           // Direct check for capture attribute in URL (fallback method)
           boolean isCaptureInUrl;
           String captureMode;
-          String currentUrl = webView.getUrl();
+          String currentUrl = getUrl();
 
           // Look for capture in URL parameters - sometimes the attribute shows up in URL
           if (currentUrl != null && currentUrl.contains("capture=")) {
@@ -512,43 +500,48 @@ public class WebViewDialog extends Dialog {
 
             // Fixed JavaScript with proper error handling
             String js =
-              "try {" +
-              "  (function() {" +
-              "    var captureAttr = null;" +
-              "    // Check active element first" +
-              "    if (document.activeElement && " +
-              "        document.activeElement.tagName === 'INPUT' && " +
-              "        document.activeElement.type === 'file') {" +
-              "      if (document.activeElement.hasAttribute('capture')) {" +
-              "        captureAttr = document.activeElement.getAttribute('capture') || 'environment';" +
-              "        return captureAttr;" +
-              "      }" +
-              "    }" +
-              "    // Try to find any input with capture attribute" +
-              "    var inputs = document.querySelectorAll('input[type=\"file\"][capture]');" +
-              "    if (inputs && inputs.length > 0) {" +
-              "      captureAttr = inputs[0].getAttribute('capture') || 'environment';" +
-              "      return captureAttr;" +
-              "    }" +
-              "    // Try to extract from HTML attributes" +
-              "    var allInputs = document.getElementsByTagName('input');" +
-              "    for (var i = 0; i < allInputs.length; i++) {" +
-              "      var input = allInputs[i];" +
-              "      if (input.type === 'file') {" +
-              "        if (input.hasAttribute('capture')) {" +
-              "          captureAttr = input.getAttribute('capture') || 'environment';" +
-              "          return captureAttr;" +
-              "        }" +
-              "        // Look for the accept attribute containing image/* as this might be a camera input" +
-              "        var acceptAttr = input.getAttribute('accept');" +
-              "        if (acceptAttr && acceptAttr.indexOf('image/*') >= 0) {" +
-              "          console.log('Found input with image/* accept');" +
-              "        }" +
-              "      }" +
-              "    }" +
-              "    return '';" +
-              "  })();" +
-              "} catch(e) { console.error('Capture detection error:', e); return ''; }";
+              """
+              try {
+                (function() {
+                  var captureAttr = null;
+                  // Check active element first
+                  if (document.activeElement &&
+                      document.activeElement.tagName === 'INPUT' &&
+                      document.activeElement.type === 'file') {
+                    if (document.activeElement.hasAttribute('capture')) {
+                      captureAttr = document.activeElement.getAttribute('capture') || 'environment';
+                      return captureAttr;
+                    }
+                  }
+                  // Try to find any input with capture attribute
+                  var inputs = document.querySelectorAll('input[type="file"][capture]');
+                  if (inputs && inputs.length > 0) {
+                    captureAttr = inputs[0].getAttribute('capture') || 'environment';
+                    return captureAttr;
+                  }
+                  // Try to extract from HTML attributes
+                  var allInputs = document.getElementsByTagName('input');
+                  for (var i = 0; i < allInputs.length; i++) {
+                    var input = allInputs[i];
+                    if (input.type === 'file') {
+                      if (input.hasAttribute('capture')) {
+                        captureAttr = input.getAttribute('capture') || 'environment';
+                        return captureAttr;
+                      }
+                      // Look for the accept attribute containing image/* as this might be a camera input
+                      var acceptAttr = input.getAttribute('accept');
+                      if (acceptAttr && acceptAttr.indexOf('image/*') >= 0) {
+                        console.log('Found input with image/* accept');
+                      }
+                    }
+                  }
+                  return '';
+                })();
+              } catch(e) {
+                console.error('Capture detection error:', e);
+                return '';
+              }
+              """;
 
             webView.evaluateJavascript(js, value -> {
               Log.d("InAppBrowser", "Capture attribute JS result: " + value);
@@ -1462,7 +1455,7 @@ public class WebViewDialog extends Dialog {
       _webView.stopLoading();
 
       // Check if there's a URL to reload
-      String currentUrl = _webView.getUrl();
+      String currentUrl = getUrl();
       if (currentUrl != null && !currentUrl.equals("about:blank")) {
         // Reload the current page
         _webView.reload();
@@ -1486,7 +1479,16 @@ public class WebViewDialog extends Dialog {
   }
 
   public String getUrl() {
-    return _webView != null ? _webView.getUrl() : "";
+    try {
+      WebView webView = _webView;
+      if (webView != null) {
+        String url = webView.getUrl();
+        return url != null ? url : "";
+      }
+    } catch (Exception e) {
+      Log.w("InAppBrowser", "Error getting URL: " + e.getMessage());
+    }
+    return "";
   }
 
   public void executeScript(String script) {
@@ -1628,9 +1630,7 @@ public class WebViewDialog extends Dialog {
                 new OnClickListener() {
                   public void onClick(DialogInterface dialog, int which) {
                     // Close button clicked, do something
-                    String currentUrl = _webView != null
-                      ? _webView.getUrl()
-                      : "";
+                    String currentUrl = getUrl();
                     dismiss();
                     if (_options != null && _options.getCallbacks() != null) {
                       _options.getCallbacks().closeEvent(currentUrl);
@@ -1641,7 +1641,7 @@ public class WebViewDialog extends Dialog {
               .setNegativeButton(_options.getCloseModalCancel(), null)
               .show();
           } else {
-            String currentUrl = _webView != null ? _webView.getUrl() : "";
+            String currentUrl = getUrl();
             dismiss();
             if (_options != null && _options.getCallbacks() != null) {
               _options.getCallbacks().closeEvent(currentUrl);
@@ -1671,7 +1671,7 @@ public class WebViewDialog extends Dialog {
               _webView.stopLoading();
 
               // Check if there's a URL to reload
-              String currentUrl = _webView.getUrl();
+              String currentUrl = getUrl();
               if (currentUrl != null) {
                 // Reload the current page
                 _webView.reload();
@@ -2153,6 +2153,109 @@ public class WebViewDialog extends Dialog {
           return false;
         }
 
+        @Override
+        public void onReceivedClientCertRequest(
+          WebView view,
+          android.webkit.ClientCertRequest request
+        ) {
+          Log.i("InAppBrowser", "onReceivedClientCertRequest CALLED");
+
+          if (request == null) {
+            Log.e("InAppBrowser", "ClientCertRequest is null");
+            return;
+          }
+
+          if (activity == null) {
+            Log.e("InAppBrowser", "Activity is null, canceling request");
+            try {
+              request.cancel();
+            } catch (Exception e) {
+              Log.e(
+                "InAppBrowser",
+                "Error canceling request: " + e.getMessage()
+              );
+            }
+            return;
+          }
+
+          try {
+            Log.i("InAppBrowser", "Host: " + request.getHost());
+            Log.i("InAppBrowser", "Port: " + request.getPort());
+            Log.i(
+              "InAppBrowser",
+              "Principals: " +
+              java.util.Arrays.toString(request.getPrincipals())
+            );
+            Log.i(
+              "InAppBrowser",
+              "KeyTypes: " + java.util.Arrays.toString(request.getKeyTypes())
+            );
+
+            KeyChain.choosePrivateKeyAlias(
+              activity,
+              new KeyChainAliasCallback() {
+                @Override
+                public void alias(String alias) {
+                  if (alias != null) {
+                    try {
+                      PrivateKey privateKey = KeyChain.getPrivateKey(
+                        activity,
+                        alias
+                      );
+                      X509Certificate[] certChain =
+                        KeyChain.getCertificateChain(activity, alias);
+                      request.proceed(privateKey, certChain);
+                      Log.i("InAppBrowser", "Selected certificate: " + alias);
+                    } catch (Exception e) {
+                      try {
+                        request.cancel();
+                      } catch (Exception cancelEx) {
+                        Log.e(
+                          "InAppBrowser",
+                          "Error canceling request: " + cancelEx.getMessage()
+                        );
+                      }
+                      Log.e(
+                        "InAppBrowser",
+                        "Error selecting certificate: " + e.getMessage()
+                      );
+                    }
+                  } else {
+                    try {
+                      request.cancel();
+                    } catch (Exception e) {
+                      Log.e(
+                        "InAppBrowser",
+                        "Error canceling request: " + e.getMessage()
+                      );
+                    }
+                    Log.i("InAppBrowser", "No certificate found");
+                  }
+                }
+              },
+              null, // keyTypes
+              null, // issuers
+              request.getHost(),
+              request.getPort(),
+              null // alias (null = system asks user to choose)
+            );
+          } catch (Exception e) {
+            Log.e(
+              "InAppBrowser",
+              "Error in onReceivedClientCertRequest: " + e.getMessage()
+            );
+            try {
+              request.cancel();
+            } catch (Exception cancelEx) {
+              Log.e(
+                "InAppBrowser",
+                "Error canceling request after exception: " +
+                cancelEx.getMessage()
+              );
+            }
+          }
+        }
+
         private String randomRequestId() {
           return UUID.randomUUID().toString();
         }
@@ -2567,7 +2670,7 @@ public class WebViewDialog extends Dialog {
     ) {
       _webView.goBack();
     } else if (!_options.getDisableGoBackOnNativeApplication()) {
-      String currentUrl = _webView != null ? _webView.getUrl() : "";
+      String currentUrl = getUrl();
       _options.getCallbacks().closeEvent(currentUrl);
       if (_webView != null) {
         _webView.destroy();

package/ios/Plugin/WKWebViewController.swift

@@ -443,11 +443,20 @@ open class WKWebViewController: UIViewController, WKScriptMessageHandler {
 
     // Method to send a message from Swift to JavaScript
     open func postMessageToJS(message: [String: Any]) {
-        if let jsonData = try? JSONSerialization.data(withJSONObject: message, options: []),
-           let jsonString = String(data: jsonData, encoding: .utf8) {
-            let script = "window.dispatchEvent(new CustomEvent('messageFromNative', { detail: \(jsonString) }));"
-            DispatchQueue.main.async {
-                self.webView?.evaluateJavaScript(script, completionHandler: nil)
+        guard let jsonData = try? JSONSerialization.data(withJSONObject: message, options: []),
+              let jsonString = String(data: jsonData, encoding: .utf8) else {
+            print("[InAppBrowser] Failed to serialize message to JSON")
+            return
+        }
+        
+        // Safely build the script to avoid any potential issues
+        let script = "window.dispatchEvent(new CustomEvent('messageFromNative', { detail: \(jsonString) }));"
+        
+        DispatchQueue.main.async {
+            self.webView?.evaluateJavaScript(script) { result, error in
+                if let error = error {
+                    print("[InAppBrowser] JavaScript evaluation error in postMessageToJS: \(error)")
+                }
             }
         }
     }
@@ -1339,20 +1348,25 @@ extension WKWebViewController: WKNavigationDelegate {
             return
         }
 
-        // TODO: implement interface
-        let script = """
-                        async function preShowFunction() {
-                        \(self.preShowScript ?? "")
-                        };
-                        preShowFunction().then(
-                                () => window.webkit.messageHandlers.preShowScriptSuccess.postMessage({})
-                        ).catch(
-                                err => {
-                                        console.error('Preshow error', err);
-                                        window.webkit.messageHandlers.preShowScriptError.postMessage(JSON.stringify(err, Object.getOwnPropertyNames(err)));
-                                }
-                        )
-                        """
+        // Safely construct script template with proper escaping
+        let userScript = self.preShowScript ?? ""
+        
+        // Build script using safe concatenation to avoid multi-line string issues
+        let scriptTemplate = [
+            "async function preShowFunction() {",
+            userScript,
+            "}",
+            "preShowFunction().then(",
+            "    () => window.webkit.messageHandlers.preShowScriptSuccess.postMessage({})",
+            ").catch(",
+            "    err => {",
+            "        console.error('Preshow error', err);",
+            "        window.webkit.messageHandlers.preShowScriptError.postMessage(JSON.stringify(err, Object.getOwnPropertyNames(err)));",
+            "    }",
+            ")"
+        ]
+        
+        let script = scriptTemplate.joined(separator: "\n")
         print("[InAppBrowser - InjectPreShowScript] PreShowScript script: \(script)")
 
         self.preShowSemaphore = DispatchSemaphore(value: 0)

package/package.json

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