More scoping by user ID at DB level.

This commit is contained in:
2026-10-12 11:20:41 +02:00
parent 793f71e32e
commit b40d686ef9
18 changed files with 235 additions and 188 deletions
+14 -33
View File
@@ -12,7 +12,7 @@ use super::{
use crate::{
crypto::{generate_secret, hash_secret},
error::AppError,
repository::{self, RepositoryError},
repository,
};
pub fn create_router() -> axum::Router<PgPool> {
@@ -44,20 +44,20 @@ async fn list_user_app_secrets(
return Err(AppError::NotFound);
}
repository::user_apps::get_by_id(&pool, user_id, app_id)
.await?
.ok_or(AppError::NotFound)?;
let query = repository::user_app_secrets::Query {
app_id,
limit: Some(query.limit.unwrap_or(20)),
offset: query.offset,
};
let mut tx = pool.begin().await.map_err(RepositoryError::from)?;
ensure_app_ownership(&mut tx, user_id, app_id).await?;
let secrets = repository::user_app_secrets::list(&mut *tx, query)
let secrets = repository::user_app_secrets::list(&pool, user_id, app_id, query)
.await?
.into_iter()
.map(UserAppSecretResponse::from)
.collect();
tx.commit().await.map_err(RepositoryError::from)?;
Ok(Json(secrets))
}
@@ -73,12 +73,9 @@ async fn get_user_app_secret(
return Err(AppError::NotFound);
}
let mut tx = pool.begin().await.map_err(RepositoryError::from)?;
ensure_app_ownership(&mut tx, user_id, app_id).await?;
let secret = repository::user_app_secrets::get_by_id(&mut *tx, app_id, secret_id)
let secret = repository::user_app_secrets::get_by_id(&pool, user_id, app_id, secret_id)
.await?
.ok_or(AppError::NotFound)?;
tx.commit().await.map_err(RepositoryError::from)?;
Ok(Json(secret.into()))
}
@@ -100,22 +97,20 @@ async fn upsert_user_app_secret(
let hashed_secret = hash_secret(&generated_secret);
let secret = request.into_domain(secret_id, app_id, hashed_secret, now)?;
let mut tx = pool.begin().await.map_err(RepositoryError::from)?;
ensure_app_ownership(&mut tx, user_id, app_id).await?;
let upserted = repository::user_app_secrets::upsert(&mut *tx, secret).await?;
tx.commit().await.map_err(RepositoryError::from)?;
let upserted = repository::user_app_secrets::upsert(&pool, user_id, secret)
.await?
.ok_or(AppError::NotFound)?;
let status = if upserted.previous.is_some() {
StatusCode::OK
} else {
StatusCode::CREATED
};
let secret = upserted.current;
Ok((
status,
Json(CreatedUserAppSecretResponse {
credential: secret.into(),
credential: upserted.current.into(),
secret: generated_secret,
}),
))
@@ -132,23 +127,9 @@ async fn delete_user_app_secret(
return Err(AppError::NotFound);
}
let mut tx = pool.begin().await.map_err(RepositoryError::from)?;
ensure_app_ownership(&mut tx, user_id, app_id).await?;
let deleted = repository::user_app_secrets::delete_by_id(&mut *tx, app_id, secret_id).await?;
tx.commit().await.map_err(RepositoryError::from)?;
deleted.ok_or(AppError::NotFound)?;
repository::user_app_secrets::delete_by_id(&pool, user_id, app_id, secret_id)
.await?
.ok_or(AppError::NotFound)?;
Ok(StatusCode::NO_CONTENT)
}
async fn ensure_app_ownership(
connection: &mut sqlx::PgConnection,
user_id: Uuid,
app_id: Uuid,
) -> Result<(), AppError> {
match repository::user_apps::find_owner_by_id(&mut *connection, app_id).await? {
Some(owner) if owner == user_id => Ok(()),
Some(_) | None => Err(AppError::NotFound),
}
}