From 77bb4945f2ef7e87ffd3698555b816898a33a12d Mon Sep 17 00:00:00 2001
From: David Kocik <kocikdav@gmail.com>
Date: Fri, 13 Dec 2024 14:28:00 +0100
Subject: [PATCH] Revert "SPE-2567: Login dialog starts with loading page to
 delete cookies before first request."

This reverts commit 338a961bd3d173df5e0f458f489ce79083a31336.
---
 src/slic3r/GUI/WebViewDialog.cpp | 22 +---------------------
 src/slic3r/GUI/WebViewDialog.hpp |  2 --
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/src/slic3r/GUI/WebViewDialog.cpp b/src/slic3r/GUI/WebViewDialog.cpp
index 2f09930358..b2177374c1 100644
--- a/src/slic3r/GUI/WebViewDialog.cpp
+++ b/src/slic3r/GUI/WebViewDialog.cpp
@@ -691,14 +691,10 @@ void PrintablesConnectUploadDialog::on_connect_action_close_dialog(const std::st
 }
 
 LoginWebViewDialog::LoginWebViewDialog(wxWindow *parent, std::string &ret_val, const wxString& url, wxEvtHandler* evt_handler)
-    : WebViewDialog(parent, GUI::format_wxstr("file://%1%/web/other_loading.html", boost::filesystem::path(resources_dir()).generic_string()), _L("Log in dialog"), wxSize(50 * wxGetApp().em_unit(), 80 * wxGetApp().em_unit()), {})
+    : WebViewDialog(parent, url, _L("Log in dialog"), wxSize(50 * wxGetApp().em_unit(), 80 * wxGetApp().em_unit()), {})
     , m_ret_val(ret_val)
     , p_evt_handler(evt_handler)
 {
-    // Loading screen is sent to WebViewDialog constructor to first load.
-    // In on_loaded real url is requested.
-    // This gives us space to delete cookies before requesting login page. (So it is never logged in)
-    m_default_url = url;
     Centre();
 }
 void LoginWebViewDialog::on_navigation_request(wxWebViewEvent &evt)
@@ -732,21 +728,5 @@ void LoginWebViewDialog::on_dpi_changed(const wxRect &suggested_rect)
     Fit();
     Refresh();
 }
-
-void LoginWebViewDialog::on_loaded(wxWebViewEvent &evt)
-{
-    BOOST_LOG_TRIVIAL(debug) << "LoginWebViewDialog::on_loaded " << evt.GetURL();  
-    
-    if (!m_did_default_url_request && evt.GetURL().Find("/web/other_loading.html") != wxNOT_FOUND) {
-        m_did_default_url_request = true;
-        delete_cookies(m_browser, Utils::ServiceConfig::instance().account_url());
-        delete_cookies(m_browser, "https://accounts.google.com");
-        delete_cookies(m_browser, "https://appleid.apple.com");
-        delete_cookies(m_browser, "https://facebook.com");
-        m_browser->LoadURL(m_default_url);
-        return;
-    }
-    
-}
 } // GUI
 } // Slic3r
diff --git a/src/slic3r/GUI/WebViewDialog.hpp b/src/slic3r/GUI/WebViewDialog.hpp
index d780dc03e1..e7d4c529d8 100644
--- a/src/slic3r/GUI/WebViewDialog.hpp
+++ b/src/slic3r/GUI/WebViewDialog.hpp
@@ -132,12 +132,10 @@ public:
     LoginWebViewDialog(wxWindow *parent, std::string &ret_val, const wxString& url, wxEvtHandler* evt_handler);
     void on_navigation_request(wxWebViewEvent &evt) override;
     void on_dpi_changed(const wxRect &suggested_rect) override;
-    void on_loaded(wxWebViewEvent &evt) override;
 private:
     std::string&    m_ret_val;
     wxEvtHandler*   p_evt_handler;
     bool            m_evt_sent{ false };
-    bool            m_did_default_url_request { false };
 };
 
 } // GUI