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

ConnectWebViewPanel: Connect login flow start moved from ctor to on_page_will_load

Browse Source
This commit is contained in:
Jan Bařtipán 2024-06-20 10:36:08 +02:00 committed by Lukas Matena
parent bd6b570e95
commit e70ee320d9
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,6 +145,8 @@ void WebViewPanel::load_url(const wxString& url)
if (!m_browser)
return;
this->on_page_will_load();
this->Show();
this->Raise();
#ifdef DEBUG_URL_PANEL
@ -258,6 +260,10 @@ void WebViewPanel::on_navigation_request(wxWebViewEvent &evt)
{
}
void WebViewPanel::on_page_will_load()
{
}
/**
* Invoked when user selects the "View Source" menu item
*/
@ -560,7 +566,21 @@ ConnectWebViewPanel::ConnectWebViewPanel(wxWindow* parent)
{
//m_browser->RegisterHandler(wxSharedPtr<wxWebViewHandler>(new WebViewHandler("https")));
wxGetApp().plater()->Bind(EVT_UA_ID_USER_SUCCESS, &ConnectWebViewPanel::on_user_token, this);
}
ConnectWebViewPanel::~ConnectWebViewPanel()
{
m_browser->Unbind(EVT_UA_ID_USER_SUCCESS, &ConnectWebViewPanel::on_user_token, this);
}
void ConnectWebViewPanel::on_page_will_load()
{
Plater* plater = wxGetApp().plater();
const std::string& access_token = plater->get_user_account()->get_access_token();
assert(!access_token.empty());
m_browser->AddUserScript(wxString::Format(
#if AUTH_VIA_FETCH_OVERRIDE
@ -594,7 +614,7 @@ ConnectWebViewPanel::ConnectWebViewPanel(wxWindow* parent)
window.__access_token_version = 0;
)",
#else
R"(
R"(
console.log('Preparing login');
window.fetch('/slicer/login', {method: 'POST', headers: {Authorization: 'Bearer %s'}})
.then((resp) => {
@ -603,19 +623,14 @@ ConnectWebViewPanel::ConnectWebViewPanel(wxWindow* parent)
});
)",
#endif
plater->get_user_account()->get_access_token()
access_token
));
plater->Bind(EVT_UA_ID_USER_SUCCESS, &ConnectWebViewPanel::on_user_token, this);
}
ConnectWebViewPanel::~ConnectWebViewPanel()
{
m_browser->Unbind(EVT_UA_ID_USER_SUCCESS, &ConnectWebViewPanel::on_user_token, this);
}
void ConnectWebViewPanel::on_user_token(UserAccountSuccessEvent& e)
{
e.Skip();
assert(!access_token.empty());
wxString javascript = wxString::Format(
#if AUTH_VIA_FETCH_OVERRIDE
"window.__access_token = '%s';window.__access_token_version = (window.__access_token_version || 0) + 1;console.log('Updated Auth token', window.__access_token);",

5
src/slic3r/GUI/WebViewDialog.hpp
View File

@ -59,6 +59,10 @@ public:
void set_default_url(const wxString& url) { m_default_url = url; }
virtual void sys_color_changed();
protected:
virtual void on_page_will_load();
protected:
wxWebView* m_browser { nullptr };
@ -201,6 +205,7 @@ protected:
void on_connect_action_print(const std::string& message_data) override;
void on_connect_action_webapp_ready(const std::string& message_data) override {}
void run_script_bridge(const wxString& script) override {run_script(script); }
void on_page_will_load() override;
private:
void on_user_token(UserAccountSuccessEvent& e);
bool m_reached_default_url {false};