More nit picking.

This commit is contained in:
2026-10-12 12:43:21 +02:00
parent c89b76043b
commit 0b0c72b337
29 changed files with 139 additions and 118 deletions
+14 -29
View File
@@ -37,28 +37,15 @@ async fn issue_token(
let secret_hash = hash_secret(&client_secret);
let generated = generate_token_pair()?;
let mut tx = pool
.begin()
.await
.map_err(repository::RepositoryError::from)?;
if !repository::user_app_secrets::verify(&mut *tx, client_id, &secret_hash).await? {
if !repository::user_app_secrets::verify(&pool, client_id, &secret_hash).await? {
return Err(AppError::InvalidClientCredentials);
}
let user_app = repository::user_apps::get_by_id_unscoped(&mut *tx, client_id)
let app = repository::user_apps::get_by_id_unscoped(&pool, client_id)
.await?
.ok_or(AppError::InvalidClientCredentials)?;
repository::tokens::issue(
&mut *tx,
token(user_app.user_id, Some(user_app.id), &generated),
)
.await?;
tx.commit()
.await
.map_err(repository::RepositoryError::from)?;
repository::tokens::issue(&pool, token(app.user_id, Some(app.id), &generated)).await?;
Ok(Json(token_response(
generated.access_token,
@@ -66,27 +53,21 @@ async fn issue_token(
)))
}
TokenRequest::RefreshToken { refresh_token } => {
let generated = generate_token_pair()?;
let old_refresh_hash = hash_secret(&refresh_token);
let mut tx = pool
.begin()
.await
.map_err(repository::RepositoryError::from)?;
let rotated = repository::tokens::rotate_refresh_token(
&mut *tx,
let generated = generate_token_pair()?;
if !repository::tokens::rotate_refresh_token(
&pool,
&old_refresh_hash,
&generated.access_token_hash,
&generated.refresh_token_hash,
generated.access_expires_at,
generated.refresh_expires_at,
)
.await?;
if !rotated {
.await?
{
return Err(AppError::InvalidRefreshToken);
}
tx.commit()
.await
.map_err(repository::RepositoryError::from)?;
Ok(Json(token_response(
generated.access_token,
@@ -102,7 +83,11 @@ async fn revoke_token(
State(pool): State<PgPool>,
Form(request): Form<TokenRevocationRequest>,
) -> Result<(), AppError> {
Ok(repository::tokens::revoke(&pool, &hash_secret(&request.token)).await?)
let token_hash = hash_secret(&request.token);
repository::tokens::revoke(&pool, &token_hash).await?;
Ok(())
}
struct TokenPair {