@capacitor/android 4.5.0 → 4.5.1-dev-20221117T024619.0

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

@@ -311,25 +311,24 @@ const nativeBridge = (function (exports) {
                         },
                         set: function (val) {
                             const cookiePairs = val.split(';');
-                            for (const cookiePair of cookiePairs) {
-                                const cookieKey = cookiePair.split('=')[0];
-                                const cookieValue = cookiePair.split('=')[1];
-                                if (null == cookieValue) {
-                                    continue;
-                                }
-                                if (platform === 'ios') {
-                                    // Use prompt to synchronously set cookies.
-                                    // https://stackoverflow.com/questions/29249132/wkwebview-complex-communication-between-javascript-native-code/49474323#49474323
-                                    const payload = {
-                                        type: 'CapacitorCookies.set',
-                                        key: cookieKey,
-                                        value: cookieValue,
-                                    };
-                                    prompt(JSON.stringify(payload));
-                                }
-                                else if (typeof win.CapacitorCookiesAndroidInterface !== 'undefined') {
-                                    win.CapacitorCookiesAndroidInterface.setCookie(cookieKey, cookieValue);
-                                }
+                            const domainSection = val.toLowerCase().split('domain=')[1];
+                            const domain = cookiePairs.length > 1 &&
+                                domainSection != null &&
+                                domainSection.length > 0
+                                ? domainSection.split(';')[0].trim()
+                                : '';
+                            if (platform === 'ios') {
+                                // Use prompt to synchronously set cookies.
+                                // https://stackoverflow.com/questions/29249132/wkwebview-complex-communication-between-javascript-native-code/49474323#49474323
+                                const payload = {
+                                    type: 'CapacitorCookies.set',
+                                    action: val,
+                                    domain,
+                                };
+                                prompt(JSON.stringify(payload));
+                            }
+                            else if (typeof win.CapacitorCookiesAndroidInterface !== 'undefined') {
+                                win.CapacitorCookiesAndroidInterface.setCookie(domain, val);
                             }
                         },
                     });
