maix/fft-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

finally works :)

Browse source
This commit is contained in:
Maix0 2025-01-16 00:37:19 +01:00
parent 601330ae17
commit 4aac134f46
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main.rs
View file

@ -179,12 +179,11 @@ async fn oauth2_callback(
.wrap_err("Unable to get user self")?; .wrap_err("Unable to get user self")?;
let mut cookie = Cookie::new("manager_token", res.id.to_string()); let mut cookie = Cookie::new("manager_token", res.id.to_string());
cookie.set_same_site(SameSite::None);
cookie.set_secure(false);
cookie.set_path("/"); cookie.set_path("/");
// cookie.set_domain("localhost:3000"); cookie.set_secure(true);
// cookie.set_http_only(Some(false)); cookie.set_http_only(true);
let ujar = jar.add(cookie); let ujar = jar.add(cookie);
debug!("end login");
Ok((ujar, Redirect::to("/manager"))) Ok((ujar, Redirect::to("/manager")))
}; };
match inner().await { match inner().await {
@ -210,6 +209,7 @@ impl FromRequestParts<AppState> for UserLoggedIn {
.await .await
.unwrap(); .unwrap();
let Some(id) = jar.get("manager_token") else { let Some(id) = jar.get("manager_token") else {
debug!("no token");
return Err(( return Err((
StatusCode::TEMPORARY_REDIRECT, StatusCode::TEMPORARY_REDIRECT,
jar, jar,
@ -219,6 +219,7 @@ impl FromRequestParts<AppState> for UserLoggedIn {
let Ok(user_id) = id.value().parse::<u64>() else { let Ok(user_id) = id.value().parse::<u64>() else {
let jar = jar.remove("manager_token"); let jar = jar.remove("manager_token");
debug!("token not u64");
return Err(( return Err((
StatusCode::TEMPORARY_REDIRECT, StatusCode::TEMPORARY_REDIRECT,
jar, jar,
@ -229,6 +230,7 @@ impl FromRequestParts<AppState> for UserLoggedIn {
if state.allowed.lock().await.contains(&user_id) { if state.allowed.lock().await.contains(&user_id) {
Ok(UserLoggedIn) Ok(UserLoggedIn)
} else { } else {
debug!("token not allowed");
let jar = jar.remove("manager_token"); let jar = jar.remove("manager_token");
Err(( Err((
StatusCode::TEMPORARY_REDIRECT, StatusCode::TEMPORARY_REDIRECT,

2
src/oauth2.rs
View file

@ -98,7 +98,7 @@ impl OauthClient {
)) ))
.build() .build()
.wrap_err("Failed to build URI")?; .wrap_err("Failed to build URI")?;
Ok(dbg!(uri)) Ok(uri)
} }
pub async fn get_user_token( pub async fn get_user_token(