Fixed the bug where users cannot delete a self-hosted provider when an API token was never entered

This commit is contained in:
Thorsten Sommer 2024-07-28 16:54:16 +02:00
parent e3229290a4
commit ec44c0ada3
Signed by: tsommer
GPG Key ID: 371BBA77A02C0108

View File

@ -15,6 +15,7 @@ use tauri::api::process::{Command, CommandChild, CommandEvent};
use tauri::utils::config::AppUrl; use tauri::utils::config::AppUrl;
use tokio::time; use tokio::time;
use flexi_logger::{AdaptiveFormat, Logger}; use flexi_logger::{AdaptiveFormat, Logger};
use keyring::error::Error::NoEntry;
use log::{debug, error, info, warn}; use log::{debug, error, info, warn};
use tauri::updater::UpdateResponse; use tauri::updater::UpdateResponse;
@ -454,19 +455,31 @@ fn delete_secret(destination: String, user_name: String) -> DeleteSecretResponse
let service = format!("mindwork-ai-studio::{}", destination); let service = format!("mindwork-ai-studio::{}", destination);
let entry = Entry::new(service.as_str(), user_name.as_str()).unwrap(); let entry = Entry::new(service.as_str(), user_name.as_str()).unwrap();
let result = entry.delete_password(); let result = entry.delete_password();
match result { match result {
Ok(_) => { Ok(_) => {
warn!("Secret for {service} and user {user_name} was deleted successfully."); warn!("Secret for {service} and user {user_name} was deleted successfully.");
DeleteSecretResponse { DeleteSecretResponse {
success: true, success: true,
was_entry_found: true,
issue: String::from(""), issue: String::from(""),
} }
}, },
Err(NoEntry) => {
warn!("No secret for {service} and user {user_name} was found.");
DeleteSecretResponse {
success: true,
was_entry_found: false,
issue: String::from(""),
}
}
Err(e) => { Err(e) => {
error!("Failed to delete secret for {service} and user {user_name}: {e}."); error!("Failed to delete secret for {service} and user {user_name}: {e}.");
DeleteSecretResponse { DeleteSecretResponse {
success: false, success: false,
was_entry_found: false,
issue: e.to_string(), issue: e.to_string(),
} }
}, },
@ -476,6 +489,7 @@ fn delete_secret(destination: String, user_name: String) -> DeleteSecretResponse
#[derive(Serialize)] #[derive(Serialize)]
struct DeleteSecretResponse { struct DeleteSecretResponse {
success: bool, success: bool,
was_entry_found: bool,
issue: String, issue: String,
} }