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

Do not send access token by script and minor changes in WebviewPanel

Browse Source
This commit is contained in:
David Kocik 2024-06-06 17:29:48 +02:00 committed by Lukas Matena
parent 7204a0e77b
commit c1bff16325
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,7 @@ wxWebView* WebView::CreateWebView(wxWindow * parent, const wxString& url, std::v
if (webView) { if (webView) {
wxString correct_url = url.empty() ? wxString("") : wxURI(url).BuildURI(); wxString correct_url = url.empty() ? wxString("") : wxURI(url).BuildURI();
#ifdef __WIN32_ #ifdef __WIN32__
webView->SetUserAgent(SLIC3R_APP_FULL_NAME); webView->SetUserAgent(SLIC3R_APP_FULL_NAME);
webView->Create(parent, wxID_ANY, correct_url, wxDefaultPosition, wxDefaultSize); webView->Create(parent, wxID_ANY, correct_url, wxDefaultPosition, wxDefaultSize);
//We register the wxfs:// protocol for testing purposes //We register the wxfs:// protocol for testing purposes

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

@ -107,6 +107,7 @@ WebViewPanel::WebViewPanel(wxWindow *parent, const wxString& default_url, const
// Connect the webview events // Connect the webview events
Bind(wxEVT_WEBVIEW_ERROR, &WebViewPanel::on_error, this, m_browser->GetId()); Bind(wxEVT_WEBVIEW_ERROR, &WebViewPanel::on_error, this, m_browser->GetId());
Bind(wxEVT_WEBVIEW_SCRIPT_MESSAGE_RECEIVED, &WebViewPanel::on_script_message, this, m_browser->GetId()); Bind(wxEVT_WEBVIEW_SCRIPT_MESSAGE_RECEIVED, &WebViewPanel::on_script_message, this, m_browser->GetId());
Bind(wxEVT_WEBVIEW_NAVIGATING, &WebViewPanel::on_navigation_request, this, m_browser->GetId());
#ifdef DEBUG_URL_PANEL #ifdef DEBUG_URL_PANEL
// Connect the button events // Connect the button events
@ -253,6 +254,10 @@ void WebViewPanel::on_script_message(wxWebViewEvent& evt)
{ {
} }
void WebViewPanel::on_navigation_request(wxWebViewEvent &evt)
{
}
/** /**
* Invoked when user selects the "View Source" menu item * Invoked when user selects the "View Source" menu item
*/ */
@ -468,13 +473,10 @@ SourceViewDialog::SourceViewDialog(wxWindow* parent, wxString source) :
ConnectRequestHandler::ConnectRequestHandler() ConnectRequestHandler::ConnectRequestHandler()
{ {
m_actions["REQUEST_ACCESS_TOKEN"] = std::bind(&ConnectRequestHandler::on_connect_action_request_access_token, this);
m_actions["REQUEST_CONFIG"] = std::bind(&ConnectRequestHandler::on_connect_action_request_config, this); m_actions["REQUEST_CONFIG"] = std::bind(&ConnectRequestHandler::on_connect_action_request_config, this);
m_actions["WEBAPP_READY"] = std::bind(&ConnectRequestHandler::on_connect_action_webapp_ready, this); m_actions["WEBAPP_READY"] = std::bind(&ConnectRequestHandler::on_connect_action_webapp_ready, this);
m_actions["SELECT_PRINTER"] = std::bind(&ConnectRequestHandler::on_connect_action_select_printer, this); m_actions["SELECT_PRINTER"] = std::bind(&ConnectRequestHandler::on_connect_action_select_printer, this);
m_actions["PRINT"] = std::bind(&ConnectRequestHandler::on_connect_action_print, this); m_actions["PRINT"] = std::bind(&ConnectRequestHandler::on_connect_action_print, this);
// obsolete
//m_actions["REQUEST_SELECTED_PRINTER"] = std::bind(&ConnectRequestHandler::on_connect_action_print, this);
} }
ConnectRequestHandler::~ConnectRequestHandler() ConnectRequestHandler::~ConnectRequestHandler()
{ {
@ -519,13 +521,6 @@ void ConnectRequestHandler::resend_config()
on_connect_action_request_config(); on_connect_action_request_config();
} }
void ConnectRequestHandler::on_connect_action_request_access_token()
{
std::string token = wxGetApp().plater()->get_user_account()->get_access_token();
wxString script = GUI::format_wxstr("window._prusaConnect_v1.setAccessToken(\'%1%\')", token);
run_script_bridge(script);
}
void ConnectRequestHandler::on_connect_action_request_config() void ConnectRequestHandler::on_connect_action_request_config()
{ {
/* /*
@ -540,7 +535,7 @@ void ConnectRequestHandler::on_connect_action_request_config()
const std::string dark_mode = wxGetApp().dark_mode() ? "DARK" : "LIGHT"; const std::string dark_mode = wxGetApp().dark_mode() ? "DARK" : "LIGHT";
wxString language = GUI::wxGetApp().current_language_code(); wxString language = GUI::wxGetApp().current_language_code();
language = language.SubString(0, 1); language = language.SubString(0, 1);
const std::string init_options = GUI::format("{\"accessToken\": \"%1%\" , \"clientVersion\": \"%2%\", \"colorMode\": \"%3%\", \"language\": \"%4%\"}", token, SLIC3R_VERSION, dark_mode, language); const std::string init_options = GUI::format("{\"clientVersion\": \"%1%\", \"colorMode\": \"%2%\", \"language\": \"%3%\"}", SLIC3R_VERSION, dark_mode, language); // \"accessToken\": \"%1%\" ,
wxString script = GUI::format_wxstr("window._prusaConnect_v1.init(%1%)", init_options); wxString script = GUI::format_wxstr("window._prusaConnect_v1.init(%1%)", init_options);
run_script_bridge(script); run_script_bridge(script);
@ -631,7 +626,10 @@ void ConnectWebViewPanel::on_script_message(wxWebViewEvent& evt)
BOOST_LOG_TRIVIAL(debug) << "recieved message from PrusaConnect FE: " << evt.GetString(); BOOST_LOG_TRIVIAL(debug) << "recieved message from PrusaConnect FE: " << evt.GetString();
handle_message(into_u8(evt.GetString())); handle_message(into_u8(evt.GetString()));
} }
void ConnectWebViewPanel::on_navigation_request(wxWebViewEvent &evt)
{
//TODO Stop request out of connect
}
void ConnectWebViewPanel::logout() void ConnectWebViewPanel::logout()
{ {
wxString script = L"window._prusaConnect_v1.logout()"; wxString script = L"window._prusaConnect_v1.logout()";

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

@ -1,7 +1,7 @@
#ifndef slic3r_WebViewDialog_hpp_ #ifndef slic3r_WebViewDialog_hpp_
#define slic3r_WebViewDialog_hpp_ #define slic3r_WebViewDialog_hpp_
#define DEBUG_URL_PANEL //#define DEBUG_URL_PANEL
#include <map> #include <map>
#include <wx/wx.h> #include <wx/wx.h>
@ -53,6 +53,7 @@ public:
void on_select_all(wxCommandEvent& evt); void on_select_all(wxCommandEvent& evt);
void On_enable_context_menu(wxCommandEvent& evt); void On_enable_context_menu(wxCommandEvent& evt);
void On_enable_dev_tools(wxCommandEvent& evt); void On_enable_dev_tools(wxCommandEvent& evt);
virtual void on_navigation_request(wxWebViewEvent &evt);
wxString get_default_url() const { return m_default_url; } wxString get_default_url() const { return m_default_url; }
void set_default_url(const wxString& url) { m_default_url = url; } void set_default_url(const wxString& url) { m_default_url = url; }
@ -173,7 +174,6 @@ public:
void resend_config(); void resend_config();
protected: protected:
// action callbacs stored in m_actions // action callbacs stored in m_actions
virtual void on_connect_action_request_access_token();
virtual void on_connect_action_request_config(); virtual void on_connect_action_request_config();
virtual void on_connect_action_select_printer() = 0; virtual void on_connect_action_select_printer() = 0;
virtual void on_connect_action_print() = 0; virtual void on_connect_action_print() = 0;
@ -193,6 +193,7 @@ public:
void on_script_message(wxWebViewEvent& evt) override; void on_script_message(wxWebViewEvent& evt) override;
void logout(); void logout();
void sys_color_changed() override; void sys_color_changed() override;
void on_navigation_request(wxWebViewEvent &evt) override;
protected: protected:
void on_connect_action_select_printer() override; void on_connect_action_select_printer() override;
void on_connect_action_print() override; void on_connect_action_print() override;