@capacitor/ios 4.4.0 → 4.4.1-dev-20221114T215445.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/CAPInstanceDescriptor.swift

@@ -131,6 +131,9 @@ internal extension InstanceDescriptor {
             if let preferredMode = (config[keyPath: "ios.preferredContentMode"] as? String) {
                 preferredContentMode = preferredMode
             }
+            if let handleNotifications = config[keyPath: "ios.handleApplicationNotifications"] as? Bool {
+                handleApplicationNotifications = handleNotifications
+            }
         }
     }
     // swiftlint:enable cyclomatic_complexity

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,18 @@ public class CapacitorCookieManager {
         return self.config?.serverURL
     }
 
+    private func isUrlSanitized(_ urlString: String) -> Bool {
+        return urlString.isEmpty || urlString == getServerUrl()?.absoluteString || urlString.hasPrefix("http://") || urlString.hasPrefix("https://")
+    }
+
     public func getServerUrl(_ call: CAPPluginCall) -> URL? {
         guard let urlString = call.getString("url") else {
             return getServerUrl()
         }
 
-        guard let url = URL(string: urlString) else {
+        let validUrlString = (isUrlSanitized(urlString)) ? urlString : "http://\(urlString)"
+
+        guard let url = URL(string: validUrlString) else {
             return getServerUrl()
         }
 
@@ -31,22 +50,37 @@ public class CapacitorCookieManager {
         return value.removingPercentEncoding!
     }
 
-    public func setCookie(_ key: String, _ value: String) {
+    public func setCookie(_ action: String) {
         let url = getServerUrl()!
         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) {
+            for cookie in cookies {
+                cookiesMap[cookie.name] = cookie.value
+            }
+        }
+        return cookiesMap
     }
 
     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 "" }
@@ -55,20 +89,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

@@ -8,33 +8,28 @@ public class CAPCookiesPlugin: CAPPlugin {
         cookieManager = CapacitorCookieManager(bridge?.config)
     }
 
+    @objc func getCookies(_ call: CAPPluginCall) {
+        guard let url = cookieManager!.getServerUrl(call) else { return call.reject("Invalid URL / Server URL")}
+        call.resolve(cookieManager!.getCookiesAsMap(url))
+    }
+
     @objc func setCookie(_ call: CAPPluginCall) {
         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) 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") }
-        let url = cookieManager!.getServerUrl(call)
-        if url != nil {
-            let jar = HTTPCookieStorage.shared
-
-            let cookie = jar.cookies(for: url!)?.first(where: { (cookie) -> Bool in
-                return cookie.name == key
-            })
-
-            if cookie != nil {
-                jar.deleteCookie(cookie!)
-            }
-
-            call.resolve()
-        }
+        guard let url = cookieManager!.getServerUrl(call) else { return call.reject("Invalid URL / Server URL")}
+        cookieManager!.deleteCookie(url, key)
+        call.resolve()
     }
 
     @objc func clearCookies(_ call: CAPPluginCall) {

package/Capacitor/Capacitor/Plugins/DefaultPlugins.m

@@ -3,6 +3,7 @@
 #import "CAPBridgedPlugin.h"
 
 CAP_PLUGIN(CAPCookiesPlugin, "CapacitorCookies",
+  CAP_PLUGIN_METHOD(getCookies, CAPPluginReturnPromise);
   CAP_PLUGIN_METHOD(setCookie, CAPPluginReturnPromise);
   CAP_PLUGIN_METHOD(deleteCookie, CAPPluginReturnPromise);
   CAP_PLUGIN_METHOD(clearCookies, CAPPluginReturnPromise);

package/Capacitor/Capacitor/Plugins/HttpRequestHandler.swift

@@ -161,6 +161,7 @@ class HttpRequestHandler {
         let urlSession = request.getUrlSession(call)
         let task = urlSession.dataTask(with: urlRequest) { (data, response, error) in
             urlSession.invalidateAndCancel()
+            CapacitorCookieManager(nil).syncCookiesToWebView()
             if error != nil {
                 return
             }

package/Capacitor/Capacitor/WebViewDelegationHandler.swift

@@ -256,9 +256,8 @@ 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
+                        CapacitorCookieManager(bridge!.config).setCookie(action)
                         completionHandler("")
                         // swiftlint:enable force_cast
                         // Don't present prompt

package/Capacitor/Capacitor/assets/native-bridge.js

@@ -310,25 +310,25 @@ 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));
+                            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
+                                };
+                                prompt(JSON.stringify(payload));
+                            }
+                            else if (typeof win.CapacitorCookiesAndroidInterface !== 'undefined') {
+                                const cookiePairs = val.split(';');
+                                const domainSection = val.toLowerCase().split('domain=')[1];
+                                // if key is not domain
+                                if (cookiePairs.length > 1 && domainSection != null && domainSection.length > 0) {
+                                    const domain = domainSection.split(';')[0].trim();
+                                    win.CapacitorCookiesAndroidInterface.setCookies(domain, val);
                                 }
-                                else if (typeof win.CapacitorCookiesAndroidInterface !== 'undefined') {
-                                    win.CapacitorCookiesAndroidInterface.setCookie(cookieKey, cookieValue);
+                                else {
+                                    win.CapacitorCookiesAndroidInterface.setCookie(val);
                                 }
                             }
                         },
