philipp/hacky-ruadat
1
0
Fork 0
forked from Ruderverein-Donau-Linz/rowt
Code Issues Pull Requests Actions Activity

deduplicate code

Browse Source
This commit is contained in:
philipp
2023-05-03 16:06:27 +02:00
parent 0b34b776ac
commit 3f01bf39b3
1 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/model/user.rs
View File

@@ -203,15 +203,13 @@ impl<'r> FromRequest<'r> for CoxUser {
type Error = LoginError; type Error = LoginError;
async fn from_request(req: &'r Request<'_>) -> request::Outcome<Self, Self::Error> { async fn from_request(req: &'r Request<'_>) -> request::Outcome<Self, Self::Error> {
match req.cookies().get_private("loggedin_user") { match User::from_request(req).await {
Some(user) => { Outcome::Success(user) => match user.try_into() {
let user: User = serde_json::from_str(user.value()).unwrap(); //TODO: fixme Ok(user) => Outcome::Success(user),
match user.try_into() { Err(_) => Outcome::Failure((Status::Unauthorized, LoginError::NotACox)),
Ok(user) => Outcome::Success(user), },
Err(_) => Outcome::Failure((Status::Unauthorized, LoginError::NotAnAdmin)), Outcome::Failure(f) => Outcome::Failure(f),
} Outcome::Forward(f) => Outcome::Forward(f),
}
None => Outcome::Failure((Status::Unauthorized, LoginError::NotLoggedIn)),
} }
} }
} }
@@ -238,15 +236,13 @@ impl<'r> FromRequest<'r> for AdminUser {
type Error = LoginError; type Error = LoginError;
async fn from_request(req: &'r Request<'_>) -> request::Outcome<Self, Self::Error> { async fn from_request(req: &'r Request<'_>) -> request::Outcome<Self, Self::Error> {
match req.cookies().get_private("loggedin_user") { match User::from_request(req).await {
Some(user) => { Outcome::Success(user) => match user.try_into() {
let user: User = serde_json::from_str(user.value()).unwrap(); //TODO: fixme Ok(user) => Outcome::Success(user),
match user.try_into() { Err(_) => Outcome::Failure((Status::Unauthorized, LoginError::NotAnAdmin)),
Ok(user) => Outcome::Success(user), },
Err(_) => Outcome::Failure((Status::Unauthorized, LoginError::NotAnAdmin)), Outcome::Failure(f) => Outcome::Failure(f),
} Outcome::Forward(f) => Outcome::Forward(f),
}
None => Outcome::Failure((Status::Unauthorized, LoginError::NotLoggedIn)),
} }
} }
} }