filipriec/komp_ac
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

login refactored

Browse Source
This commit is contained in:
filipriec
2025-04-18 23:26:48 +02:00
parent dc6c1ce43c
commit d18f7862ab
3 changed files with 93 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
client/src/ui/handlers/ui.rs
View File

@@ -3,7 +3,6 @@
use crate::config::binds::config::Config;
use crate::config::colors::themes::Theme;
use crate::services::grpc_client::GrpcClient;
// <-- Add AuthClient import
use crate::services::ui_service::UiService;
use crate::modes::common::commands::CommandHandler;
use crate::modes::handlers::event::{EventHandler, EventOutcome};
@@ -23,6 +22,7 @@ use crate::tui::terminal::{EventReader, TerminalCore};
use crate::ui::handlers::render::render_ui;
use crate::tui::functions::common::login::LoginResult;
use crate::tui::functions::common::register::RegisterResult;
use crate::tui::functions::common::login;
use crate::tui::functions::common::register;
use std::time::Instant;
use anyhow::{Context, Result};
@@ -192,54 +192,10 @@ pub async fn run_ui() -> Result<()> {
// --- Check for Login Results from Channel ---
match login_result_receiver.try_recv() {
Ok(login_result) => {
// A result arrived from the login task!
match login_result {
LoginResult::Success(response) => {
// Update AuthState
auth_state.auth_token = Some(response.access_token.clone());
auth_state.user_id = Some(response.user_id.clone());
auth_state.role = Some(response.role.clone());
auth_state.decoded_username = Some(response.username.clone());
// Update Dialog
let success_message = format!(
"Login Successful!\n\nUsername: {}\nUser ID: {}\nRole: {}",
response.username, response.user_id, response.role
);
// Use update_dialog_content if loading dialog is shown, otherwise show_dialog
app_state.update_dialog_content( // Assuming loading dialog was shown
&success_message,
vec!["Menu".to_string(), "Exit".to_string()],
DialogPurpose::LoginSuccess,
);
info!(message = %success_message, "Login successful");
}
LoginResult::Failure(err_msg) => {
app_state.update_dialog_content( // Update loading dialog
&err_msg,
vec!["OK".to_string()],
DialogPurpose::LoginFailed,
);
login_state.error_message = Some(err_msg.clone()); // Keep error message
error!(error = %err_msg, "Login failed");
}
LoginResult::ConnectionError(err_msg) => {
app_state.update_dialog_content( // Update loading dialog
&err_msg, // Show connection error
vec!["OK".to_string()],
DialogPurpose::LoginFailed,
);
login_state.error_message = Some(err_msg.clone());
error!(error = %err_msg, "Login connection error");
}
Ok(result) => {
if login::handle_login_result(result, &mut app_state, &mut auth_state, &mut login_state) {
needs_redraw = true;
}
// Clear login form state regardless of outcome now that it's processed
login_state.username.clear();
login_state.password.clear();
login_state.set_has_unsaved_changes(false);
login_state.current_cursor_pos = 0;
needs_redraw = true;
}
Err(mpsc::error::TryRecvError::Empty) => { /* No message waiting */ }
Err(mpsc::error::TryRecvError::Disconnected) => {