More verbose, but also more consistent.

This commit is contained in:
2026-10-18 14:35:34 +02:00
parent 26999d690f
commit ed5ac7c57d
6 changed files with 428 additions and 283 deletions
+112 -98
View File
@@ -1,4 +1,4 @@
use chrono::{DateTime, Utc};
use crate::database::dtos::Upsert;
use super::{DatabaseError, dtos::AccessTokenRow, dtos::RefreshTokenRow};
@@ -63,19 +63,38 @@ where
Ok(row)
}
pub async fn insert_access_token<'e, E>(
pub async fn upsert_access_token<'e, E>(
executor: E,
access_token: AccessTokenRow,
) -> Result<AccessTokenRow, DatabaseError>
) -> Result<Option<Upsert<AccessTokenRow>>, DatabaseError>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{
let row = sqlx::query!(
r#"
INSERT INTO access_tokens (id, user_id, user_app_id, secret_hash, expires_at, issued_at)
VALUES ($1, $2, $3, $4, $5, $6)
RETURNING id, user_id, user_app_id, secret_hash, expires_at, issued_at
"#,
INSERT INTO access_tokens (id, user_id, user_app_id, secret_hash, expires_at, issued_at)
VALUES ($1, $2, $3, $4, $5, $6)
ON CONFLICT (id) DO UPDATE SET
secret_hash = access_tokens.secret_hash,
expires_at = access_tokens.expires_at,
issued_at = access_tokens.issued_at
WHERE access_tokens.user_id = EXCLUDED.user_id
AND access_tokens.user_app_id IS NOT DISTINCT FROM EXCLUDED.user_app_id
AND access_tokens.secret_hash <> EXCLUDED.secret_hash
RETURNING WITH (OLD AS old_row, NEW AS new_row)
old_row.id AS "old_id?",
COALESCE(old_row.user_id, new_row.user_id) AS "old_user_id!",
old_row.user_app_id AS "old_user_app_id?",
COALESCE(old_row.secret_hash, new_row.secret_hash) AS "old_secret_hash!",
COALESCE(old_row.expires_at, new_row.expires_at) AS "old_expires_at!",
COALESCE(old_row.issued_at, new_row.issued_at) AS "old_issued_at!",
new_row.id AS "id!",
new_row.user_id AS "user_id!",
new_row.user_app_id AS "user_app_id?",
new_row.secret_hash AS "secret_hash!",
new_row.expires_at AS "expires_at!",
new_row.issued_at AS "issued_at!"
"#,
access_token.id,
access_token.user_id,
access_token.user_app_id,
@@ -83,50 +102,40 @@ where
access_token.expires_at,
access_token.issued_at,
)
.fetch_one(executor)
.await
.map_err(DatabaseError::from)?;
Ok(AccessTokenRow {
id: row.id,
user_id: row.user_id,
user_app_id: row.user_app_id,
secret_hash: row.secret_hash,
expires_at: row.expires_at,
issued_at: row.issued_at,
})
}
pub async fn update_access_token_by_hash<'e, E>(
executor: E,
secret_hash: &[u8],
new_secret_hash: &[u8],
new_expires_at: DateTime<Utc>,
new_issued_at: DateTime<Utc>,
) -> Result<Option<AccessTokenRow>, DatabaseError>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{
let row = sqlx::query_as!(
AccessTokenRow,
r#"
UPDATE access_tokens
SET secret_hash = $2,
expires_at = $3,
issued_at = $4
WHERE secret_hash = $1
RETURNING id, user_id, user_app_id, secret_hash, expires_at, issued_at
"#,
secret_hash,
new_secret_hash,
new_expires_at,
new_issued_at,
)
.fetch_optional(executor)
.await
.map_err(DatabaseError::from)?;
Ok(row)
// Nothing is written when the access token already exists, but it's new user ID and user app ID
// are different, or the secret hash has not changed: the update path is intended for secret
// rotation, i.e., updating the secret hash while keeping the same user ID and user app ID.
let Some(row) = row else {
return Ok(None);
};
// `old_id` indicates whether there was a previous row before the upsert, other old fields are
// coalesced with the new row's values in case there was no previous row. This enables static
// typing on the previous row instead of having to check nullability for each old field in code.
let previous = row.old_id.map(|id| AccessTokenRow {
id,
user_id: row.old_user_id,
user_app_id: row.old_user_app_id,
secret_hash: row.old_secret_hash,
expires_at: row.old_expires_at,
issued_at: row.old_issued_at,
});
Ok(Some(Upsert {
previous,
current: AccessTokenRow {
id: row.id,
user_id: row.user_id,
user_app_id: row.user_app_id,
secret_hash: row.secret_hash,
expires_at: row.expires_at,
issued_at: row.issued_at,
},
}))
}
pub async fn delete_access_token_by_hash<'e, E>(
@@ -181,68 +190,73 @@ where
Ok(row)
}
// pub async fn insert_refresh_token<'e, E>(
// executor: E,
// refresh_token: RefreshTokenRow,
// ) -> Result<RefreshTokenRow, DatabaseError>
// where
// E: sqlx::Executor<'e, Database = sqlx::Postgres>,
// {
// let row = sqlx::query!(
// r#"
// INSERT INTO refresh_tokens (id, access_token_id, secret_hash, expires_at, issued_at)
// VALUES ($1, $2, $3, $4, $5)
// RETURNING id, access_token_id, secret_hash, expires_at, issued_at
// "#,
// refresh_token.id,
// refresh_token.access_token_id,
// refresh_token.secret_hash,
// refresh_token.expires_at,
// refresh_token.issued_at,
// )
// .fetch_one(executor)
// .await
// .map_err(DatabaseError::from)?;
// Ok(RefreshTokenRow {
// id: row.id,
// access_token_id: row.access_token_id,
// secret_hash: row.secret_hash,
// expires_at: row.expires_at,
// issued_at: row.issued_at,
// })
// }
pub async fn update_refresh_token_by_hash<'e, E>(
pub async fn upsert_refresh_token<'e, E>(
executor: E,
secret_hash: &[u8],
new_secret_hash: &[u8],
new_expires_at: DateTime<Utc>,
new_issued_at: DateTime<Utc>,
) -> Result<Option<RefreshTokenRow>, DatabaseError>
refresh_token: RefreshTokenRow,
) -> Result<Option<Upsert<RefreshTokenRow>>, DatabaseError>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{
let row = sqlx::query_as!(
RefreshTokenRow,
let row = sqlx::query!(
r#"
UPDATE refresh_tokens
SET secret_hash = $2,
expires_at = $3,
issued_at = $4
WHERE secret_hash = $1
RETURNING id, access_token_id, secret_hash, expires_at, issued_at
INSERT INTO refresh_tokens (id, access_token_id, secret_hash, expires_at, issued_at)
VALUES ($1, $2, $3, $4, $5)
ON CONFLICT (id) DO UPDATE SET
secret_hash = refresh_tokens.secret_hash,
expires_at = refresh_tokens.expires_at,
issued_at = refresh_tokens.issued_at
WHERE refresh_tokens.access_token_id = EXCLUDED.access_token_id
AND refresh_tokens.secret_hash <> EXCLUDED.secret_hash
RETURNING WITH (OLD AS old_row, NEW AS new_row)
old_row.id AS "old_id?",
COALESCE(old_row.access_token_id, new_row.access_token_id) AS "old_access_token_id!",
COALESCE(old_row.secret_hash, new_row.secret_hash) AS "old_secret_hash!",
COALESCE(old_row.expires_at, new_row.expires_at) AS "old_expires_at!",
COALESCE(old_row.issued_at, new_row.issued_at) AS "old_issued_at!",
new_row.id AS "id!",
new_row.access_token_id AS "access_token_id!",
new_row.secret_hash AS "secret_hash!",
new_row.expires_at AS "expires_at!",
new_row.issued_at AS "issued_at!"
"#,
secret_hash,
new_secret_hash,
new_expires_at,
new_issued_at,
refresh_token.id,
refresh_token.access_token_id,
refresh_token.secret_hash,
refresh_token.expires_at,
refresh_token.issued_at,
)
.fetch_optional(executor)
.await
.map_err(DatabaseError::from)?;
Ok(row)
// Nothing is written when the refresh token already exists, but it's new access token ID
// is different, or the secret hash has not changed: the update path is intended for secret
// rotation, i.e., updating the secret hash while keeping the same access token ID.
let Some(row) = row else {
return Ok(None);
};
// `old_id` indicates whether there was a previous row before the upsert, other old fields are
// coalesced with the new row's values in case there was no previous row. This enables static
// typing on the previous row instead of having to check nullability for each old field in code.
let previous = row.old_id.map(|id| RefreshTokenRow {
id,
access_token_id: row.old_access_token_id,
secret_hash: row.old_secret_hash,
expires_at: row.old_expires_at,
issued_at: row.old_issued_at,
});
Ok(Some(Upsert {
previous,
current: RefreshTokenRow {
id: row.id,
access_token_id: row.access_token_id,
secret_hash: row.secret_hash,
expires_at: row.expires_at,
issued_at: row.issued_at,
},
}))
}
pub async fn delete_refresh_token_by_hash<'e, E>(
+45 -82
View File
@@ -1,5 +1,3 @@
use chrono::{DateTime, Utc};
use super::{ReferenceRelation, ReferenceViolationKind, RepositoryError};
use crate::{
database::{
@@ -7,6 +5,7 @@ use crate::{
dtos::{AccessTokenRow, RefreshTokenRow},
},
domain::{HashedAccessToken, HashedRefreshToken, HashedSecret},
repository::dtos::Upsert,
};
#[tracing::instrument(skip(executor, secret_hash))]
@@ -19,7 +18,8 @@ where
{
let token = database::tokens::get_access_token_by_hash(executor, secret_hash.hash())
.await?
.map(decode_access_token);
.map(decode_access_token)
.transpose()?;
Ok(token)
}
@@ -35,46 +35,26 @@ where
let token =
database::tokens::get_access_token_by_refresh_secret_hash(executor, secret_hash.hash())
.await?
.map(decode_access_token);
.map(decode_access_token)
.transpose()?;
Ok(token)
}
#[tracing::instrument(skip(executor, access_token))]
pub async fn insert_access_token<'e, E>(
pub async fn upsert_access_token<'e, E>(
executor: E,
access_token: HashedAccessToken,
) -> Result<HashedAccessToken, RepositoryError>
) -> Result<Option<Upsert<HashedAccessToken>>, RepositoryError>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{
let token = database::tokens::insert_access_token(executor, encode_access_token(access_token))
let token = database::tokens::upsert_access_token(executor, encode_access_token(access_token))
.await
.map_err(classify_insert_error)?;
Ok(decode_access_token(token))
}
#[tracing::instrument(skip(executor, secret_hash, new_secret_hash))]
pub async fn update_access_token_by_hash<'e, E>(
executor: E,
secret_hash: &HashedSecret,
new_secret_hash: &HashedSecret,
new_expires_at: DateTime<Utc>,
new_issued_at: DateTime<Utc>,
) -> Result<Option<HashedAccessToken>, RepositoryError>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{
let token = database::tokens::update_access_token_by_hash(
executor,
secret_hash.hash(),
new_secret_hash.hash(),
new_expires_at,
new_issued_at,
)
.await?
.map(decode_access_token);
.map_err(classify_upsert_error)?
.map(|upserted| upserted.try_map(decode_access_token))
.transpose()?
.map(Into::into);
Ok(token)
}
@@ -89,7 +69,8 @@ where
{
let token = database::tokens::delete_access_token_by_hash(executor, secret_hash.hash())
.await?
.map(decode_access_token);
.map(decode_access_token)
.transpose()?;
Ok(token)
}
@@ -104,46 +85,27 @@ where
{
let token = database::tokens::get_refresh_token_by_hash(executor, secret_hash.hash())
.await?
.map(decode_refresh_token);
.map(decode_refresh_token)
.transpose()?;
Ok(token)
}
// pub async fn insert_refresh_token<'e, E>(
// executor: E,
// refresh_token: HashedRefreshToken,
// ) -> Result<HashedRefreshToken, RepositoryError>
// where
// E: sqlx::Executor<'e, Database = sqlx::Postgres>,
// {
// let token =
// database::tokens::insert_refresh_token(executor, encode_refresh_token(refresh_token))
// .await
// .map_err(classify_insert_error)?;
// Ok(decode_refresh_token(token))
// }
#[tracing::instrument(skip(executor, secret_hash, new_secret_hash))]
pub async fn update_refresh_token_by_hash<'e, E>(
#[tracing::instrument(skip(executor, refresh_token))]
pub async fn upsert_refresh_token<'e, E>(
executor: E,
secret_hash: &HashedSecret,
new_secret_hash: &HashedSecret,
new_expires_at: DateTime<Utc>,
new_issued_at: DateTime<Utc>,
) -> Result<Option<HashedRefreshToken>, RepositoryError>
refresh_token: HashedRefreshToken,
) -> Result<Option<Upsert<HashedRefreshToken>>, RepositoryError>
where
E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{
let token = database::tokens::update_refresh_token_by_hash(
executor,
secret_hash.hash(),
new_secret_hash.hash(),
new_expires_at,
new_issued_at,
)
.await?
.map(decode_refresh_token);
let token =
database::tokens::upsert_refresh_token(executor, encode_refresh_token(refresh_token))
.await
.map_err(classify_upsert_error)?
.map(|upserted| upserted.try_map(decode_refresh_token))
.transpose()?
.map(Into::into);
Ok(token)
}
@@ -158,12 +120,13 @@ where
{
let token = database::tokens::delete_refresh_token_by_hash(executor, secret_hash.hash())
.await?
.map(decode_refresh_token);
.map(decode_refresh_token)
.transpose()?;
Ok(token)
}
fn classify_insert_error(error: DatabaseError) -> RepositoryError {
fn classify_upsert_error(error: DatabaseError) -> RepositoryError {
let relation = match &error {
DatabaseError::ForeignKeyViolation {
constraint: Constraint::AccessTokenUser,
@@ -187,15 +150,15 @@ fn classify_insert_error(error: DatabaseError) -> RepositoryError {
}
}
fn decode_access_token(row: AccessTokenRow) -> HashedAccessToken {
HashedAccessToken {
fn decode_access_token(row: AccessTokenRow) -> Result<HashedAccessToken, RepositoryError> {
Ok(HashedAccessToken {
id: row.id,
user_id: row.user_id,
user_app_id: row.user_app_id,
secret_hash: HashedSecret::from(row.secret_hash),
expires_at: row.expires_at,
issued_at: row.issued_at,
}
})
}
fn encode_access_token(token: HashedAccessToken) -> AccessTokenRow {
@@ -209,22 +172,22 @@ fn encode_access_token(token: HashedAccessToken) -> AccessTokenRow {
}
}
fn decode_refresh_token(row: RefreshTokenRow) -> HashedRefreshToken {
HashedRefreshToken {
fn decode_refresh_token(row: RefreshTokenRow) -> Result<HashedRefreshToken, RepositoryError> {
Ok(HashedRefreshToken {
id: row.id,
token_id: row.access_token_id,
secret_hash: HashedSecret::from(row.secret_hash),
expires_at: row.expires_at,
issued_at: row.issued_at,
}
})
}
// fn encode_refresh_token(token: HashedRefreshToken) -> RefreshTokenRow {
// RefreshTokenRow {
// id: token.id,
// access_token_id: token.token_id,
// secret_hash: token.secret_hash.hash().to_vec(),
// expires_at: token.expires_at,
// issued_at: token.issued_at,
// }
// }
fn encode_refresh_token(token: HashedRefreshToken) -> RefreshTokenRow {
RefreshTokenRow {
id: token.id,
access_token_id: token.token_id,
secret_hash: token.secret_hash.hash().to_vec(),
expires_at: token.expires_at,
issued_at: token.issued_at,
}
}
+6 -23
View File
@@ -44,7 +44,7 @@ async fn issue_token(
token_config.access_token_lifetime,
)?;
repository::tokens::insert_access_token(&pool, access_token.clone().into()).await?;
repository::tokens::upsert_access_token(&pool, access_token.clone().into()).await?;
Ok(Json(TokenResponse::new(access_token, None)))
}
@@ -57,30 +57,13 @@ async fn issue_token(
return Err(AppError::InvalidRefreshToken);
};
let new_access_token = access_token.refresh(token_config.access_token_lifetime)?;
repository::tokens::update_access_token_by_hash(
&pool,
&token_hash,
&new_access_token.secret.hash(),
new_access_token.expires_at,
new_access_token.issued_at,
)
.await?;
let new_access = access_token.refresh(token_config.access_token_lifetime)?;
repository::tokens::upsert_access_token(&pool, new_access.clone().into()).await?;
let new_refresh_token = refresh_token.refresh(token_config.refresh_token_lifetime)?;
repository::tokens::update_refresh_token_by_hash(
&pool,
&token_hash,
&new_refresh_token.secret.hash(),
new_refresh_token.expires_at,
new_refresh_token.issued_at,
)
.await?;
let new_refresh = refresh_token.refresh(token_config.refresh_token_lifetime)?;
repository::tokens::upsert_refresh_token(&pool, new_refresh.clone().into()).await?;
Ok(Json(TokenResponse::new(
new_access_token,
Some(new_refresh_token),
)))
Ok(Json(TokenResponse::new(new_access, Some(new_refresh))))
}
}
}