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
@@ -133,5 +133,5 @@
true true
] ]
}, },
"hash": "590bd11fc994d0d22bb238ff7c140b1c48c4e31c34c18505c1d2a6aad01ddcdd" "hash": "030c776c90d2b5d0ea83cae5adf2b66b8636bbfcb73ef8201fafebaea5623f89"
} }
@@ -1,6 +1,6 @@
{ {
"db_name": "PostgreSQL", "db_name": "PostgreSQL",
"query": "DELETE FROM user_apps WHERE user_id = $1 AND id = $2 RETURNING id, user_id", "query": "\n SELECT id, user_id\n FROM user_apps\n WHERE user_id = $1 AND id = $2\n ",
"describe": { "describe": {
"columns": [ "columns": [
{ {
@@ -37,5 +37,5 @@
false false
] ]
}, },
"hash": "ef7cd037118a0ce24b225d60fa156d552323461169feb86fd6a532524897f144" "hash": "1726695ea4d8786d8e489a763cd615644f66ad541bbad08d38f4a67c86c57a37"
} }
@@ -74,5 +74,5 @@
false false
] ]
}, },
"hash": "cec05471697838fb2aaaa36cb1876daa07c34c8f59d06da1d92a8adea3a8f03b" "hash": "24ea9eccfee1ede416155c7d0fe8db417d9d3e3e8ed37b8906dcd7306fa9e241"
} }
@@ -1,6 +1,6 @@
{ {
"db_name": "PostgreSQL", "db_name": "PostgreSQL",
"query": "\n SELECT id, account_id, amount_cents, direction, date, description\n\t\tFROM transactions\n\t\tWHERE account_id IN (SELECT id FROM accessible_accounts($1))\n\t\tAND id = $2\n\t\t", "query": "\n SELECT id, account_id, amount_cents, direction, date, description\n\t\tFROM transactions\n\t\tWHERE account_id IN (SELECT id FROM accessible_accounts($1))\n\t\t AND id = $2\n\t\t",
"describe": { "describe": {
"columns": [ "columns": [
{ {
@@ -85,5 +85,5 @@
false false
] ]
}, },
"hash": "cbb576c1e4d8404059a4ea5972027c2845a7de913052d076744ffde8383fdf86" "hash": "43bf8e81f68ec7b0e3276114f1395220f005f9e422066a62343daf9603dd921e"
} }
@@ -85,5 +85,5 @@
false false
] ]
}, },
"hash": "445ce23e4d76c2311b18c2a44d8d7199c5b4e865d60b0e39f5cd5101fbf60b57" "hash": "4d348877f9b1058c5f22c64379476276bc40da2f1fda506e3de1bfac51947cde"
} }
@@ -50,5 +50,5 @@
false false
] ]
}, },
"hash": "890fe7a4664375bbe9095f5ecf1d629e87fb8c84450fae7ba1fd3b145ffbcf0a" "hash": "627f0b5cca9c9a70441454f5ba0cd45d2c6e306737febc7f3a0c2e73148ade76"
} }
@@ -1,6 +1,6 @@
{ {
"db_name": "PostgreSQL", "db_name": "PostgreSQL",
"query": "SELECT id, user_id FROM user_apps WHERE user_id = $1 AND id = $2", "query": "\n DELETE FROM user_apps\n WHERE user_id = $1 AND id = $2\n RETURNING id, user_id\n ",
"describe": { "describe": {
"columns": [ "columns": [
{ {
@@ -37,5 +37,5 @@
false false
] ]
}, },
"hash": "f20997bae03ef093e34de765f0ee766aaf00426de6b978ee6957f9b8a00daeae" "hash": "635bccdb4faf5dede694bb6ad51e7894a1641ea6c37f2abe230de264715e2390"
} }
@@ -0,0 +1,23 @@
{
"db_name": "PostgreSQL",
"query": "\n INSERT INTO tokens (\n id,\n user_id,\n user_app_id,\n access_token_hash,\n refresh_token_hash,\n access_expires_at,\n refresh_expires_at,\n refreshed_at,\n revoked_at,\n created_at\n )\n VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)\n ",
"describe": {
"columns": [],
"parameters": {
"Left": [
"Uuid",
"Uuid",
"Uuid",
"Bytea",
"Bytea",
"Timestamptz",
"Timestamptz",
"Timestamptz",
"Timestamptz",
"Timestamptz"
]
},
"nullable": []
},
"hash": "768ccffe4387ae725e2e2ab1f5544f7536d0b7c0c657aa87dc7539dcdbbc5014"
}
@@ -75,5 +75,5 @@
false false
] ]
}, },
"hash": "1ad543cbedd620af3577784a64af86ce591b4e1cc695b286baff424d8032e3fb" "hash": "9427a4738d4658bb38141bdd6d6a0140ff8585b90ac6cb85e27401f87d572f2d"
} }
@@ -1,6 +1,6 @@
{ {
"db_name": "PostgreSQL", "db_name": "PostgreSQL",
"query": "DELETE FROM users WHERE id = $1 RETURNING id", "query": "\n DELETE FROM users\n WHERE id = $1\n RETURNING id\n ",
"describe": { "describe": {
"columns": [ "columns": [
{ {
@@ -24,5 +24,5 @@
false false
] ]
}, },
"hash": "58327aa90726e98d2f31a5178c611b22b3177ea71f812c9f53e4164f22cd1f8a" "hash": "979e0f8da81ddcc7a89b270f927504defeee5490f63061270b5deee3254c842e"
} }
@@ -1,6 +1,6 @@
{ {
"db_name": "PostgreSQL", "db_name": "PostgreSQL",
"query": "\n\t\tSELECT id, name\n\t\tFROM accounts\n\t\tWHERE id = $2\n\t\tAND id IN (SELECT id FROM accessible_accounts($1))\n\t\tFOR NO KEY UPDATE\n\t\t", "query": "\n\t\tSELECT id, name\n\t\tFROM accounts\n\t\tWHERE id IN (SELECT id FROM accessible_accounts($1))\n AND id = $2\n\t\tFOR NO KEY UPDATE\n\t\t",
"describe": { "describe": {
"columns": [ "columns": [
{ {
@@ -37,5 +37,5 @@
false false
] ]
}, },
"hash": "ccf33164a136215b0ef86da0ed5221088a3fc976be89c502abb63570e0c2380c" "hash": "a4f47fa48d44b0239289b75d1f5adac86afc0498ca2e27562557f505cd96b2bf"
} }
@@ -1,6 +1,6 @@
{ {
"db_name": "PostgreSQL", "db_name": "PostgreSQL",
"query": "\n\t\tDELETE FROM accounts\n\t\tWHERE id IN (SELECT id FROM accessible_accounts($1))\n\t\tAND id = $2\n\t\tRETURNING id, name\n\t\t", "query": "\n\t\tDELETE FROM accounts\n\t\tWHERE id IN (SELECT id FROM accessible_accounts($1))\n\t\t AND id = $2\n\t\tRETURNING id, name\n\t\t",
"describe": { "describe": {
"columns": [ "columns": [
{ {
@@ -37,5 +37,5 @@
false false
] ]
}, },
"hash": "d1774b1ccd955a93433e1149be03fad7ab09afd5eaa67a87e042b26d0a52e450" "hash": "a8df8db87ec64af8ce5767483095f3fbfc34ed1551e0bc722629335609299cd6"
} }
@@ -50,5 +50,5 @@
false false
] ]
}, },
"hash": "d5a336eff7f8927f93074d8b8524e7232fed59f715420b864b11938c05f65560" "hash": "bda4a0c1d3a770cb99f5d08970b56fc0b492aac6b909a9ae4577f401b53abc98"
} }
@@ -74,5 +74,5 @@
false false
] ]
}, },
"hash": "9f08c5205c1efd98080544b60a13c9452ff9082d851bc29de182a5871ebcbabd" "hash": "c63f403f24c69c83483086a382840714b4361d017a3b7d18be094609cba65074"
} }
@@ -51,5 +51,5 @@
false false
] ]
}, },
"hash": "88aa0cea999dcc4ddb0217535b7b3aa13e5d64a0914b2eab27a71c12c37043e9" "hash": "ebbb7257f06c34e3cc9bbb1c65e4e8f57a2a00c894285531f6449a47934d2f18"
} }
@@ -1,23 +0,0 @@
{
"db_name": "PostgreSQL",
"query": "\n INSERT INTO tokens (\n id, user_id, user_app_id, access_token_hash, refresh_token_hash,\n access_expires_at, refresh_expires_at, refreshed_at, revoked_at, created_at\n )\n VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)\n ",
"describe": {
"columns": [],
"parameters": {
"Left": [
"Uuid",
"Uuid",
"Uuid",
"Bytea",
"Bytea",
"Timestamptz",
"Timestamptz",
"Timestamptz",
"Timestamptz",
"Timestamptz"
]
},
"nullable": []
},
"hash": "f448274b39bb13ec500a7634fab177916a194192f3ea14f8439bd42c467844a0"
}
@@ -133,5 +133,5 @@
true true
] ]
}, },
"hash": "cb4d0185f7464e4c7e6f4e0cb6bc40be6a56076c88d8356bf034838f1e22f2e3" "hash": "f9df44bb80677e69ed45d496b6d5f164afa3e8932a1102eb1b0a8e8b545f3f07"
} }
@@ -1,6 +1,6 @@
{ {
"db_name": "PostgreSQL", "db_name": "PostgreSQL",
"query": "SELECT id, user_id FROM user_apps WHERE id = $1", "query": "\n SELECT id, user_id\n FROM user_apps\n WHERE id = $1\n ",
"describe": { "describe": {
"columns": [ "columns": [
{ {
@@ -36,5 +36,5 @@
false false
] ]
}, },
"hash": "ee6d6a2b689fc47af3d9702fd51c8c3cb30f1b496d03b748d24eb3bd854f4622" "hash": "fb40ed4132cb8ea06d1b0460b1be658cb1e920acbdd728f6cb12940f2cd8edef"
} }
+2 -2
View File
@@ -78,8 +78,8 @@ where
r#" r#"
SELECT id, name SELECT id, name
FROM accounts FROM accounts
WHERE id = $2 WHERE id IN (SELECT id FROM accessible_accounts($1))
AND id IN (SELECT id FROM accessible_accounts($1)) AND id = $2
FOR NO KEY UPDATE FOR NO KEY UPDATE
"#, "#,
user_id, user_id,
+10 -2
View File
@@ -44,8 +44,16 @@ where
sqlx::query!( sqlx::query!(
r#" r#"
INSERT INTO tokens ( INSERT INTO tokens (
id, user_id, user_app_id, access_token_hash, refresh_token_hash, id,
access_expires_at, refresh_expires_at, refreshed_at, revoked_at, created_at user_id,
user_app_id,
access_token_hash,
refresh_token_hash,
access_expires_at,
refresh_expires_at,
refreshed_at,
revoked_at,
created_at
) )
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
"#, "#,
+4 -2
View File
@@ -143,7 +143,7 @@ pub async fn verify<'e, E>(
where where
E: sqlx::Executor<'e, Database = sqlx::Postgres>, E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{ {
sqlx::query_scalar!( let is_valid = sqlx::query_scalar!(
r#" r#"
SELECT EXISTS ( SELECT EXISTS (
SELECT 1 SELECT 1
@@ -156,7 +156,9 @@ where
) )
.fetch_one(executor) .fetch_one(executor)
.await .await
.map_err(DatabaseError::from) .map_err(DatabaseError::from)?;
Ok(is_valid)
} }
pub async fn delete_by_id<'e, E>( pub async fn delete_by_id<'e, E>(
+15 -3
View File
@@ -47,7 +47,11 @@ where
{ {
sqlx::query_as!( sqlx::query_as!(
UserAppRow, UserAppRow,
"SELECT id, user_id FROM user_apps WHERE user_id = $1 AND id = $2", r#"
SELECT id, user_id
FROM user_apps
WHERE user_id = $1 AND id = $2
"#,
user_id, user_id,
id, id,
) )
@@ -65,7 +69,11 @@ where
{ {
sqlx::query_as!( sqlx::query_as!(
UserAppRow, UserAppRow,
"SELECT id, user_id FROM user_apps WHERE id = $1", r#"
SELECT id, user_id
FROM user_apps
WHERE id = $1
"#,
id, id,
) )
.fetch_optional(executor) .fetch_optional(executor)
@@ -132,7 +140,11 @@ where
{ {
sqlx::query_as!( sqlx::query_as!(
UserAppRow, UserAppRow,
"DELETE FROM user_apps WHERE user_id = $1 AND id = $2 RETURNING id, user_id", r#"
DELETE FROM user_apps
WHERE user_id = $1 AND id = $2
RETURNING id, user_id
"#,
user_id, user_id,
id, id,
) )
+9 -1
View File
@@ -79,7 +79,15 @@ pub async fn delete_by_id<'e, E>(executor: E, id: Uuid) -> Result<Option<UserRow
where where
E: sqlx::Executor<'e, Database = sqlx::Postgres>, E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{ {
sqlx::query_as!(UserRow, "DELETE FROM users WHERE id = $1 RETURNING id", id) sqlx::query_as!(
UserRow,
r#"
DELETE FROM users
WHERE id = $1
RETURNING id
"#,
id
)
.fetch_optional(executor) .fetch_optional(executor)
.await .await
.map_err(DatabaseError::from) .map_err(DatabaseError::from)
+10 -4
View File
@@ -25,7 +25,9 @@ pub async fn issue<'e, E>(executor: E, token: Token) -> Result<(), RepositoryErr
where where
E: sqlx::Executor<'e, Database = sqlx::Postgres>, E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{ {
Ok(db::issue(executor, encode(token)).await?) db::issue(executor, encode(token)).await?;
Ok(())
} }
pub async fn rotate_refresh_token<'e, E>( pub async fn rotate_refresh_token<'e, E>(
@@ -39,7 +41,7 @@ pub async fn rotate_refresh_token<'e, E>(
where where
E: sqlx::Executor<'e, Database = sqlx::Postgres>, E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{ {
Ok(db::rotate_refresh_token( let rotated = db::rotate_refresh_token(
executor, executor,
old_refresh_hash, old_refresh_hash,
access_token_hash, access_token_hash,
@@ -47,14 +49,18 @@ where
access_expires_at, access_expires_at,
refresh_expires_at, refresh_expires_at,
) )
.await?) .await?;
Ok(rotated)
} }
pub async fn revoke<'e, E>(executor: E, token_hash: &[u8]) -> Result<(), RepositoryError> pub async fn revoke<'e, E>(executor: E, token_hash: &[u8]) -> Result<(), RepositoryError>
where where
E: sqlx::Executor<'e, Database = sqlx::Postgres>, E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{ {
Ok(db::revoke(executor, token_hash).await?) db::revoke(executor, token_hash).await?;
Ok(())
} }
fn decode(token: TokenRow) -> Result<Token, RepositoryError> { fn decode(token: TokenRow) -> Result<Token, RepositoryError> {
+2 -2
View File
@@ -100,9 +100,9 @@ pub async fn verify<'e, E>(
where where
E: sqlx::Executor<'e, Database = sqlx::Postgres>, E: sqlx::Executor<'e, Database = sqlx::Postgres>,
{ {
let result = db::verify(executor, app_id, secret_hash).await?; let is_valid = db::verify(executor, app_id, secret_hash).await?;
Ok(result) Ok(is_valid)
} }
pub async fn delete_by_id<'e, E>( pub async fn delete_by_id<'e, E>(
+14 -29
View File
@@ -37,28 +37,15 @@ async fn issue_token(
let secret_hash = hash_secret(&client_secret); let secret_hash = hash_secret(&client_secret);
let generated = generate_token_pair()?; let generated = generate_token_pair()?;
let mut tx = pool if !repository::user_app_secrets::verify(&pool, client_id, &secret_hash).await? {
.begin()
.await
.map_err(repository::RepositoryError::from)?;
if !repository::user_app_secrets::verify(&mut *tx, client_id, &secret_hash).await? {
return Err(AppError::InvalidClientCredentials); 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? .await?
.ok_or(AppError::InvalidClientCredentials)?; .ok_or(AppError::InvalidClientCredentials)?;
repository::tokens::issue( repository::tokens::issue(&pool, token(app.user_id, Some(app.id), &generated)).await?;
&mut *tx,
token(user_app.user_id, Some(user_app.id), &generated),
)
.await?;
tx.commit()
.await
.map_err(repository::RepositoryError::from)?;
Ok(Json(token_response( Ok(Json(token_response(
generated.access_token, generated.access_token,
@@ -66,27 +53,21 @@ async fn issue_token(
))) )))
} }
TokenRequest::RefreshToken { refresh_token } => { TokenRequest::RefreshToken { refresh_token } => {
let generated = generate_token_pair()?;
let old_refresh_hash = hash_secret(&refresh_token); let old_refresh_hash = hash_secret(&refresh_token);
let mut tx = pool let generated = generate_token_pair()?;
.begin()
.await if !repository::tokens::rotate_refresh_token(
.map_err(repository::RepositoryError::from)?; &pool,
let rotated = repository::tokens::rotate_refresh_token(
&mut *tx,
&old_refresh_hash, &old_refresh_hash,
&generated.access_token_hash, &generated.access_token_hash,
&generated.refresh_token_hash, &generated.refresh_token_hash,
generated.access_expires_at, generated.access_expires_at,
generated.refresh_expires_at, generated.refresh_expires_at,
) )
.await?; .await?
if !rotated { {
return Err(AppError::InvalidRefreshToken); return Err(AppError::InvalidRefreshToken);
} }
tx.commit()
.await
.map_err(repository::RepositoryError::from)?;
Ok(Json(token_response( Ok(Json(token_response(
generated.access_token, generated.access_token,
@@ -102,7 +83,11 @@ async fn revoke_token(
State(pool): State<PgPool>, State(pool): State<PgPool>,
Form(request): Form<TokenRevocationRequest>, Form(request): Form<TokenRevocationRequest>,
) -> Result<(), AppError> { ) -> 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 { struct TokenPair {