@@ -426,7 +425,8 @@ const nativeBridge = (function (exports) {
                     };
                     // XHR patch abort
                     window.XMLHttpRequest.prototype.abort = function () {
-                        if (this._url == null || !(this._url.startsWith('http:') || this._url.startsWith('https:'))) {
+                        if (this._url == null ||
+                            !(this._url.startsWith('http:') || this._url.startsWith('https:'))) {
                             return win.CapacitorWebXMLHttpRequest.abort.call(this);
                         }
                         this.readyState = 0;
@@ -480,14 +480,16 @@ const nativeBridge = (function (exports) {
                     };
                     // XHR patch set request header
                     window.XMLHttpRequest.prototype.setRequestHeader = function (header, value) {
-                        if (this._url == null || !(this._url.startsWith('http:') || this._url.startsWith('https:'))) {
+                        if (this._url == null ||
+                            !(this._url.startsWith('http:') || this._url.startsWith('https:'))) {
                             return win.CapacitorWebXMLHttpRequest.setRequestHeader.call(this, header, value);
                         }
                         this._headers[header] = value;
                     };
                     // XHR patch send
                     window.XMLHttpRequest.prototype.send = function (body) {
-                        if (this._url == null || !(this._url.startsWith('http:') || this._url.startsWith('https:'))) {
+                        if (this._url == null ||
+                            !(this._url.startsWith('http:') || this._url.startsWith('https:'))) {
                             return win.CapacitorWebXMLHttpRequest.send.call(this, body);
                         }
                         try {
@@ -543,7 +545,8 @@ const nativeBridge = (function (exports) {
                     };
                     // XHR patch getAllResponseHeaders
                     window.XMLHttpRequest.prototype.getAllResponseHeaders = function () {
-                        if (this._url == null || !(this._url.startsWith('http:') || this._url.startsWith('https:'))) {
+                        if (this._url == null ||
+                            !(this._url.startsWith('http:') || this._url.startsWith('https:'))) {
                             return win.CapacitorWebXMLHttpRequest.getAllResponseHeaders.call(this);
                         }
                         let returnString = '';
@@ -556,7 +559,8 @@ const nativeBridge = (function (exports) {
                     };
                     // XHR patch getResponseHeader
                     window.XMLHttpRequest.prototype.getResponseHeader = function (name) {
-                        if (this._url == null || !(this._url.startsWith('http:') || this._url.startsWith('https:'))) {
+                        if (this._url == null ||
+                            !(this._url.startsWith('http:') || this._url.startsWith('https:'))) {
                             return win.CapacitorWebXMLHttpRequest.getResponseHeader.call(this, name);
                         }
                         return this._headers[name];

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

@@ -1,5 +1,6 @@
 package com.getcapacitor.plugin;
 
+import com.getcapacitor.Bridge;
 import java.net.CookieManager;
 import java.net.CookiePolicy;
 import java.net.CookieStore;
@@ -9,18 +10,20 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 
 public class CapacitorCookieManager extends CookieManager {
 
     private final android.webkit.CookieManager webkitCookieManager;
+    private final Bridge bridge;
 
     /**
      * Create a new cookie manager with the default cookie store and policy
      */
-    public CapacitorCookieManager() {
-        this(null, null);
+    public CapacitorCookieManager(Bridge bridge) {
+        this(null, null, bridge);
     }
 
     /**
@@ -30,9 +33,29 @@ public class CapacitorCookieManager extends CookieManager {
      * @param policy a {@code CookiePolicy} instance to be used by cookie manager as policy
      *               callback. if {@code null}, ACCEPT_ORIGINAL_SERVER will be used.
      */
-    public CapacitorCookieManager(CookieStore store, CookiePolicy policy) {
+    public CapacitorCookieManager(CookieStore store, CookiePolicy policy, Bridge bridge) {
         super(store, policy);
         webkitCookieManager = android.webkit.CookieManager.getInstance();
+        this.bridge = bridge;
+    }
+
+    public String getSanitizedDomain(String url) {
+        if (url == null || url.isEmpty()) {
+            url = this.bridge.getLocalUrl();
+        }
+
+        try {
+            new URI(url);
+        } catch (Exception ex) {
+            return this.bridge.getServerUrl();
+        }
+
+        return url;
+    }
+
+    private String getDomainFromCookieString(String cookie) {
+        String[] domain = cookie.toLowerCase(Locale.ROOT).split("domain=");
+        return getSanitizedDomain(domain.length <= 1 ? null : domain[1].split(";")[0].trim());
     }
 
     /**
@@ -109,6 +132,11 @@ public class CapacitorCookieManager extends CookieManager {
         setCookie(url, cookieValue);
     }
 
+    public void setCookie(String url, String key, String value, String expires, String path) {
+        String cookieValue = key + "=" + value + "; expires=" + expires + "; path=" + path;
+        setCookie(url, cookieValue);
+    }
+
     /**
      * Removes all cookies. This method is asynchronous.
      */
@@ -130,9 +158,6 @@ public class CapacitorCookieManager extends CookieManager {
         // make sure our args are valid
         if ((uri == null) || (responseHeaders == null)) return;
 
-        // save our url once
-        String url = uri.toString();
-
         // go over the headers
         for (String headerKey : responseHeaders.keySet()) {
             // ignore headers which aren't cookie related
@@ -140,7 +165,11 @@ public class CapacitorCookieManager extends CookieManager {
 
             // process each of the headers
             for (String headerValue : Objects.requireNonNull(responseHeaders.get(headerKey))) {
-                setCookie(url, headerValue);
+                // Set at server url
+                setCookie(uri.toString(), headerValue);
+
+                // Set at local url or domain
+                setCookie(getDomainFromCookieString(headerValue), headerValue);
             }
         }
     }

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

@@ -20,7 +20,7 @@ public class CapacitorCookies extends Plugin {
     @Override
     public void load() {
         this.bridge.getWebView().addJavascriptInterface(this, "CapacitorCookiesAndroidInterface");
-        this.cookieManager = new CapacitorCookieManager(null, java.net.CookiePolicy.ACCEPT_ALL);
+        this.cookieManager = new CapacitorCookieManager(null, java.net.CookiePolicy.ACCEPT_ALL, this.bridge);
         CookieHandler.setDefault(cookieManager);
         super.load();
     }
@@ -74,7 +74,8 @@ public class CapacitorCookies extends Plugin {
         try {
             String url = getServerUrl(null);
             if (!url.isEmpty()) {
-                return cookieManager.getCookieString(url);
+                String cookieString = cookieManager.getCookieString(url);
+                return (null == cookieString) ? "" : cookieString;
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -84,11 +85,11 @@ public class CapacitorCookies extends Plugin {
     }
 
     @JavascriptInterface
-    public void setCookie(String key, String value) {
-        String url = getServerUrl(null);
+    public void setCookie(String domain, String action) {
+        String url = cookieManager.getSanitizedDomain(domain);
 
         if (!url.isEmpty()) {
-            cookieManager.setCookie(url, key, value);
+            cookieManager.setCookie(url, action);
         }
     }
 
@@ -110,9 +111,11 @@ public class CapacitorCookies extends Plugin {
         String key = call.getString("key");
         String value = call.getString("value");
         String url = getServerUrl(call);
+        String expires = call.getString("expires", "");
+        String path = call.getString("path", "/");
 
         if (!url.isEmpty()) {
-            cookieManager.setCookie(url, key, value);
+            cookieManager.setCookie(url, key, value, expires, path);
             call.resolve();
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/android",
-  "version": "4.5.0",
+  "version": "4.5.1-dev-20221117T024619.0",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -23,10 +23,10 @@
     "verify": "./gradlew clean lint build test -b capacitor/build.gradle"
   },
   "peerDependencies": {
-    "@capacitor/core": "^4.4.0"
+    "@capacitor/core": "^4.5.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c54a71f5a01e5228c648a1e9194849198a39cee6"
+  "gitHead": "6c509ade89ed4e09169bfd3d3a79fac2b9fe0c4d"
 }