From f1f9911748e93116f84bf858b3beaa532d5f4e46 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sat, 13 Jun 2026 05:48:43 -0400 Subject: [PATCH] return CommonWebError --- .../endpoints/beta_keys/list_beta_keys_handler.rs | 8 ++------ .../folders/folder/color_code_folder_handler.rs | 2 +- .../folders/folder/cover_image_folder_handler.rs | 2 +- .../folders/folder/create_folder_handler.rs | 2 +- .../folders/folder/delete_folder_handler.rs | 2 +- .../endpoints/folders/folder/get_folder_handler.rs | 2 +- .../endpoints/folders/folder/list_folders_handler.rs | 2 +- .../folders/folder/rename_folder_handler.rs | 2 +- .../endpoints/folders/folder/star_folder_handler.rs | 2 +- .../bulk_add_folder_media_files_handler.rs | 2 +- .../bulk_move_folder_media_files_handler.rs | 2 +- .../bulk_remove_folder_media_files_handler.rs | 2 +- .../media_files/list_folder_media_files_handler.rs | 2 +- .../folders/subfolder/bulk_add_subfolders_handler.rs | 2 +- .../subfolder/bulk_remove_subfolders_handler.rs | 2 +- .../folders/subfolder/list_subfolders_handler.rs | 2 +- .../edit/change_media_file_animation_type_handler.rs | 6 +----- .../change_media_file_engine_category_handler.rs | 6 +----- .../web_utils/user_session/require_user_session.rs | 12 ++++++++---- 19 files changed, 27 insertions(+), 35 deletions(-) diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/list_beta_keys_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/list_beta_keys_handler.rs index 6218263ed8..89cb21b91f 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/list_beta_keys_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/list_beta_keys_handler.rs @@ -17,7 +17,7 @@ use tokens::tokens::beta_keys::BetaKeyToken; use crate::http_server::common_responses::pagination_page::PaginationPage; use crate::http_server::common_responses::common_web_error::CommonWebError; use crate::http_server::common_responses::user_details_lite::UserDetailsLight; -use crate::http_server::web_utils::user_session::require_user_session::{require_user_session, RequireUserSessionError}; +use crate::http_server::web_utils::user_session::require_user_session::require_user_session; use crate::state::server_state::ServerState; #[derive(Copy, Clone, Deserialize, ToSchema)] @@ -109,11 +109,7 @@ pub async fn list_beta_keys_handler( server_state: web::Data> ) -> Result { let user_session = require_user_session(&http_request, &server_state.session_checker, &server_state.mysql_pool) - .await - .map_err(|err| match err { - RequireUserSessionError::ServerError => CommonWebError::from_error(err), - RequireUserSessionError::NotAuthorized => CommonWebError::NotAuthorized, - })?; + .await?; let mut is_mod = user_session.can_ban_users; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/color_code_folder_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/color_code_folder_handler.rs index 0b99b058e8..74082d579b 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/color_code_folder_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/color_code_folder_handler.rs @@ -47,7 +47,7 @@ pub async fn color_code_folder_handler( CommonWebError::from_error(err) })?; - let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await.map_err(|_| CommonWebError::NotAuthorized)?; + let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await?; // Normalize: trim, treat empty after trim as `None`. This lets clients // clear by passing `""` or by omitting the field entirely. diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/cover_image_folder_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/cover_image_folder_handler.rs index c466deb424..d08c5d9d3a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/cover_image_folder_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/cover_image_folder_handler.rs @@ -64,7 +64,7 @@ pub async fn cover_image_folder_handler( CommonWebError::from_error(err) })?; - let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await.map_err(|_| CommonWebError::NotAuthorized)?; + let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await?; // Confirm the folder exists + is owned. Authoritative 404 source. get_folder_for_owner(GetFolderForOwnerArgs { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/create_folder_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/create_folder_handler.rs index cf23720f4e..c0f21cfac0 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/create_folder_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/create_folder_handler.rs @@ -45,7 +45,7 @@ pub async fn create_folder_handler( CommonWebError::from_error(err) })?; - let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await.map_err(|_| CommonWebError::NotAuthorized)?; + let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await?; let name = request.name.trim().to_string(); diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/delete_folder_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/delete_folder_handler.rs index 92f29254ec..dcc099d654 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/delete_folder_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/delete_folder_handler.rs @@ -39,7 +39,7 @@ pub async fn delete_folder_handler( CommonWebError::from_error(err) })?; - let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await.map_err(|_| CommonWebError::NotAuthorized)?; + let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await?; let rows_affected = soft_delete_folder(SoftDeleteFolderArgs { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/get_folder_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/get_folder_handler.rs index 7116a779da..e065f67b2c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/get_folder_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/get_folder_handler.rs @@ -42,7 +42,7 @@ pub async fn get_folder_handler( CommonWebError::from_error(err) })?; - let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await.map_err(|_| CommonWebError::NotAuthorized)?; + let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await?; let row = get_folder_for_owner(GetFolderForOwnerArgs { folder_token: &path.folder_token, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/list_folders_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/list_folders_handler.rs index 32c969e4d9..4016e06d5d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/list_folders_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/list_folders_handler.rs @@ -48,7 +48,7 @@ pub async fn list_folders_handler( CommonWebError::from_error(err) })?; - let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await.map_err(|_| CommonWebError::NotAuthorized)?; + let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await?; let limit = query.limit.unwrap_or(DEFAULT_LIMIT).min(MAX_LIMIT); diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/rename_folder_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/rename_folder_handler.rs index 6bc2559635..97a785637c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/rename_folder_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/rename_folder_handler.rs @@ -47,7 +47,7 @@ pub async fn rename_folder_handler( CommonWebError::from_error(err) })?; - let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await.map_err(|_| CommonWebError::NotAuthorized)?; + let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await?; let new_name = request.new_name.trim().to_string(); diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/star_folder_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/star_folder_handler.rs index 3b0146ccf7..a393890e5a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/star_folder_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/folder/star_folder_handler.rs @@ -44,7 +44,7 @@ pub async fn star_folder_handler( CommonWebError::from_error(err) })?; - let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await.map_err(|_| CommonWebError::NotAuthorized)?; + let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await?; // Confirm the folder exists + is owned before issuing the update. // A 404 here is the authoritative "not found" signal — the update diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/media_files/bulk_add_folder_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/media_files/bulk_add_folder_media_files_handler.rs index 37745d2936..0bd375f7f7 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/media_files/bulk_add_folder_media_files_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/media_files/bulk_add_folder_media_files_handler.rs @@ -61,7 +61,7 @@ pub async fn bulk_add_folder_media_files_handler( CommonWebError::from_error(err) })?; - let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await.map_err(|_| CommonWebError::NotAuthorized)?; + let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await?; if request.media_file_tokens.len() > MAX_BULK { return Err(CommonWebError::BadInputWithSimpleMessage( diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/media_files/bulk_move_folder_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/media_files/bulk_move_folder_media_files_handler.rs index d72608b754..d14ee13773 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/media_files/bulk_move_folder_media_files_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/media_files/bulk_move_folder_media_files_handler.rs @@ -72,7 +72,7 @@ pub async fn bulk_move_folder_media_files_handler( CommonWebError::from_error(err) })?; - let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await.map_err(|_| CommonWebError::NotAuthorized)?; + let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await?; if request.media_file_tokens.len() > MAX_BULK { return Err(CommonWebError::BadInputWithSimpleMessage( diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/media_files/bulk_remove_folder_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/media_files/bulk_remove_folder_media_files_handler.rs index b7e6eef125..d002b0d050 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/media_files/bulk_remove_folder_media_files_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/media_files/bulk_remove_folder_media_files_handler.rs @@ -56,7 +56,7 @@ pub async fn bulk_remove_folder_media_files_handler( CommonWebError::from_error(err) })?; - let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await.map_err(|_| CommonWebError::NotAuthorized)?; + let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await?; if request.media_file_tokens.len() > MAX_BULK { return Err(CommonWebError::BadInputWithSimpleMessage( diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/media_files/list_folder_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/media_files/list_folder_media_files_handler.rs index 9fef065c5c..568cb69d62 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/media_files/list_folder_media_files_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/media_files/list_folder_media_files_handler.rs @@ -127,7 +127,7 @@ pub async fn list_folder_media_files_handler( CommonWebError::from_error(err) })?; - let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await.map_err(|_| CommonWebError::NotAuthorized)?; + let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await?; let folder = get_folder_for_owner(GetFolderForOwnerArgs { folder_token: &path.folder_token, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/subfolder/bulk_add_subfolders_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/subfolder/bulk_add_subfolders_handler.rs index 885a249c5c..c9f6ec1051 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/subfolder/bulk_add_subfolders_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/subfolder/bulk_add_subfolders_handler.rs @@ -58,7 +58,7 @@ pub async fn bulk_add_subfolders_handler( CommonWebError::from_error(err) })?; - let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await.map_err(|_| CommonWebError::NotAuthorized)?; + let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await?; if request.subfolder_tokens.len() > MAX_BULK { return Err(CommonWebError::BadInputWithSimpleMessage( diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/subfolder/bulk_remove_subfolders_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/subfolder/bulk_remove_subfolders_handler.rs index e90d9dd6a4..88eb6aecc6 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/subfolder/bulk_remove_subfolders_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/subfolder/bulk_remove_subfolders_handler.rs @@ -45,7 +45,7 @@ pub async fn bulk_remove_subfolders_handler( CommonWebError::from_error(err) })?; - let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await.map_err(|_| CommonWebError::NotAuthorized)?; + let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await?; if request.subfolder_tokens.len() > MAX_BULK { return Err(CommonWebError::BadInputWithSimpleMessage( diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/subfolder/list_subfolders_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/subfolder/list_subfolders_handler.rs index 811234f1f7..e3fae72cbf 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/folders/subfolder/list_subfolders_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/folders/subfolder/list_subfolders_handler.rs @@ -55,7 +55,7 @@ pub async fn list_subfolders_handler( CommonWebError::from_error(err) })?; - let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await.map_err(|_| CommonWebError::NotAuthorized)?; + let user_session = require_user_session(&http_request, &server_state.session_checker, &mut *conn).await?; // Confirm the parent exists + is owned by the caller before listing. diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_animation_type_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_animation_type_handler.rs index 4316b1a350..ffc66e7e5e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_animation_type_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_animation_type_handler.rs @@ -57,11 +57,7 @@ pub async fn change_media_file_animation_type_handler( ) -> Result, CommonWebError> { let user_session = require_user_session(&http_request, &server_state.session_checker, &server_state.mysql_pool) - .await - .map_err(|e| { - warn!("Not authorized: {:?}", e); - CommonWebError::NotAuthorized - })?; + .await?; let media_file_token = path.token.clone(); let is_mod = user_session.is_mod(); diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_engine_category_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_engine_category_handler.rs index 929aae0501..6ecda0dfc5 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_engine_category_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/change_media_file_engine_category_handler.rs @@ -54,11 +54,7 @@ pub async fn change_media_file_engine_category_handler( ) -> Result, CommonWebError> { let user_session = require_user_session(&http_request, &server_state.session_checker, &server_state.mysql_pool) - .await - .map_err(|e| { - warn!("Not authorized: {:?}", e); - CommonWebError::NotAuthorized - })?; + .await?; let media_file_token = path.token.clone(); let is_mod = user_session.is_mod(); diff --git a/crates/service/web/storyteller_web/src/http_server/web_utils/user_session/require_user_session.rs b/crates/service/web/storyteller_web/src/http_server/web_utils/user_session/require_user_session.rs index 13db7f8469..c045ca7240 100644 --- a/crates/service/web/storyteller_web/src/http_server/web_utils/user_session/require_user_session.rs +++ b/crates/service/web/storyteller_web/src/http_server/web_utils/user_session/require_user_session.rs @@ -7,8 +7,12 @@ use sqlx::{Executor, MySql}; use mysql_queries::queries::users::user_sessions::get_user_session_by_token::SessionUserRecord; +use crate::http_server::common_responses::common_web_error::CommonWebError; use crate::http_server::session::session_checker::SessionChecker; +// NB: `RequireUserSessionError` is retained because `require_user_session_extended_using_connection` +// (and `CommonWebError`'s `From` impl) still use it. `require_user_session` itself now returns +// `CommonWebError` directly, since that's what nearly every endpoint uses. #[derive(Debug)] pub enum RequireUserSessionError { ServerError, @@ -33,7 +37,7 @@ pub async fn require_user_session<'e, 'c : 'e, E>( http_request: &HttpRequest, session_checker: &SessionChecker, mysql_executor: E, -) -> Result +) -> Result where E: 'e + Executor<'c, Database = MySql> { let maybe_user_session = session_checker @@ -41,20 +45,20 @@ pub async fn require_user_session<'e, 'c : 'e, E>( .await .map_err(|e| { warn!("Session checker error: {:?}", e); - RequireUserSessionError::ServerError + CommonWebError::from_error(e) })?; let user_session = match maybe_user_session { Some(session) => session, None => { warn!("not logged in"); - return Err(RequireUserSessionError::NotAuthorized); + return Err(CommonWebError::NotAuthorized); } }; if user_session.is_banned { warn!("user is banned: {:?}", user_session.user_token.as_str()); - return Err(RequireUserSessionError::NotAuthorized); + return Err(CommonWebError::NotAuthorized); } Ok(user_session)