GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-16 01:15:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

SPE 2450: Delete cookies Mac part

Browse Source 
+ fixes of other parts
This commit is contained in:
David Kocik 2024-09-04 10:03:26 +02:00 committed by Lukas Matena
parent 1e55aaef62
commit 097ee2e85d
5 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/slic3r/GUI/WebViewDialog.cpp
View File

@ -1459,10 +1459,10 @@ void LoginWebViewDialog::on_navigation_request(wxWebViewEvent &evt)
{ {
wxString url = evt.GetURL(); wxString url = evt.GetURL();
if (url.starts_with(L"prusaslicer")) { if (url.starts_with(L"prusaslicer")) {
delete_cookies(m_browser, L"https://account.prusa3d.com"); delete_cookies(m_browser, "https://account.prusa3d.com");
delete_cookies(m_browser, L"https://accounts.google.com"); delete_cookies(m_browser, "https://accounts.google.com");
delete_cookies(m_browser, L"https://appleid.apple.com"); delete_cookies(m_browser, "https://appleid.apple.com");
delete_cookies(m_browser, L"https://facebook.com"); delete_cookies(m_browser, "https://facebook.com");
evt.Veto(); evt.Veto();
m_ret_val = into_u8(url); m_ret_val = into_u8(url);
EndModal(wxID_OK); EndModal(wxID_OK);

2
src/slic3r/GUI/WebViewPlatformUtils.hpp
View File

@ -6,6 +6,6 @@
namespace Slic3r::GUI { namespace Slic3r::GUI {
void setup_webview_with_credentials(wxWebView* web_view, const std::string& username, const std::string& password); void setup_webview_with_credentials(wxWebView* web_view, const std::string& username, const std::string& password);
void remove_webview_credentials(wxWebView* web_view); void remove_webview_credentials(wxWebView* web_view);
void delete_cookies(wxWebView* web_view, const wxString& url); void delete_cookies(wxWebView* web_view, const std::string& url);
} }

2
src/slic3r/GUI/WebViewPlatformUtilsLinux.cpp
View File

@ -96,7 +96,7 @@ void get_cookie_callback (GObject* source_object, GAsyncResult* result, void* us
g_list_free(cookies); g_list_free(cookies);
} }
} }
void delete_cookies(wxWebView* web_view, const wxString& url) void delete_cookies(wxWebView* web_view, const std::string& url)
{ {
// Call webkit_cookie_manager_get_cookies // Call webkit_cookie_manager_get_cookies
// set its callback to call webkit_cookie_manager_get_cookies_finish // set its callback to call webkit_cookie_manager_get_cookies_finish

23
src/slic3r/GUI/WebViewPlatformUtilsMac.mm
View File

@ -2,6 +2,8 @@
#import <WebKit/WKWebView.h> #import <WebKit/WKWebView.h>
#import <WebKit/WKNavigationDelegate.h> #import <WebKit/WKNavigationDelegate.h>
#import <WebKit/WKWebViewConfiguration.h>
#import <WebKit/WKWebsiteDataStore.h>
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <Foundation/NSURLSession.h> #import <Foundation/NSURLSession.h>
@ -114,7 +116,6 @@
} }
@end @end
namespace Slic3r::GUI { namespace Slic3r::GUI {
void setup_webview_with_credentials(wxWebView* web_view, const std::string& username, const std::string& password) void setup_webview_with_credentials(wxWebView* web_view, const std::string& username, const std::string& password)
{ {
@ -137,10 +138,24 @@ void remove_webview_credentials(wxWebView* web_view)
} }
} }
void delete_cookies(wxWebView* web_view, const wxString& url) void delete_cookies(wxWebView* web_view, const std::string& url)
{ {
WKWebView* backend = static_cast<WKWebView*>(web_view->GetNativeBackend());
} NSString *url_string = [NSString stringWithCString:url.c_str() encoding:[NSString defaultCStringEncoding]];
WKWebsiteDataStore *data_store = backend.configuration.websiteDataStore;
NSSet *website_data_types = [NSSet setWithObject:WKWebsiteDataTypeCookies];
[data_store fetchDataRecordsOfTypes:website_data_types completionHandler:^(NSArray<WKWebsiteDataRecord *> *records) {
for (WKWebsiteDataRecord *record in records) {
if ([url_string containsString:record.displayName]) {
[data_store removeDataOfTypes:website_data_types
forDataRecords:@[record]
completionHandler:^{
//NSLog(@"Deleted cookies for domain: %@", record.displayName);
}];
}
}
}];
} }
}

3
src/slic3r/GUI/WebViewPlatformUtilsWin32.cpp
View File

@ -89,7 +89,7 @@ void remove_webview_credentials(wxWebView* webview)
} }
} }
void delete_cookies(wxWebView* webview, const wxString& url) void delete_cookies(wxWebView* webview, const std::string& url)
{ {
ICoreWebView2 *webView2 = static_cast<ICoreWebView2 *>(webview->GetNativeBackend()); ICoreWebView2 *webView2 = static_cast<ICoreWebView2 *>(webview->GetNativeBackend());
if (!webView2) { if (!webView2) {
@ -130,7 +130,6 @@ void delete_cookies(wxWebView* webview, const wxString& url)
BOOST_LOG_TRIVIAL(error) << "Failed to parse cookies json: " << e.what(); BOOST_LOG_TRIVIAL(error) << "Failed to parse cookies json: " << e.what();
return S_OK; return S_OK;
} }
BOOST_LOG_TRIVIAL(error) << url << " " << ptree.get_child("cookies").size();
for (const auto& cookie : ptree.get_child("cookies")) { for (const auto& cookie : ptree.get_child("cookies")) {
std::string name = cookie.second.get<std::string>("name"); std::string name = cookie.second.get<std::string>("name");
std::string domain = cookie.second.get<std::string>("domain"); std::string domain = cookie.second.get<std::string>("domain");