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

package/Capacitor/Capacitor/CAPBridgeViewController.swift

@@ -105,6 +105,7 @@ import Cordova
      */
     open func webViewConfiguration(for instanceConfiguration: InstanceConfiguration) -> WKWebViewConfiguration {
         let webViewConfiguration = WKWebViewConfiguration()
+        webViewConfiguration.websiteDataStore.httpCookieStore.add(CapacitorWKCookieObserver())
         webViewConfiguration.allowsInlineMediaPlayback = true
         webViewConfiguration.suppressesIncrementalRendering = false
         webViewConfiguration.allowsAirPlayForMediaPlayback = true

package/Capacitor/Capacitor/CAPWebView.swift

@@ -125,6 +125,7 @@ extension CAPWebView {
 
     public func webViewConfiguration(for instanceConfiguration: InstanceConfiguration) -> WKWebViewConfiguration {
         let webViewConfiguration = WKWebViewConfiguration()
+        webViewConfiguration.websiteDataStore.httpCookieStore.add(CapacitorWKCookieObserver())
         webViewConfiguration.allowsInlineMediaPlayback = true
         webViewConfiguration.suppressesIncrementalRendering = false
         webViewConfiguration.allowsAirPlayForMediaPlayback = true

package/Capacitor/Capacitor/Plugins/CapacitorCookieManager.swift

@@ -1,5 +1,18 @@
 import Foundation
 
+public class CapacitorWKCookieObserver: NSObject, WKHTTPCookieStoreObserver {
+    // Sync WKWebView Cookies to HTTPCookieStorage
+    public func cookiesDidChange(in cookieStore: WKHTTPCookieStore) {
+        DispatchQueue.main.async {
+            cookieStore.getAllCookies { cookies in
+                cookies.forEach { cookie in
+                    HTTPCookieStorage.shared.setCookie(cookie)
+                }
+            }
+        }
+    }
+}
+
 public class CapacitorCookieManager {
     var config: InstanceConfiguration?
 
@@ -11,12 +24,22 @@ public class CapacitorCookieManager {
         return self.config?.serverURL
     }
 
-    public func getServerUrl(_ call: CAPPluginCall) -> URL? {
-        guard let urlString = call.getString("url") else {
+    private func isUrlSanitized(_ urlString: String) -> Bool {
+        return urlString.isEmpty || urlString == getServerUrl()?.absoluteString || urlString.hasPrefix("http://") || urlString.hasPrefix("https://")
+    }
+
+    public func getServerUrl(_ urlString: String?) -> URL? {
+        guard let urlString = urlString else {
             return getServerUrl()
         }
 
-        guard let url = URL(string: urlString) else {
+        if urlString.isEmpty {
+            return getServerUrl()
+        }
+
+        let validUrlString = (isUrlSanitized(urlString)) ? urlString : "http://\(urlString)"
+
+        guard let url = URL(string: validUrlString) else {
             return getServerUrl()
         }
 
@@ -31,22 +54,25 @@ public class CapacitorCookieManager {
         return value.removingPercentEncoding!
     }
 
-    public func setCookie(_ key: String, _ value: String) {
-        let url = getServerUrl()!
+    public func setCookie(_ domain: String, _ action: String) {
+        let url = getServerUrl(domain)!
         let jar = HTTPCookieStorage.shared
-        let field = ["Set-Cookie": "\(key)=\(value)"]
+        let field = ["Set-Cookie": action]
         let cookies = HTTPCookie.cookies(withResponseHeaderFields: field, for: url)
-        jar.setCookies(cookies, for: url, mainDocumentURL: url)
+        jar.setCookies(cookies, for: url, mainDocumentURL: nil)
+        syncCookiesToWebView()
     }
 
-    public func setCookie(_ url: URL, _ key: String, _ value: String) {
+    public func setCookie(_ url: URL, _ key: String, _ value: String, _ expires: String?, _ path: String?) {
         let jar = HTTPCookieStorage.shared
-        let field = ["Set-Cookie": "\(key)=\(value)"]
+        let field = ["Set-Cookie": "\(key)=\(value); expires=\(expires ?? ""); path=\(path ?? "/")"]
         let cookies = HTTPCookie.cookies(withResponseHeaderFields: field, for: url)
-        jar.setCookies(cookies, for: url, mainDocumentURL: url)
+        jar.setCookies(cookies, for: url, mainDocumentURL: nil)
+        syncCookiesToWebView()
     }
 
     public func getCookiesAsMap(_ url: URL) -> [String: String] {
+        syncCookiesToWebView()
         var cookiesMap: [String: String] = [:]
         let jar = HTTPCookieStorage.shared
         if let cookies = jar.cookies(for: url) {
@@ -58,6 +84,7 @@ public class CapacitorCookieManager {
     }
 
     public func getCookies() -> String {
+        syncCookiesToWebView()
         let jar = HTTPCookieStorage.shared
         guard let url = self.getServerUrl() else { return "" }
         guard let cookies = jar.cookies(for: url) else { return "" }
@@ -66,20 +93,46 @@ public class CapacitorCookieManager {
 
     public func deleteCookie(_ url: URL, _ key: String) {
         let jar = HTTPCookieStorage.shared
-        let cookie = jar.cookies(for: url)?.first(where: { (cookie) -> Bool in
+        if let cookie = jar.cookies(for: url)?.first(where: { (cookie) -> Bool in
             return cookie.name == key
-        })
-
-        if cookie != nil { jar.deleteCookie(cookie!) }
+        }) {
+            jar.deleteCookie(cookie)
+            DispatchQueue.main.async {
+                WKWebsiteDataStore.default().httpCookieStore.delete(cookie)
+            }
+        }
     }
 
     public func clearCookies(_ url: URL) {
         let jar = HTTPCookieStorage.shared
-        jar.cookies(for: url)?.forEach({ (cookie) in jar.deleteCookie(cookie) })
+        jar.cookies(for: url)?.forEach({ (cookie) in
+            jar.deleteCookie(cookie)
+            DispatchQueue.main.async {
+                WKWebsiteDataStore.default().httpCookieStore.delete(cookie)
+            }
+        })
     }
 
     public func clearAllCookies() {
         let jar = HTTPCookieStorage.shared
-        jar.cookies?.forEach({ (cookie) in jar.deleteCookie(cookie) })
+        jar.cookies?.forEach({ (cookie) in
+            jar.deleteCookie(cookie)
+            DispatchQueue.main.async {
+                WKWebsiteDataStore.default().httpCookieStore.delete(cookie)
+            }
+        })
+    }
+
+    public func syncCookiesToWebView() {
+        if let cookies = HTTPCookieStorage.shared.cookies {
+            for cookie in cookies {
+                DispatchQueue.main.async {
+                    WKWebsiteDataStore.default()
+                        .httpCookieStore
+                        .setCookie(cookie, completionHandler: nil)
+                }
+
+            }
+        }
     }
 }

package/Capacitor/Capacitor/Plugins/CapacitorCookies.swift

@@ -9,7 +9,7 @@ public class CAPCookiesPlugin: CAPPlugin {
     }
 
     @objc func getCookies(_ call: CAPPluginCall) {
-        guard let url = cookieManager!.getServerUrl(call) else { return call.reject("Invalid URL / Server URL")}
+        guard let url = cookieManager!.getServerUrl(call.getString("url")) else { return call.reject("Invalid URL / Server URL")}
         call.resolve(cookieManager!.getCookiesAsMap(url))
     }
 
@@ -17,22 +17,23 @@ public class CAPCookiesPlugin: CAPPlugin {
         guard let key = call.getString("key") else { return call.reject("Must provide key") }
         guard let value = call.getString("value") else { return call.reject("Must provide value") }
 
-        let url = cookieManager!.getServerUrl(call)
-        if url != nil {
-            cookieManager!.setCookie(url!, key, cookieManager!.encode(value))
-            call.resolve()
-        }
+        guard let url = cookieManager!.getServerUrl(call.getString("url")) else { return call.reject("Invalid domain") }
+
+        let expires = call.getString("expires", "")
+        let path = call.getString("path", "")
+        cookieManager!.setCookie(url, key, cookieManager!.encode(value), expires, path)
+        call.resolve()
     }
 
     @objc func deleteCookie(_ call: CAPPluginCall) {
         guard let key = call.getString("key") else { return call.reject("Must provide key") }
-        guard let url = cookieManager!.getServerUrl(call) else { return call.reject("Invalid URL / Server URL")}
+        guard let url = cookieManager!.getServerUrl(call.getString("url")) else { return call.reject("Invalid URL / Server URL")}
         cookieManager!.deleteCookie(url, key)
         call.resolve()
     }
 
     @objc func clearCookies(_ call: CAPPluginCall) {
-        let url = cookieManager!.getServerUrl(call)
+        let url = cookieManager!.getServerUrl(call.getString("url"))
         if url != nil {
             cookieManager!.clearCookies(url!)
             call.resolve()

package/Capacitor/Capacitor/Plugins/CapacitorHttp.swift

@@ -8,7 +8,7 @@ public class CAPHttpPlugin: CAPPlugin {
         guard var _ = URL(string: url) else { return call.reject("Invalid URL"); }
 
         do {
-            try HttpRequestHandler.request(call, httpMethod)
+            try HttpRequestHandler.request(call, httpMethod, self.bridge?.config)
         } catch let error {
             call.reject(error.localizedDescription)
         }

package/Capacitor/Capacitor/Plugins/HttpRequestHandler.swift

@@ -97,6 +97,24 @@ class HttpRequestHandler {
         }
     }
 
+    private static func setCookiesFromResponse(_ response: HTTPURLResponse, _ config: InstanceConfiguration?) {
+        let headers = response.allHeaderFields
+        if let cookies = headers["Set-Cookie"] as? String {
+            for cookie in cookies.components(separatedBy: ",") {
+                let domainComponents = cookie.lowercased().components(separatedBy: "domain=")
+                if domainComponents.count > 1 {
+                    CapacitorCookieManager(config).setCookie(
+                        domainComponents[1].components(separatedBy: ";")[0],
+                        cookie
+                    )
+                } else {
+                    CapacitorCookieManager(config).setCookie("", cookie)
+                }
+            }
+        }
+        CapacitorCookieManager(config).syncCookiesToWebView()
+    }
+
     private static func buildResponse(_ data: Data?, _ response: HTTPURLResponse, responseType: ResponseType = .default) -> [String: Any] {
         var output = [:] as [String: Any]
 
@@ -122,7 +140,7 @@ class HttpRequestHandler {
         return output
     }
 
-    public static func request(_ call: CAPPluginCall, _ httpMethod: String?) throws {
+    public static func request(_ call: CAPPluginCall, _ httpMethod: String?, _ config: InstanceConfiguration?) throws {
         guard let urlString = call.getString("url") else { throw URLError(.badURL) }
         let method = httpMethod ?? call.getString("method", "GET")
 
@@ -161,10 +179,13 @@ class HttpRequestHandler {
         let urlSession = request.getUrlSession(call)
         let task = urlSession.dataTask(with: urlRequest) { (data, response, error) in
             urlSession.invalidateAndCancel()
+
             if error != nil {
                 return
             }
 
+            setCookiesFromResponse(response as! HTTPURLResponse, config)
+
             let type = ResponseType(rawValue: responseType) ?? .default
             call.resolve(self.buildResponse(data, response as! HTTPURLResponse, responseType: type))
         }

package/Capacitor/Capacitor/WebViewDelegationHandler.swift

@@ -256,9 +256,9 @@ internal class WebViewDelegationHandler: NSObject, WKNavigationDelegate, WKUIDel
                         return
                     } else if type == "CapacitorCookies.set" {
                         // swiftlint:disable force_cast
-                        let key = payload["key"] as! String
-                        let value = payload["value"] as! String
-                        CapacitorCookieManager(bridge!.config).setCookie(key, value)
+                        let action = payload["action"] as! String
+                        let domain = payload["domain"] as! String
+                        CapacitorCookieManager(bridge!.config).setCookie(domain, action)
                         completionHandler("")
                         // swiftlint:enable force_cast
                         // Don't present prompt

package/Capacitor/Capacitor/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/ios",
-  "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)",
@@ -25,10 +25,10 @@
     "xc:build:CapacitorCordova": "cd CapacitorCordova && xcodebuild && cd .."
   },
   "peerDependencies": {
-    "@capacitor/core": "^4.4.0"
+    "@capacitor/core": "^4.5.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c54a71f5a01e5228c648a1e9194849198a39cee6"
+  "gitHead": "6c509ade89ed4e09169bfd3d3a79fac2b9fe0c4d"
 }