@@ -426,7 +426,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 +481,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 +546,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 +560,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.podspec

@@ -1,5 +1,11 @@
-require "json"
-package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+require 'json'
+package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
+prefix = if ENV['NATIVE_PUBLISH'] == 'true'
+           'ios/'
+         else
+           ''
+         end
+
 Pod::Spec.new do |s|
   s.name = 'Capacitor'
   s.version = package['version']
@@ -7,12 +13,13 @@ Pod::Spec.new do |s|
   s.social_media_url = 'https://twitter.com/capacitorjs'
   s.license = 'MIT'
   s.homepage = 'https://capacitorjs.com/'
-  s.ios.deployment_target  = '13.0'
+  s.ios.deployment_target = '13.0'
   s.authors = { 'Ionic Team' => 'hi@ionicframework.com' }
-  s.source = { :git => 'https://github.com/ionic-team/capacitor.git', :branch => "portals-dev" }
-  s.source_files = 'Capacitor/Capacitor/*.{swift,h,m}', 'Capacitor/Capacitor/Plugins/*.{swift,h,m}', 'Capacitor/Capacitor/Plugins/**/*.{swift,h,m}'
-  s.module_map = 'Capacitor/Capacitor/Capacitor.modulemap'
-  s.resources = ['Capacitor/Capacitor/assets/native-bridge.js']
+  s.source = { git: 'https://github.com/ionic-team/capacitor.git', tag: package['version'] }
+  s.source_files = "#{prefix}Capacitor/Capacitor/*.{swift,h,m}", "#{prefix}Capacitor/Capacitor/Plugins/*.{swift,h,m}",
+                   "#{prefix}Capacitor/Capacitor/Plugins/**/*.{swift,h,m}"
+  s.module_map = "#{prefix}Capacitor/Capacitor/Capacitor.modulemap"
+  s.resources = ["#{prefix}Capacitor/Capacitor/assets/native-bridge.js"]
   s.dependency 'CapacitorCordova'
   s.swift_version = '5.1'
 end

package/CapacitorCordova.podspec

@@ -1,18 +1,25 @@
-require "json"
-package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+require 'json'
+package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
+prefix = if ENV['NATIVE_PUBLISH'] == 'true'
+           'ios/'
+         else
+           ''
+         end
+
 Pod::Spec.new do |s|
-  s.name         = "CapacitorCordova"
+  s.name         = 'CapacitorCordova'
   s.module_name  = 'Cordova'
   s.version      = package['version']
-  s.summary      = "Capacitor Cordova Compatibility Layer"
-  s.homepage     = "https://capacitorjs.com"
+  s.summary      = 'Capacitor Cordova Compatibility Layer'
+  s.homepage     = 'https://capacitorjs.com'
   s.license      = 'MIT'
   s.authors      = { 'Ionic Team' => 'hi@ionicframework.com' }
-  s.source       = { :git => 'https://github.com/ionic-team/capacitor', :tag => s.version.to_s }
+  s.source       = { git: 'https://github.com/ionic-team/capacitor', tag: s.version.to_s }
   s.platform     = :ios, 13.0
-  s.source_files = 'CapacitorCordova/CapacitorCordova/**/*.{h,m}'
-  s.public_header_files = 'CapacitorCordova/CapacitorCordova/Classes/Public/*.h', 'CapacitorCordova/CapacitorCordova/CapacitorCordova.h'
-  s.module_map = 'CapacitorCordova/CapacitorCordova/CapacitorCordova.modulemap'
+  s.source_files = "#{prefix}CapacitorCordova/CapacitorCordova/**/*.{h,m}"
+  s.public_header_files = "#{prefix}CapacitorCordova/CapacitorCordova/Classes/Public/*.h",
+                          "#{prefix}CapacitorCordova/CapacitorCordova/CapacitorCordova.h"
+  s.module_map = "#{prefix}CapacitorCordova/CapacitorCordova/CapacitorCordova.modulemap"
   s.requires_arc = true
-  s.framework    = "WebKit"
+  s.framework    = 'WebKit'
 end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/ios",
-  "version": "4.4.0",
+  "version": "4.4.1-dev-20221114T215445.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.3.0"
+    "@capacitor/core": "^4.4.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f9ec5a3059e109dbf2bd656f895243487eebeba5"
+  "gitHead": "ecbf81ebb1b01de0b544c3f171fe3b042253088d"
 }