rogalikkkkkk
/
iosWebViewFix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1295 from bagedevimo/allow-no-domain 

Allow a cookie without a domain to be set on Android
This commit is contained in:
Lorenzo Pichilli 2022-10-13 19:39:58 +02:00 committed by GitHub
parent 416aeaafac a5be2c59be
commit 069594a8cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
android/src/main/java/com/pichillilorenzo/flutter_inappwebview/MyCookieManager.java
View File

@ -140,7 +140,10 @@ public class MyCookieManager implements MethodChannel.MethodCallHandler {
cookieManager = getCookieManager(); cookieManager = getCookieManager();
if (cookieManager == null) return; if (cookieManager == null) return;
String cookieValue = name + "=" + value + "; Domain=" + domain + "; Path=" + path; String cookieValue = name + "=" + value + "; Path=" + path;
if (domain != null)
cookieValue += "; Domain=" + domain;
if (expiresDate != null) if (expiresDate != null)
cookieValue += "; Expires=" + getCookieExpirationDate(expiresDate); cookieValue += "; Expires=" + getCookieExpirationDate(expiresDate);

12
ios/Classes/MyCookieManager.swift
View File

@ -35,7 +35,6 @@ class MyCookieManager: NSObject, FlutterPlugin {
let url = arguments!["url"] as! String let url = arguments!["url"] as! String
let name = arguments!["name"] as! String let name = arguments!["name"] as! String
let value = arguments!["value"] as! String let value = arguments!["value"] as! String
let domain = arguments!["domain"] as! String
let path = arguments!["path"] as! String let path = arguments!["path"] as! String
var expiresDate: Int64? var expiresDate: Int64?
@ -47,12 +46,13 @@ class MyCookieManager: NSObject, FlutterPlugin {
let isSecure = arguments!["isSecure"] as? Bool let isSecure = arguments!["isSecure"] as? Bool
let isHttpOnly = arguments!["isHttpOnly"] as? Bool let isHttpOnly = arguments!["isHttpOnly"] as? Bool
let sameSite = arguments!["sameSite"] as? String let sameSite = arguments!["sameSite"] as? String
let domain = arguments!["domain"] as? String
MyCookieManager.setCookie(url: url, MyCookieManager.setCookie(url: url,
name: name, name: name,
value: value, value: value,
domain: domain,
path: path, path: path,
domain: domain,
expiresDate: expiresDate, expiresDate: expiresDate,
maxAge: maxAge, maxAge: maxAge,
isSecure: isSecure, isSecure: isSecure,
@ -92,8 +92,8 @@ class MyCookieManager: NSObject, FlutterPlugin {
public static func setCookie(url: String, public static func setCookie(url: String,
name: String, name: String,
value: String, value: String,
domain: String,
path: String, path: String,
domain: String?,
expiresDate: Int64?, expiresDate: Int64?,
maxAge: Int64?, maxAge: Int64?,
isSecure: Bool?, isSecure: Bool?,
@ -109,8 +109,12 @@ class MyCookieManager: NSObject, FlutterPlugin {
properties[.originURL] = url properties[.originURL] = url
properties[.name] = name properties[.name] = name
properties[.value] = value properties[.value] = value
properties[.domain] = domain
properties[.path] = path properties[.path] = path
if domain != nil {
properties[.domain] = domain
}
if expiresDate != nil { if expiresDate != nil {
// convert from milliseconds // convert from milliseconds
properties[.expires] = Date(timeIntervalSince1970: TimeInterval(Double(expiresDate!)/1000)) properties[.expires] = Date(timeIntervalSince1970: TimeInterval(Double(expiresDate!)/1000))

10
lib/src/cookie_manager.dart
View File

@ -63,12 +63,9 @@ class CookieManager {
bool? isHttpOnly, bool? isHttpOnly,
HTTPCookieSameSitePolicy? sameSite, HTTPCookieSameSitePolicy? sameSite,
InAppWebViewController? iosBelow11WebViewController}) async { InAppWebViewController? iosBelow11WebViewController}) async {
if (domain == null) domain = _getDomainName(url);
assert(url.toString().isNotEmpty); assert(url.toString().isNotEmpty);
assert(name.isNotEmpty); assert(name.isNotEmpty);
assert(value.isNotEmpty); assert(value.isNotEmpty);
assert(domain.isNotEmpty);
assert(path.isNotEmpty); assert(path.isNotEmpty);
if (defaultTargetPlatform == TargetPlatform.iOS) { if (defaultTargetPlatform == TargetPlatform.iOS) {
@ -109,15 +106,16 @@ class CookieManager {
{required Uri url, {required Uri url,
required String name, required String name,
required String value, required String value,
required String domain,
String path = "/", String path = "/",
String? domain,
int? expiresDate, int? expiresDate,
int? maxAge, int? maxAge,
bool? isSecure, bool? isSecure,
HTTPCookieSameSitePolicy? sameSite, HTTPCookieSameSitePolicy? sameSite,
InAppWebViewController? webViewController}) async { InAppWebViewController? webViewController}) async {
var cookieValue = var cookieValue = name + "=" + value + "; Path=" + path;
name + "=" + value + "; Domain=" + domain + "; Path=" + path;
if (domain != null) cookieValue += "; Domain=" + domain;
if (expiresDate != null) if (expiresDate != null)
cookieValue += "; Expires=" + await _getCookieExpirationDate(expiresDate); cookieValue += "; Expires=" + await _getCookieExpirationDate(expiresDate);