list users

This commit is contained in:
2025-07-20 13:14:31 +02:00
parent 7f2aac12e6
commit 5ec224b79e
36 changed files with 225 additions and 54 deletions

View File

@@ -228,3 +228,19 @@ pub enum CreateUserError {
#[error(transparent)]
Unknown(#[from] anyhow::Error),
}
/// An admin request to list all users
#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub struct ListUsersRequest {}
impl ListUsersRequest {
pub fn new() -> Self {
Self {}
}
}
#[derive(Debug, Error)]
pub enum ListUsersError {
#[error(transparent)]
Unknown(#[from] anyhow::Error),
}

View File

@@ -59,6 +59,9 @@ pub trait AuthMetrics: Clone + Send + Sync + 'static {
fn record_user_creation_success(&self) -> impl Future<Output = ()> + Send;
fn record_user_creation_failure(&self) -> impl Future<Output = ()> + Send;
fn record_user_list_success(&self) -> impl Future<Output = ()> + Send;
fn record_user_list_failure(&self) -> impl Future<Output = ()> + Send;
fn record_auth_session_creation_success(&self) -> impl Future<Output = ()> + Send;
fn record_auth_session_creation_failure(&self) -> impl Future<Output = ()> + Send;

View File

@@ -20,8 +20,8 @@ use super::models::{
FilePath, ListFilesError, ListFilesRequest, RenameEntryError, RenameEntryRequest,
},
user::{
CreateUserError, CreateUserRequest, LoginUserError, LoginUserRequest, LoginUserResponse,
RegisterUserError, RegisterUserRequest, User,
CreateUserError, CreateUserRequest, ListUsersError, ListUsersRequest, LoginUserError,
LoginUserRequest, LoginUserResponse, RegisterUserError, RegisterUserRequest, User,
},
user_warren::{
UserWarren,
@@ -125,6 +125,10 @@ pub trait AuthService: Clone + Send + Sync + 'static {
&self,
request: AuthRequest<CreateUserRequest>,
) -> impl Future<Output = Result<User, AuthError<CreateUserError>>> + Send;
fn list_users(
&self,
request: AuthRequest<ListUsersRequest>,
) -> impl Future<Output = Result<Vec<User>, AuthError<ListUsersError>>> + Send;
fn create_auth_session(
&self,

View File

@@ -74,6 +74,11 @@ pub trait AuthNotifier: Clone + Send + Sync + 'static {
fn user_registered(&self, user: &User) -> impl Future<Output = ()> + Send;
fn user_logged_in(&self, response: &LoginUserResponse) -> impl Future<Output = ()> + Send;
fn user_created(&self, creator: &User, created: &User) -> impl Future<Output = ()> + Send;
/// Lists all the users (admin action)
///
/// * `user`: The user who requested the list
/// * `users`: The users from the list
fn users_listed(&self, user: &User, users: &Vec<User>) -> impl Future<Output = ()> + Send;
fn auth_session_created(&self, user_id: &Uuid) -> impl Future<Output = ()> + Send;
fn auth_session_fetched(

View File

@@ -12,8 +12,8 @@ use crate::domain::warren::models::{
FilePath, ListFilesError, ListFilesRequest, RenameEntryError, RenameEntryRequest,
},
user::{
CreateUserError, CreateUserRequest, User, VerifyUserPasswordError,
VerifyUserPasswordRequest,
CreateUserError, CreateUserRequest, ListUsersError, ListUsersRequest, User,
VerifyUserPasswordError, VerifyUserPasswordRequest,
},
user_warren::{
UserWarren,
@@ -74,10 +74,16 @@ pub trait AuthRepository: Clone + Send + Sync + 'static {
&self,
request: CreateUserRequest,
) -> impl Future<Output = Result<User, CreateUserError>> + Send;
fn list_users(
&self,
request: ListUsersRequest,
) -> impl Future<Output = Result<Vec<User>, ListUsersError>> + Send;
fn verify_user_password(
&self,
request: VerifyUserPasswordRequest,
) -> impl Future<Output = Result<User, VerifyUserPasswordError>> + Send;
fn create_auth_session(
&self,
request: CreateAuthSessionRequest,

View File

@@ -10,8 +10,9 @@ use crate::{
},
},
user::{
CreateUserError, CreateUserRequest, LoginUserError, LoginUserRequest,
LoginUserResponse, RegisterUserError, RegisterUserRequest, User,
CreateUserError, CreateUserRequest, ListUsersError, ListUsersRequest,
LoginUserError, LoginUserRequest, LoginUserResponse, RegisterUserError,
RegisterUserRequest, User,
},
user_warren::{
UserWarren,
@@ -165,6 +166,32 @@ where
result.map_err(AuthError::Custom)
}
async fn list_users(
&self,
request: AuthRequest<ListUsersRequest>,
) -> Result<Vec<User>, AuthError<ListUsersError>> {
let (session, request) = request.unpack();
let response = self
.fetch_auth_session(FetchAuthSessionRequest::new(session.session_id().clone()))
.await?;
if !response.user().admin() {
return Err(AuthError::InsufficientPermissions);
}
let result = self.repository.list_users(request).await;
if let Ok(users) = result.as_ref() {
self.metrics.record_user_list_success().await;
self.notifier.users_listed(response.user(), users).await;
} else {
self.metrics.record_user_list_failure().await;
}
result.map_err(AuthError::Custom)
}
async fn create_auth_session(
&self,
request: CreateAuthSessionRequest,

View File

@@ -0,0 +1,32 @@
use axum::{extract::State, http::StatusCode};
use crate::{
domain::warren::{
models::{
auth_session::AuthRequest,
user::{ListUsersRequest, User},
},
ports::{AuthService, WarrenService},
},
inbound::http::{
AppState,
handlers::{UserData, extractors::SessionIdHeader},
responses::{ApiError, ApiSuccess},
},
};
pub async fn list_users<WS: WarrenService, AS: AuthService>(
State(state): State<AppState<WS, AS>>,
SessionIdHeader(session): SessionIdHeader,
) -> Result<ApiSuccess<Vec<UserData>>, ApiError> {
state
.auth_service
.list_users(AuthRequest::new(session, ListUsersRequest::new()))
.await
.map(|users| ApiSuccess::new(StatusCode::OK, get_user_data(users)))
.map_err(ApiError::from)
}
fn get_user_data(users: Vec<User>) -> Vec<UserData> {
users.into_iter().map(Into::into).collect()
}

View File

@@ -1,7 +1,13 @@
mod create_user;
use create_user::create_user;
mod list_users;
use axum::{Router, routing::post};
use create_user::create_user;
use list_users::list_users;
use axum::{
Router,
routing::{get, post},
};
use crate::{
domain::warren::ports::{AuthService, WarrenService},
@@ -9,5 +15,7 @@ use crate::{
};
pub fn routes<WS: WarrenService, AS: AuthService>() -> Router<AppState<WS, AS>> {
Router::new().route("/users", post(create_user))
Router::new()
.route("/users", get(list_users))
.route("/users", post(create_user))
}

View File

@@ -10,7 +10,7 @@ pub mod warrens;
#[derive(Debug, Clone, Serialize, PartialEq)]
#[serde(rename_all = "camelCase")]
/// A session user that can be safely sent to the client
/// A user that can be safely sent to the client
pub(super) struct UserData {
id: Uuid,
name: String,

View File

@@ -145,6 +145,13 @@ impl AuthMetrics for MetricsDebugLogger {
tracing::debug!("[Metrics] User creation failed");
}
async fn record_user_list_success(&self) -> () {
tracing::debug!("[Metrics] User list succeeded");
}
async fn record_user_list_failure(&self) -> () {
tracing::debug!("[Metrics] User list failed");
}
async fn record_auth_session_creation_success(&self) {
tracing::debug!("[Metrics] Auth session creation succeeded");
}

View File

@@ -129,6 +129,14 @@ impl AuthNotifier for NotifierDebugLogger {
);
}
async fn users_listed(&self, user: &User, users: &Vec<User>) {
tracing::debug!(
"[Notifier] Admin user {} listed {} user(s)",
user.name(),
users.len()
);
}
async fn user_logged_in(&self, response: &LoginUserResponse) {
tracing::debug!("[Notifier] Logged in user {}", response.user().name());
}

View File

@@ -25,8 +25,8 @@ use crate::domain::warren::{
},
},
user::{
CreateUserError, CreateUserRequest, User, UserEmail, UserName, UserPassword,
VerifyUserPasswordError, VerifyUserPasswordRequest,
CreateUserError, CreateUserRequest, ListUsersError, ListUsersRequest, User, UserEmail,
UserName, UserPassword, VerifyUserPasswordError, VerifyUserPasswordRequest,
},
user_warren::{
UserWarren,
@@ -348,6 +348,21 @@ impl Postgres {
Ok(ids)
}
async fn fetch_users(&self, connection: &mut PgConnection) -> Result<Vec<User>, sqlx::Error> {
let users: Vec<User> = sqlx::query_as(
"
SELECT
*
FROM
users
",
)
.fetch_all(connection)
.await?;
Ok(users)
}
}
impl WarrenRepository for Postgres {
@@ -519,6 +534,21 @@ impl AuthRepository for Postgres {
}
})
}
async fn list_users(&self, _request: ListUsersRequest) -> Result<Vec<User>, ListUsersError> {
let mut connection = self
.pool
.acquire()
.await
.context("Failed to get a PostgreSQL connection")?;
let users = self
.fetch_users(&mut connection)
.await
.map_err(|e| anyhow!(e))?;
Ok(users)
}
}
fn is_not_found_error(err: &sqlx::Error) -> bool {