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

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	src-tauri/src/lib.rs
This commit is contained in:
quexeky
2024-10-16 09:03:25 +11:00
parent 2efe3049b3 5ef6b8e528
commit 68ca4a742f
17 changed files with 458 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src-tauri/src/auth.rs
View File

@ -14,7 +14,7 @@ use serde::{Deserialize, Serialize};
use tauri::{AppHandle, Emitter, Manager};
use url::Url;
use crate::{db::DatabaseAuth, AppState, AppStatus, User, DB};
use crate::{db::{fetch_base_url, DatabaseAuth}, AppState, AppStatus, User, DB};
#[derive(Serialize)]
struct InitiateRequestBody {
@ -79,10 +79,7 @@ pub fn generate_authorization_header() -> String {
}
pub fn fetch_user() -> Result<User, ()> {
let base_url = {
let handle = DB.borrow_data().unwrap();
Url::parse(&handle.base_url).unwrap()
};
let base_url = fetch_base_url();
let endpoint = base_url.join("/api/v1/client/user").unwrap();
let header = generate_authorization_header();