From 27054e7ee14a82a34f53ec15c12f4029b520dc2d Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sat, 13 Jun 2026 05:53:18 -0400 Subject: [PATCH] move error type --- .../common_responses/common_web_error.rs | 2 +- .../enqueue_face_fusion_workflow_handler.rs | 2 +- .../enqueue_live_portrait_workflow_handler.rs | 2 +- ...nqueue_gptsovits_model_download_handler.rs | 2 +- .../weights/update/update_weight_handler.rs | 2 +- .../user_session/require_user_session.rs | 23 ------------------- ..._user_session_extended_using_connection.rs | 19 ++++++++++++++- 7 files changed, 23 insertions(+), 29 deletions(-) diff --git a/crates/service/web/storyteller_web/src/http_server/common_responses/common_web_error.rs b/crates/service/web/storyteller_web/src/http_server/common_responses/common_web_error.rs index fb3d57b910..f607c47783 100644 --- a/crates/service/web/storyteller_web/src/http_server/common_responses/common_web_error.rs +++ b/crates/service/web/storyteller_web/src/http_server/common_responses/common_web_error.rs @@ -2,7 +2,7 @@ use std::fmt::{Display, Formatter}; use std::sync::Arc; use crate::http_server::session::session_checker_error::SessionCheckerError; -use crate::http_server::web_utils::user_session::require_user_session::RequireUserSessionError; +use crate::http_server::web_utils::user_session::require_user_session_extended_using_connection::RequireUserSessionError; use actix_artcraft::sessions::anonymous_visitor_tracking::avt_cookie_payload_error::AvtCookiePayloadError; use actix_artcraft::sessions::user_sessions::http_user_session_payload_error::HttpUserSessionPayloadError; use actix_http::StatusCode; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_face_fusion_workflow_handler.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_face_fusion_workflow_handler.rs index f33830238d..51044a75f2 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_face_fusion_workflow_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_face_fusion_workflow_handler.rs @@ -28,7 +28,7 @@ use crate::http_server::requests::request_headers::get_routing_tag_header::get_r use crate::http_server::requests::request_headers::has_debug_header::has_debug_header; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; -use crate::http_server::web_utils::user_session::require_user_session::RequireUserSessionError; +use crate::http_server::web_utils::user_session::require_user_session_extended_using_connection::RequireUserSessionError; use crate::http_server::web_utils::user_session::require_user_session_extended_using_connection::require_user_session_extended_using_connection; use crate::state::server_state::ServerState; use crate::util::cleaners::empty_media_file_token_to_null::empty_media_file_token_to_null; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_live_portrait_workflow_handler.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_live_portrait_workflow_handler.rs index 6925e7ed5c..91300d3ba4 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_live_portrait_workflow_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_live_portrait_workflow_handler.rs @@ -29,7 +29,7 @@ use crate::http_server::requests::request_headers::get_routing_tag_header::get_r use crate::http_server::requests::request_headers::has_debug_header::has_debug_header; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; -use crate::http_server::web_utils::user_session::require_user_session::RequireUserSessionError; +use crate::http_server::web_utils::user_session::require_user_session_extended_using_connection::RequireUserSessionError; use crate::http_server::web_utils::user_session::require_user_session_extended_using_connection::require_user_session_extended_using_connection; use crate::state::server_state::ServerState; use crate::util::cleaners::empty_media_file_token_to_null::empty_media_file_token_to_null; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/model_download/enqueue_gptsovits_model_download_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/model_download/enqueue_gptsovits_model_download_handler.rs index 4834597f48..50b812bccd 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/model_download/enqueue_gptsovits_model_download_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/model_download/enqueue_gptsovits_model_download_handler.rs @@ -28,7 +28,7 @@ use crate::http_server::requests::request_headers::get_routing_tag_header::get_r use crate::http_server::requests::request_headers::has_debug_header::has_debug_header; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; use crate::http_server::validations::validate_model_title::validate_model_title; -use crate::http_server::web_utils::user_session::require_user_session::RequireUserSessionError; +use crate::http_server::web_utils::user_session::require_user_session_extended_using_connection::RequireUserSessionError; use crate::http_server::web_utils::user_session::require_user_session_extended_using_connection::require_user_session_extended_using_connection; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/update/update_weight_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/update/update_weight_handler.rs index 9601823e71..98291b0999 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/update/update_weight_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/update/update_weight_handler.rs @@ -11,7 +11,7 @@ use utoipa::ToSchema; use crate::configs::supported_languages_for_models::{get_canonicalized_language_tag_for_model, get_primary_language_subtag}; use crate::http_server::common_responses::common_web_error::CommonWebError; -use crate::http_server::web_utils::user_session::require_user_session::RequireUserSessionError; +use crate::http_server::web_utils::user_session::require_user_session_extended_using_connection::RequireUserSessionError; use crate::http_server::web_utils::user_session::require_user_session_extended_using_connection::require_user_session_extended_using_connection; use crate::state::server_state::ServerState; use enums::by_table::media_files::media_file_type::MediaFileType; 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 c045ca7240..65cf5d2063 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 @@ -1,6 +1,3 @@ -use std::error::Error; -use std::fmt::{Display, Formatter}; - use actix_web::HttpRequest; use log::warn; use sqlx::{Executor, MySql}; @@ -10,26 +7,6 @@ use mysql_queries::queries::users::user_sessions::get_user_session_by_token::Ses 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, - NotAuthorized, -} - -impl Display for RequireUserSessionError { - fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { - match self { - Self::ServerError => write!(f, "ServerError"), - Self::NotAuthorized => write!(f, "NotAuthorized"), - } - } -} - -impl Error for RequireUserSessionError {} - /// `mysql_executor` can be any sqlx executor — pass `&server_state.mysql_pool` to grab a /// fresh connection, or an in-flight connection/transaction (`&mut *connection`) to reuse /// one the handler already holds. diff --git a/crates/service/web/storyteller_web/src/http_server/web_utils/user_session/require_user_session_extended_using_connection.rs b/crates/service/web/storyteller_web/src/http_server/web_utils/user_session/require_user_session_extended_using_connection.rs index 5e441483a8..2e4e718a7f 100644 --- a/crates/service/web/storyteller_web/src/http_server/web_utils/user_session/require_user_session_extended_using_connection.rs +++ b/crates/service/web/storyteller_web/src/http_server/web_utils/user_session/require_user_session_extended_using_connection.rs @@ -1,4 +1,5 @@ use std::error::Error; +use std::fmt::{Display, Formatter}; use actix_web::HttpRequest; use log::warn; @@ -8,7 +9,23 @@ use sqlx::MySql; use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; use crate::http_server::session::session_checker::SessionChecker; -use crate::http_server::web_utils::user_session::require_user_session::RequireUserSessionError; + +#[derive(Debug)] +pub enum RequireUserSessionError { + ServerError, + NotAuthorized, +} + +impl Display for RequireUserSessionError { + fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { + match self { + Self::ServerError => write!(f, "ServerError"), + Self::NotAuthorized => write!(f, "NotAuthorized"), + } + } +} + +impl Error for RequireUserSessionError {} pub async fn require_user_session_extended_using_connection( http_request: &HttpRequest,