login error handling

chrxh · Oct 10, 2024 · eec3c1e · eec3c1e
1 parent 4bda56b
commit eec3c1e
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 19 deletions.
diff --git a/source/Gui/BrowserWindow.cpp b/source/Gui/BrowserWindow.cpp
@@ -1231,11 +1231,7 @@ void _BrowserWindow::processPendingRequestIds()
 
     auto criticalErrors = _persisterController->fetchAllErrorInfos(SenderId{BrowserSenderId});
     if (!criticalErrors.empty()) {
-        std::vector<std::string> errorMessages;
-        for (auto const& error : criticalErrors) {
-            errorMessages.emplace_back(error.message);
-        }
-        MessageDialog::getInstance().information("Error", boost::join(errorMessages, "\n\n"));
+        MessageDialog::getInstance().information("Error", criticalErrors);
     }
 }
 

diff --git a/source/Gui/FileTransferController.cpp b/source/Gui/FileTransferController.cpp
@@ -1,7 +1,5 @@
 #include "FileTransferController.h"
 
-#include <boost/algorithm/string.hpp>
-
 #include <ImFileDialog.h>
 
 #include "EngineInterface/SimulationController.h"
@@ -113,10 +111,6 @@ void FileTransferController::process()
 
     auto criticalErrors = _persisterController->fetchAllErrorInfos(SenderId{FileTransferSenderId});
     if (!criticalErrors.empty()) {
-        std::vector<std::string> errorMessages;
-        for (auto const& error : criticalErrors) {
-            errorMessages.emplace_back(error.message);
-        }
-        MessageDialog::getInstance().information("Error", boost::join(errorMessages, "\n\n"));
+        MessageDialog::getInstance().information("Error", criticalErrors);
     }
 }
diff --git a/source/Gui/LoginController.cpp b/source/Gui/LoginController.cpp
@@ -6,6 +6,8 @@
 #include "PersisterInterface/LoginRequestData.h"
 #include "PersisterInterface/SenderInfo.h"
 
+#include "MessageDialog.h"
+
 namespace
 {
     auto constexpr LoginSenderId = "Login";
@@ -32,14 +34,8 @@ void LoginController::init(SimulationController const& simController, PersisterC
 
         if (!userName.empty()) {
             persisterController->scheduleLogin(
-                SenderInfo{.senderId = LoginSenderId, .wishResultData = false, .wishErrorInfo = true},
+                SenderInfo{.senderId = SenderId{LoginSenderId}, .wishResultData = false, .wishErrorInfo = true},
                 LoginRequestData{.userName = userName, .password = password, .userInfo = getUserInfo()});
-            //LoginErrorCode errorCode;
-            //if (!NetworkService::login(errorCode, _userName, _password, getUserInfo())) {
-            //    if (errorCode != LoginErrorCode_UnknownUser) {
-            //        MessageDialog::getInstance().information("Error", "Login failed.");
-            //    }
-            //}
         }
     }
 }
@@ -49,6 +45,14 @@ void LoginController::shutdown()
     saveSettings();
 }
 
+void LoginController::process()
+{
+    auto criticalErrors = _persisterController->fetchAllErrorInfos(SenderId{LoginSenderId});
+    if (!criticalErrors.empty()) {
+        MessageDialog::getInstance().information("Login failed", criticalErrors);
+    }
+}
+
 void LoginController::saveSettings()
 {
     auto& settings = GlobalSettings::getInstance();

diff --git a/source/Gui/LoginController.h b/source/Gui/LoginController.h
@@ -11,6 +11,8 @@ class LoginController
     void init(SimulationController const& simController, PersisterController const& persisterController);
     void shutdown();
 
+    void process();
+
     void saveSettings();
 
     bool shareGpuInfo() const;

diff --git a/source/Gui/MainWindow.cpp b/source/Gui/MainWindow.cpp
@@ -763,6 +763,7 @@ void _MainWindow::processControllers()
     OverlayMessageController::get().process();
     DelayedExecutionController::getInstance().process();
     FileTransferController::get().process();
+    LoginController::get().process();
 }
 
 void _MainWindow::onRunSimulation()

diff --git a/source/Gui/MessageDialog.cpp b/source/Gui/MessageDialog.cpp
@@ -1,5 +1,7 @@
 #include "MessageDialog.h"
 
+#include <boost/algorithm/string.hpp>
+
 #include <imgui.h>
 
 #include "Base/LoggingService.h"
@@ -37,6 +39,15 @@ void MessageDialog::information(std::string const& title, std::string const& mes
     log(Priority::Important, "message dialog showing: '" + message + "'");
 }
 
+void MessageDialog::information(std::string const& title, std::vector<PersisterErrorInfo> const& errors)
+{
+    std::vector<std::string> errorMessages;
+    for (auto const& error : errors) {
+        errorMessages.emplace_back(error.message);
+    }
+    MessageDialog::getInstance().information(title, boost::join(errorMessages, "\n\n"));
+}
+
 void MessageDialog::yesNo(std::string const& title, std::string const& message, std::function<void()> const& yesFunction)
 {
     _show = true;

diff --git a/source/Gui/MessageDialog.h b/source/Gui/MessageDialog.h
@@ -1,6 +1,8 @@
 #pragma once
 
 #include "EngineInterface/Definitions.h"
+#include "PersisterInterface/PersisterErrorInfo.h"
+
 #include "Definitions.h"
 
 class MessageDialog
@@ -11,6 +13,7 @@ class MessageDialog
     void process();
 
     void information(std::string const& title, std::string const& message);
+    void information(std::string const& title, std::vector<PersisterErrorInfo> const& errors);
     void yesNo(std::string const& title, std::string const& message, std::function<void()> const& yesFunction);
 
 private: