@capacitor/android 4.6.4-nightly-20230221T150532.0 → 4.7.0

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.7.0](https://github.com/ionic-team/capacitor/compare/4.6.3...4.7.0) (2023-02-22)
+
+
+### Bug Fixes
+
+* handle fetch headers that are Headers objects ([#6320](https://github.com/ionic-team/capacitor/issues/6320)) ([cb00e49](https://github.com/ionic-team/capacitor/commit/cb00e4952acca8e877555f30b2190f6685d25934))
+* **ios:** Correctly Attach Headers to Request ([#6303](https://github.com/ionic-team/capacitor/issues/6303)) ([a3f875c](https://github.com/ionic-team/capacitor/commit/a3f875cf42e111fde07d6e87643264b19ed77573))
+
+
+### Features
+
+* **android:** add ability to create config from a custom file path ([#6264](https://github.com/ionic-team/capacitor/issues/6264)) ([42b4f0f](https://github.com/ionic-team/capacitor/commit/42b4f0f416c8038ae368860007910bb09c8ec84e))
+* **android:** Add SSL Pinning logic ([#6314](https://github.com/ionic-team/capacitor/issues/6314)) ([07f113e](https://github.com/ionic-team/capacitor/commit/07f113e6933e15c45d772f69f7128cbb3706f7b9))
+* **android:** enable loading of assets outside of the content web asset directory ([#6301](https://github.com/ionic-team/capacitor/issues/6301)) ([364497d](https://github.com/ionic-team/capacitor/commit/364497d4aca93fc716a0673ef9103479aed791ec))
+
+
+
+
+
 ## [4.6.3](https://github.com/ionic-team/capacitor/compare/4.6.2...4.6.3) (2023-02-03)
 
 

package/capacitor/src/main/assets/native-bridge.js

@@ -374,13 +374,15 @@ var nativeBridge = (function (exports) {
                         console.time(tag);
                         try {
                             // intercept request & pass to the bridge
+                            let headers = options === null || options === void 0 ? void 0 : options.headers;
+                            if ((options === null || options === void 0 ? void 0 : options.headers) instanceof Headers) {
+                                headers = Object.fromEntries(options.headers.entries());
+                            }
                             const nativeResponse = await cap.nativePromise('CapacitorHttp', 'request', {
                                 url: resource,
                                 method: (options === null || options === void 0 ? void 0 : options.method) ? options.method : undefined,
                                 data: (options === null || options === void 0 ? void 0 : options.body) ? options.body : undefined,
-                                headers: (options === null || options === void 0 ? void 0 : options.headers)
-                                    ? JSON.stringify(options.headers)
-                                    : undefined,
+                                headers: headers,
                             });
                             const data = typeof nativeResponse.data === 'string'
                                 ? nativeResponse.data
@@ -508,7 +510,9 @@ var nativeBridge = (function (exports) {
                                 url: this._url,
                                 method: this._method,
                                 data: body !== null ? body : undefined,
-                                headers: JSON.stringify(this._headers),
+                                headers: this._headers != null && Object.keys(this._headers).length > 0
+                                    ? this._headers
+                                    : undefined,
                             })
                                 .then((nativeResponse) => {
                                 // intercept & parse response before returning

package/capacitor/src/main/java/com/getcapacitor/ProcessedRoute.java

@@ -9,6 +9,7 @@ public class ProcessedRoute {
 
     private String path;
     private boolean isAsset;
+    private boolean ignoreAssetPath;
 
     public String getPath() {
         return path;
@@ -25,4 +26,12 @@ public class ProcessedRoute {
     public void setAsset(boolean asset) {
         isAsset = asset;
     }
+
+    public boolean isIgnoreAssetPath() {
+        return ignoreAssetPath;
+    }
+
+    public void setIgnoreAssetPath(boolean ignoreAssetPath) {
+        this.ignoreAssetPath = ignoreAssetPath;
+    }
 }

package/capacitor/src/main/java/com/getcapacitor/WebViewLocalServer.java

@@ -484,10 +484,12 @@ public class WebViewLocalServer {
 
                 // Pass path to routeProcessor if present
                 RouteProcessor routeProcessor = bridge.getRouteProcessor();
+                boolean ignoreAssetPath = false;
                 if (routeProcessor != null) {
                     ProcessedRoute processedRoute = bridge.getRouteProcessor().process("", path);
                     path = processedRoute.getPath();
                     isAsset = processedRoute.isAsset();
+                    ignoreAssetPath = processedRoute.isIgnoreAssetPath();
                 }
 
                 try {
@@ -501,6 +503,8 @@ public class WebViewLocalServer {
                         }
 
                         stream = protocolHandler.openFile(path);
+                    } else if (ignoreAssetPath) {
+                        stream = protocolHandler.openAsset(path);
                     } else {
                         stream = protocolHandler.openAsset(assetPath + path);
                     }

package/capacitor/src/main/java/com/getcapacitor/plugin/CapacitorHttp.java

@@ -31,6 +31,7 @@ public class CapacitorHttp extends Plugin {
             @Override
             public void run() {
                 try {
+                    HttpRequestHandler.bridge = bridge;
                     JSObject response = HttpRequestHandler.request(call, httpMethod);
                     call.resolve(response);
                 } catch (Exception e) {

package/capacitor/src/main/java/com/getcapacitor/plugin/util/CapacitorHttpUrlConnection.java

@@ -3,6 +3,7 @@ package com.getcapacitor.plugin.util;
 import android.os.Build;
 import android.os.LocaleList;
 import android.text.TextUtils;
+import com.getcapacitor.Bridge;
 import com.getcapacitor.JSArray;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.JSValue;
@@ -10,6 +11,7 @@ import com.getcapacitor.PluginCall;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.Method;
 import java.net.HttpURLConnection;
 import java.net.ProtocolException;
 import java.net.SocketTimeoutException;
@@ -21,6 +23,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLSocketFactory;
 import org.json.JSONException;
 
 public class CapacitorHttpUrlConnection implements ICapacitorHttpUrlConnection {
@@ -363,4 +367,16 @@ public class CapacitorHttpUrlConnection implements ICapacitorHttpUrlConnection {
         }
         return result;
     }
+
+    public void setSSLSocketFactory(Bridge bridge) {
+        // Attach SSL Certificates if Enterprise Plugin is available
+        try {
+            Class<?> sslPinningImpl = Class.forName("io.ionic.sslpinning.SSLPinning");
+            Method method = sslPinningImpl.getDeclaredMethod("getSSLSocketFactory", Bridge.class);
+            SSLSocketFactory sslSocketFactory = (SSLSocketFactory) method.invoke(sslPinningImpl.newInstance(), bridge);
+            if (sslSocketFactory != null) {
+                ((HttpsURLConnection) this.connection).setSSLSocketFactory(sslSocketFactory);
+            }
+        } catch (Exception ignored) {}
+    }
 }

package/capacitor/src/main/java/com/getcapacitor/plugin/util/HttpRequestHandler.java

@@ -2,6 +2,7 @@ package com.getcapacitor.plugin.util;
 
 import android.text.TextUtils;
 import android.util.Base64;
+import com.getcapacitor.Bridge;
 import com.getcapacitor.JSArray;
 import com.getcapacitor.JSObject;
 import com.getcapacitor.JSValue;
@@ -26,6 +27,8 @@ import org.json.JSONObject;
 
 public class HttpRequestHandler {
 
+    public static Bridge bridge = null;
+
     /**
      * An enum specifying conventional HTTP Response Types
      * See https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest/responseType
@@ -45,7 +48,7 @@ public class HttpRequestHandler {
 
         static final ResponseType DEFAULT = TEXT;
 
-        static ResponseType parse(String value) {
+        public static ResponseType parse(String value) {
             for (ResponseType responseType : values()) {
                 if (responseType.name.equalsIgnoreCase(value)) {
                     return responseType;
@@ -58,16 +61,16 @@ public class HttpRequestHandler {
     /**
      * Internal builder class for building a CapacitorHttpUrlConnection
      */
-    private static class HttpURLConnectionBuilder {
+    public static class HttpURLConnectionBuilder {
 
-        private Integer connectTimeout;
-        private Integer readTimeout;
-        private Boolean disableRedirects;
-        private JSObject headers;
-        private String method;
-        private URL url;
+        public Integer connectTimeout;
+        public Integer readTimeout;
+        public Boolean disableRedirects;
+        public JSObject headers;
+        public String method;
+        public URL url;
 
-        private CapacitorHttpUrlConnection connection;
+        public CapacitorHttpUrlConnection connection;
 
         public HttpURLConnectionBuilder setConnectTimeout(Integer connectTimeout) {
             this.connectTimeout = connectTimeout;
@@ -188,7 +191,7 @@ public class HttpRequestHandler {
      * @throws IOException Thrown if the InputStream is unable to be parsed correctly
      * @throws JSONException Thrown if the JSON is unable to be parsed
      */
-    private static JSObject buildResponse(CapacitorHttpUrlConnection connection) throws IOException, JSONException {
+    public static JSObject buildResponse(CapacitorHttpUrlConnection connection) throws IOException, JSONException {
         return buildResponse(connection, ResponseType.DEFAULT);
     }
 
@@ -200,7 +203,7 @@ public class HttpRequestHandler {
      * @throws IOException Thrown if the InputStream is unable to be parsed correctly
      * @throws JSONException Thrown if the JSON is unable to be parsed
      */
-    private static JSObject buildResponse(CapacitorHttpUrlConnection connection, ResponseType responseType)
+    public static JSObject buildResponse(CapacitorHttpUrlConnection connection, ResponseType responseType)
         throws IOException, JSONException {
         int statusCode = connection.getResponseCode();
 
@@ -226,7 +229,7 @@ public class HttpRequestHandler {
      * @throws IOException Thrown if the InputStreams cannot be properly parsed
      * @throws JSONException Thrown if the JSON is malformed when parsing as JSON
      */
-    static Object readData(ICapacitorHttpUrlConnection connection, ResponseType responseType) throws IOException, JSONException {
+    public static Object readData(ICapacitorHttpUrlConnection connection, ResponseType responseType) throws IOException, JSONException {
         InputStream errorStream = connection.getErrorStream();
         String contentType = connection.getHeaderField("Content-Type");
 
@@ -261,7 +264,7 @@ public class HttpRequestHandler {
      * @param mimeTypes The Mime-Type values to check against
      * @return
      */
-    private static boolean isOneOf(String contentType, MimeType... mimeTypes) {
+    public static boolean isOneOf(String contentType, MimeType... mimeTypes) {
         if (contentType != null) {
             for (MimeType mimeType : mimeTypes) {
                 if (contentType.contains(mimeType.getValue())) {
@@ -277,7 +280,7 @@ public class HttpRequestHandler {
      * @param connection The CapacitorHttpUrlConnection connection
      * @return A JSObject of the header values from the CapacitorHttpUrlConnection
      */
-    private static JSObject buildResponseHeaders(CapacitorHttpUrlConnection connection) {
+    public static JSObject buildResponseHeaders(CapacitorHttpUrlConnection connection) {
         JSObject output = new JSObject();
 
         for (Map.Entry<String, List<String>> entry : connection.getHeaderFields().entrySet()) {
@@ -294,7 +297,7 @@ public class HttpRequestHandler {
      * @return A JSObject or JSArray
      * @throws JSONException thrown if the JSON is malformed
      */
-    private static Object parseJSON(String input) throws JSONException {
+    public static Object parseJSON(String input) throws JSONException {
         JSONObject json = new JSONObject();
         try {
             if ("null".equals(input.trim())) {
@@ -323,7 +326,7 @@ public class HttpRequestHandler {
      * @return String value of InputStream
      * @throws IOException thrown if the InputStream is unable to be read as base64
      */
-    private static String readStreamAsBase64(InputStream in) throws IOException {
+    public static String readStreamAsBase64(InputStream in) throws IOException {
         try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
             byte[] buffer = new byte[1024];
             int readBytes;
@@ -341,7 +344,7 @@ public class HttpRequestHandler {
      * @return String value of InputStream
      * @throws IOException thrown if the InputStream is unable to be read
      */
-    private static String readStreamAsString(InputStream in) throws IOException {
+    public static String readStreamAsString(InputStream in) throws IOException {
         try (BufferedReader reader = new BufferedReader(new InputStreamReader(in))) {
             StringBuilder builder = new StringBuilder();
             String line = reader.readLine();
@@ -391,6 +394,10 @@ public class HttpRequestHandler {
 
         CapacitorHttpUrlConnection connection = connectionBuilder.build();
 
+        if (null != bridge) {
+            connection.setSSLSocketFactory(bridge);
+        }
+
         // Set HTTP body on a non GET or HEAD request
         if (isHttpMutate) {
             JSValue data = new JSValue(call, "data");

package/capacitor/src/main/java/com/getcapacitor/plugin/util/ICapacitorHttpUrlConnection.java

@@ -6,7 +6,7 @@ import java.io.InputStream;
 /**
  * This interface was extracted from {@link CapacitorHttpUrlConnection} to enable mocking that class.
  */
-interface ICapacitorHttpUrlConnection {
+public interface ICapacitorHttpUrlConnection {
     InputStream getErrorStream();
 
     String getHeaderField(String name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/android",
-  "version": "4.6.4-nightly-20230221T150532.0",
+  "version": "4.7.0",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -28,5 +28,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8869d79d010f61115feb02decd05fee58d8b74e6"
+  "gitHead": "89cddcd6497034146e0938ce8c264e22e7baba52"
 }