Split up files and did some consistency work.

This commit is contained in:
2026-10-18 14:53:20 +02:00
parent ed5ac7c57d
commit 68cb3d5e31
22 changed files with 506 additions and 485 deletions
+10 -10
View File
@@ -44,26 +44,26 @@ async fn issue_token(
token_config.access_token_lifetime,
)?;
repository::tokens::upsert_access_token(&pool, access_token.clone().into()).await?;
repository::access_tokens::upsert(&pool, access_token.clone().into()).await?;
Ok(Json(TokenResponse::new(access_token, None)))
}
TokenRequest::RefreshToken { refresh_token } => {
let token_hash = Secret::from(refresh_token).hash();
let (Some(access_token), Some(refresh_token)) = (
repository::tokens::get_access_token_by_refresh_hash(&pool, &token_hash).await?,
repository::tokens::get_refresh_token_by_hash(&pool, &token_hash).await?,
repository::access_tokens::get_by_refresh_hash(&pool, &token_hash).await?,
repository::refresh_tokens::get_by_hash(&pool, &token_hash).await?,
) else {
return Err(AppError::InvalidRefreshToken);
};
let new_access = access_token.refresh(token_config.access_token_lifetime)?;
repository::tokens::upsert_access_token(&pool, new_access.clone().into()).await?;
let access_token = access_token.refresh(token_config.access_token_lifetime)?;
repository::access_tokens::upsert(&pool, access_token.clone().into()).await?;
let new_refresh = refresh_token.refresh(token_config.refresh_token_lifetime)?;
repository::tokens::upsert_refresh_token(&pool, new_refresh.clone().into()).await?;
let refresh_token = refresh_token.refresh(token_config.refresh_token_lifetime)?;
repository::refresh_tokens::upsert(&pool, refresh_token.clone().into()).await?;
Ok(Json(TokenResponse::new(new_access, Some(new_refresh))))
Ok(Json(TokenResponse::new(access_token, Some(refresh_token))))
}
}
}
@@ -76,10 +76,10 @@ async fn revoke_token(
) -> Result<(), AppError> {
let token_hash = Secret::from(request.token).hash();
repository::tokens::delete_access_token_by_hash(&pool, &token_hash)
repository::access_tokens::delete_by_hash(&pool, &token_hash)
.await
.ok();
repository::tokens::delete_refresh_token_by_hash(&pool, &token_hash)
repository::refresh_tokens::delete_by_hash(&pool, &token_hash)
.await
.ok();
+1 -1
View File
@@ -33,7 +33,7 @@ where
let pool = PgPool::from_ref(state);
let token_hash = Secret::from(credentials.0).hash();
let token = repository::tokens::get_access_token_by_hash(&pool, &token_hash)
let token = repository::access_tokens::get_by_hash(&pool, &token_hash)
.await
.map_err(BearerError::Repository)?
.ok_or(BearerError::InvalidCredentials)?;