Merge pull request #46 from shatyuka/feat/delete-cookie

Add DeleteCookie(System.Net.Cookie cookie)

Author: maxkatz6

samples/Avalonia.Controls.WebView.Samples/MainView.axaml.cs

@@ -67,7 +67,7 @@ private async void NativeWebView_OnNavigationCompleted(object? sender, AC.WebVie
             foreach (var c in cookies)
             {
                 LogList.Text += "\r\nCookie retrieved " + c;
-                manager.DeleteCookie(c.Name, c.Domain, c.Path);
+                manager.DeleteCookie(c);
             }
 
             cookies = await manager.GetCookiesAsync();

src/Avalonia.Controls.WebView.Core/Android/AndroidWebViewAdapter.cs

@@ -266,6 +266,11 @@ public void DeleteCookie(string name, string domain, string path)
         }
     }
 
+    public void DeleteCookie(System.Net.Cookie cookie)
+    {
+        DeleteCookie(cookie.Name, cookie.Domain, cookie.Path);
+    }
+
     public Task<IReadOnlyList<Cookie>> GetCookiesAsync()
     {
         var cookies = new List<Cookie>();

src/Avalonia.Controls.WebView.Core/IWebViewAdapter.cs

@@ -398,6 +398,7 @@ internal interface IWebViewAdapterWithCookieManager : IWebViewAdapter
 {
     void AddOrUpdateCookie(System.Net.Cookie cookie);
     void DeleteCookie(string name, string domain, string path);
+    void DeleteCookie(System.Net.Cookie cookie);
     Task<IReadOnlyList<System.Net.Cookie>> GetCookiesAsync();
 }
 

src/Avalonia.Controls.WebView.Core/Linux/WpeWebViewAdapter.cs

@@ -843,10 +843,15 @@ private static void OnAddCookieFinished(IntPtr sourceObject, IntPtr result, IntP
     }
 
     public void DeleteCookie(string name, string domain, string path)
+    {
+        DeleteCookie(new Cookie(name, "", path, domain));
+    }
+
+    public void DeleteCookie(Cookie cookie)
     {
         if (_cookieManager == IntPtr.Zero || _disposed) return;
 
-        var soupCookie = WpeInterop.soup_cookie_new(name, "", domain, path, 0);
+        var soupCookie = WpeInterop.soup_cookie_new(cookie.Name, cookie.Value, cookie.Domain, cookie.Path, 0);
         if (soupCookie != IntPtr.Zero)
         {
             var tcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);

src/Avalonia.Controls.WebView.Core/Macios/MaciosWebViewAdapter.cs

@@ -430,9 +430,14 @@ public void AddOrUpdateCookie(Cookie cookie)
     }
 
     public void DeleteCookie(string name, string domain, string path)
+    {
+        DeleteCookie(new Cookie(name, ".", path, domain));
+    }
+
+    public void DeleteCookie(Cookie cookie)
     {
         using var cookieStore = _config.WebsiteDataStore.HttpCookieStore;
-        cookieStore.DeleteCookie(new Cookie(name, ".", path, domain));
+        cookieStore.DeleteCookie(cookie);
     }
 
     public async Task<IReadOnlyList<Cookie>> GetCookiesAsync()

src/Avalonia.Controls.WebView.Core/NativeWebViewCookieManager.cs

@@ -13,6 +13,8 @@ internal NativeWebViewCookieManager(IWebViewAdapterWithCookieManager webView)
     }
 
     public void AddOrUpdateCookie(System.Net.Cookie cookie) => _webView.AddOrUpdateCookie(cookie);
+    [System.Obsolete("Use DeleteCookie(System.Net.Cookie cookie) instead")]
     public void DeleteCookie(string name, string domain, string path) => _webView.DeleteCookie(name, domain, path);
+    public void DeleteCookie(System.Net.Cookie cookie) => _webView.DeleteCookie(cookie);
     public Task<IReadOnlyList<System.Net.Cookie>> GetCookiesAsync() => _webView.GetCookiesAsync();
 }

src/Avalonia.Controls.WebView.Core/Win/WebView2/WebView2BaseAdapter.cs

@@ -385,6 +385,11 @@ public void DeleteCookie(string name, string domain, string path)
         }
     }
 
+    public void DeleteCookie(Cookie cookie)
+    {
+        DeleteCookie(cookie.Name, cookie.Domain, cookie.Path);
+    }
+
     public async Task<IReadOnlyList<Cookie>> GetCookiesAsync()
     {
         if (TryGetWebView2() is ICoreWebView2_2 webView2)