Ruderverein-Donau-Linz/rowt
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects Wiki Activity

Merge branch 'main' into feature/frontend-triptype

Browse Source
This commit is contained in:
philipp 2023-05-03 16:22:05 +02:00
commit 6fa43053ba
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/model/user.rs
View File

@ -29,6 +29,7 @@ pub enum LoginError {
NotAnAdmin, NotAnAdmin,
NotACox, NotACox,
NoPasswordSet(User), NoPasswordSet(User),
DeserializationError,
} }
impl User { impl User {
@ -162,10 +163,12 @@ impl<'r> FromRequest<'r> for User {
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 req.cookies().get_private("loggedin_user") {
Some(user) => { Some(user) => match serde_json::from_str(user.value()) {
let user: User = serde_json::from_str(user.value()).unwrap(); //TODO: fixme Ok(user) => Outcome::Success(user),
Outcome::Success(user) Err(_) => {
Outcome::Failure((Status::Unauthorized, LoginError::DeserializationError))
} }
},
None => Outcome::Failure((Status::Unauthorized, LoginError::NotLoggedIn)), None => Outcome::Failure((Status::Unauthorized, LoginError::NotLoggedIn)),
} }
} }
@ -200,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
match user.try_into() {
Ok(user) => Outcome::Success(user), Ok(user) => Outcome::Success(user),
Err(_) => Outcome::Failure((Status::Unauthorized, LoginError::NotAnAdmin)), Err(_) => Outcome::Failure((Status::Unauthorized, LoginError::NotACox)),
} },
} Outcome::Failure(f) => Outcome::Failure(f),
None => Outcome::Failure((Status::Unauthorized, LoginError::NotLoggedIn)), Outcome::Forward(f) => Outcome::Forward(f),
} }
} }
} }
@ -235,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
match user.try_into() {
Ok(user) => Outcome::Success(user), Ok(user) => Outcome::Success(user),
Err(_) => Outcome::Failure((Status::Unauthorized, LoginError::NotAnAdmin)), Err(_) => Outcome::Failure((Status::Unauthorized, LoginError::NotAnAdmin)),
} },
} Outcome::Failure(f) => Outcome::Failure(f),
None => Outcome::Failure((Status::Unauthorized, LoginError::NotLoggedIn)), Outcome::Forward(f) => Outcome::Forward(f),
} }
} }
} }