From 5f3ff222188b4144f5a53764c93ef34acff7e1c5 Mon Sep 17 00:00:00 2001
From: tao wang <tao.wang@bambulab.com>
Date: Thu, 10 Oct 2024 16:40:18 +0800
Subject: [PATCH] NEW:clear token when account logs out

jira:[for logout]

Change-Id: Iafbdc9244419bb689a9626251064517ec5544c3d
(cherry picked from commit 6472fbdc6a7e7380538b6e2da29f802831a93157)
---
 src/slic3r/GUI/GUI_App.cpp        | 2 +-
 src/slic3r/Utils/NetworkAgent.cpp | 4 ++--
 src/slic3r/Utils/NetworkAgent.hpp | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index 57eabca839..0e17f0dcd1 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -3730,7 +3730,7 @@ void GUI_App::request_user_logout()
 {
     if (m_agent && m_agent->is_user_login()) {
         // Update data first before showing dialogs
-        m_agent->user_logout();
+        m_agent->user_logout(true);
         m_agent->set_user_selected_machine("");
         /* delete old user settings */
         bool     transfer_preset_changes = false;
diff --git a/src/slic3r/Utils/NetworkAgent.cpp b/src/slic3r/Utils/NetworkAgent.cpp
index 4541bb680f..47c3a7068e 100644
--- a/src/slic3r/Utils/NetworkAgent.cpp
+++ b/src/slic3r/Utils/NetworkAgent.cpp
@@ -929,11 +929,11 @@ bool NetworkAgent::is_user_login()
     return ret;
 }
 
-int  NetworkAgent::user_logout()
+int  NetworkAgent::user_logout(bool request)
 {
     int ret = 0;
     if (network_agent && user_logout_ptr) {
-        ret = user_logout_ptr(network_agent);
+        ret = user_logout_ptr(network_agent, request);
         if (ret)
             BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(" error: network_agent=%1%, ret=%2%")%network_agent %ret;
     }
diff --git a/src/slic3r/Utils/NetworkAgent.hpp b/src/slic3r/Utils/NetworkAgent.hpp
index 7f7d81c5f8..fc006c8e09 100644
--- a/src/slic3r/Utils/NetworkAgent.hpp
+++ b/src/slic3r/Utils/NetworkAgent.hpp
@@ -45,7 +45,7 @@ typedef int (*func_send_message_to_printer)(void *agent, std::string dev_id, std
 typedef bool (*func_start_discovery)(void *agent, bool start, bool sending);
 typedef int (*func_change_user)(void *agent, std::string user_info);
 typedef bool (*func_is_user_login)(void *agent);
-typedef int (*func_user_logout)(void *agent);
+typedef int (*func_user_logout)(void *agent, bool request);
 typedef std::string (*func_get_user_id)(void *agent);
 typedef std::string (*func_get_user_name)(void *agent);
 typedef std::string (*func_get_user_avatar)(void *agent);
@@ -164,7 +164,7 @@ public:
     bool start_discovery(bool start, bool sending);
     int change_user(std::string user_info);
     bool is_user_login();
-    int user_logout();
+    int  user_logout(bool request = false);
     std::string get_user_id();
     std::string get_user_name();
     std::string get_user_avatar();