maximdeclercq
/
rusty-bever
forked from Chewing_Bever/rusty-bever
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added lifetime thingy

develop
Jef Roosens 2021-08-23 12:01:04 +02:00
parent b4fc6fe2c0
commit a8cd8618a3
Signed by untrusted user: Jef Roosens
GPG Key ID: B580B976584B5F30
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/guards.rs
View File

@ -9,10 +9,10 @@ use rocket::{
use sha2::Sha256; use sha2::Sha256;
/// Extracts a "Authorization: Bearer" string from the headers. /// Extracts a "Authorization: Bearer" string from the headers.
pub struct Bearer(String); pub struct Bearer<'a>(&'a str);
#[rocket::async_trait] #[rocket::async_trait]
impl<'r> FromRequest<'r> for Bearer impl<'r> FromRequest<'r> for Bearer<'r>
{ {
type Error = rb::errors::RBError; type Error = rb::errors::RBError;
@ -34,7 +34,7 @@ impl<'r> FromRequest<'r> for Bearer
None => return Outcome::Forward(()), None => return Outcome::Forward(()),
}; };
Outcome::Success(Self(auth_string.to_string())) Outcome::Success(Self(auth_string))
} }
} }
@ -104,9 +104,10 @@ impl<'r> FromRequest<'r> for Admin
async fn from_request(req: &'r Request<'_>) -> Outcome<Self, Self::Error> async fn from_request(req: &'r Request<'_>) -> Outcome<Self, Self::Error>
{ {
let user = try_outcome!(req.guard::<User>().await); let user = try_outcome!(req.guard::<User>().await).0;
if user.0.admin {
Outcome::Success(Self(user.0)) if user.admin {
Outcome::Success(Self(user))
} else { } else {
Outcome::Forward(()) Outcome::Forward(())
} }