Ryan/drop-app
1
0
Fork 0
mirror of https://github.com/Drop-OSS/drop-app.git synced 2025-11-14 00:31:33 +10:00
Code Issues Packages Projects Releases Wiki Activity

chore: Progress on rolling progress window

Browse Source
This commit is contained in:
quexeky
2025-01-19 08:41:20 +11:00
parent 5f5cbd07c6
commit cf19477d4d
8 changed files with 74 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src-tauri/src/remote/auth.rs
View File

@ -180,15 +180,19 @@ pub fn auth_initiate_logic() -> Result<(), RemoteAccessError> {
Ok(())
}
pub fn setup() -> Result<(AppStatus, Option<User>), RemoteAccessError> {
pub fn setup() -> (AppStatus, Option<User>) {
let data = DB.borrow_data().unwrap();
let auth = data.auth.clone();
drop(data);
if auth.is_some() {
let user_result = fetch_user()?;
return Ok((AppStatus::SignedIn, Some(user_result)));
let user_result = match fetch_user() {
Ok(data) => data,
Err(RemoteAccessError::FetchError(_)) => return (AppStatus::ServerUnavailable, None),
Err(_) => return (AppStatus::SignedInNeedsReauth, None),
};
return (AppStatus::SignedIn, Some(user_result));
}
Ok((AppStatus::SignedOut, None))
(AppStatus::SignedOut, None)
}

5
src-tauri/src/remote/commands.rs
View File

@ -57,14 +57,13 @@ pub fn sign_out(app: AppHandle) {
}
#[tauri::command]
pub fn retry_connect(state: tauri::State<'_, Mutex<AppState>>) -> UserValue<(), RemoteAccessError> {
let (app_status, user) = setup()?;
pub fn retry_connect(state: tauri::State<'_, Mutex<AppState>>) {
let (app_status, user) = setup();
let mut guard = state.lock().unwrap();
guard.status = app_status;
guard.user = user;
drop(guard);
UserValue::Ok(())
}
#[tauri::command]