dusk/musikquadrupled
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: separate verify token into its own function

Browse Source
This commit is contained in:
dusk 2023-05-09 07:35:36 +03:00
parent 3726d637f5
commit c2425bd4a4
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
2 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/handler.rs
View File

@ -153,22 +153,7 @@ async fn generate_scoped_token(
Query(query): Query<Auth>,
Path(music_id): Path<String>,
) -> Result<axum::response::Response, AppError> {
let maybe_token = query.token;
'ok: {
if let Some(token) = maybe_token {
if app.tokens.verify(token).await? {
tracing::debug!("verified token");
break 'ok;
}
}
tracing::debug!("invalid token");
return Ok((
StatusCode::UNAUTHORIZED,
"Invalid token or token not present",
)
.into_response());
}
app.verify_token(query.token).await?;
// generate token
let token = app.scoped_tokens.generate_for_id(music_id).await;
@ -276,19 +261,7 @@ async fn http(
.and_then(|auth| extract_password_from_basic_auth(auth).ok())
});
'ok: {
if let Some(token) = maybe_token {
if app.tokens.verify(token).await? {
tracing::debug!("verified token");
break 'ok;
}
}
tracing::debug!("invalid token");
return Ok(Response::builder()
.status(StatusCode::UNAUTHORIZED)
.body("Invalid token or token not present".to_string().into())
.expect("cant fail"));
}
app.verify_token(maybe_token).await?;
// proxy only the headers we need
let headers = {

12
src/main.rs
View File

@ -174,6 +174,18 @@ impl AppStateInternal {
AppError::from("Invalid token or not authorized").status(http::StatusCode::UNAUTHORIZED)
})
}
async fn verify_token(&self, maybe_token: Option<impl AsRef<str>>) -> Result<(), AppError> {
if let Some(token) = maybe_token {
if self.tokens.verify(token).await? {
tracing::debug!("verified token");
return Ok(());
}
}
tracing::debug!("invalid token");
Err(AppError::from("Invalid token or token not present")
.status(http::StatusCode::UNAUTHORIZED))
}
}
#[derive(Clone, Deserialize, Serialize)]