From 0b4e288a3e9fe4dac06de8586b131cb44653e2da Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 16 Jun 2026 01:53:13 -0400 Subject: [PATCH] refactor another module location --- .../src/billing/internal_session_cache_purge_impl.rs | 2 +- .../src/billing/stripe_internal_user_lookup_impl.rs | 2 +- .../src/configs/plans/get_correct_plan_for_session.rs | 4 ++-- .../src/http_server/common_responses/common_web_error.rs | 2 +- .../animation/enqueue_face_animation.rs | 2 +- .../animation/enqueue_rerender_animation.rs | 2 +- .../media_uploads/list_user_media_uploads_of_type.rs | 2 +- .../deprecated_endpoints/mocap/enqueue_mocapnet.rs | 2 +- .../workflows/enqueue/enqueue_studio_workflow_handler.rs | 2 +- .../enqueue_video_style_transfer_workflow_handler.rs | 2 +- .../workflows/enqueue_comfy_ui_handler.rs | 2 +- .../workflows/enqueue_video_style_transfer_handler.rs | 2 +- .../endpoints/api_keys/create_api_key_handler.rs | 2 +- .../endpoints/app_state/components/get_permissions.rs | 2 +- .../endpoints/app_state/components/get_premium_info.rs | 2 +- .../endpoints/app_state/components/get_user_info.rs | 2 +- .../endpoints/beta_keys/redeem_beta_key_handler.rs | 2 +- .../seedance_2p0_multi_function_video_gen_handler.rs | 2 +- .../moderator_edit_user_feature_flags_handler.rs | 2 +- .../moderator_list_user_feature_flags_handler.rs | 2 +- .../generate/image/omni_api_image_generate_handler.rs | 2 +- .../generate/video/omni_api_video_generate_handler.rs | 2 +- .../generate/image/omni_gen_image_generate_handler.rs | 2 +- .../generate/video/omni_gen_video_generate_handler.rs | 2 +- .../omni_gen/models/video/omni_gen_video_models_handler.rs | 2 +- .../endpoints/studio_gen2/enqueue_studio_gen2_handler.rs | 2 +- .../enqueue_infer_f5_tts_handler.rs | 2 +- .../enqueue_infer_tts_handler/enqueue_infer_tts_handler.rs | 2 +- .../user_referral_codes/create_referral_code_handler.rs | 2 +- .../src/http_server/endpoints/users/edit_profile_handler.rs | 2 +- .../src/http_server/endpoints/users/get_profile_handler.rs | 4 ++-- .../users/google_sso/handle_new_sso_account_for_new_user.rs | 2 +- .../src/http_server/endpoints/users/login_handler.rs | 2 +- .../src/http_server/endpoints/users/session_info_handler.rs | 4 ++-- .../endpoints/users/session_token_info_handler.rs | 2 +- .../voice_conversion/enqueue_seed_vc_inference_handler.rs | 2 +- crates/service/web/storyteller_web/src/http_server/mod.rs | 1 - .../src/http_server/user_lookup/user_session/mod.rs | 1 + .../user_lookup/user_session/require_moderator.rs | 2 +- .../user_lookup/user_session/require_user_session.rs | 2 +- .../user_session/require_user_session_extended.rs | 4 ++-- .../user_session/session_utils}/lookup/mod.rs | 0 .../session_utils}/lookup/user_session_extended.rs | 2 +- .../session_utils}/lookup/user_session_feature_flags.rs | 2 +- .../user_session/session_utils}/mod.rs | 0 .../user_session/session_utils}/session_checker.rs | 6 +++--- .../user_session/session_utils}/session_checker_error.rs | 0 .../web/storyteller_web/src/startup/build_dependencies.rs | 2 +- .../service/web/storyteller_web/src/state/server_state.rs | 2 +- .../src/util/allowed_explore_media_access.rs | 4 ++-- .../web/storyteller_web/src/util/allowed_studio_access.rs | 4 ++-- .../src/util/allowed_video_style_transfer_access.rs | 4 ++-- .../web/storyteller_web/src/util/enroll_in_studio.rs | 2 +- 53 files changed, 58 insertions(+), 58 deletions(-) rename crates/service/web/storyteller_web/src/http_server/{session => user_lookup/user_session/session_utils}/lookup/mod.rs (100%) rename crates/service/web/storyteller_web/src/http_server/{session => user_lookup/user_session/session_utils}/lookup/user_session_extended.rs (96%) rename crates/service/web/storyteller_web/src/http_server/{session => user_lookup/user_session/session_utils}/lookup/user_session_feature_flags.rs (98%) rename crates/service/web/storyteller_web/src/http_server/{session => user_lookup/user_session/session_utils}/mod.rs (100%) rename crates/service/web/storyteller_web/src/http_server/{session => user_lookup/user_session/session_utils}/session_checker.rs (96%) rename crates/service/web/storyteller_web/src/http_server/{session => user_lookup/user_session/session_utils}/session_checker_error.rs (100%) diff --git a/crates/service/web/storyteller_web/src/billing/internal_session_cache_purge_impl.rs b/crates/service/web/storyteller_web/src/billing/internal_session_cache_purge_impl.rs index 0ce99a31cc..bad5300e09 100644 --- a/crates/service/web/storyteller_web/src/billing/internal_session_cache_purge_impl.rs +++ b/crates/service/web/storyteller_web/src/billing/internal_session_cache_purge_impl.rs @@ -3,7 +3,7 @@ use actix_web::HttpRequest; use redis_caching::redis_ttl_cache::RedisTtlCache; use redis_common::redis_cache_keys::RedisCacheKeys; use user_traits_component::traits::internal_session_cache_purge::InternalSessionCachePurge; -use crate::http_server::session::session_checker::SessionChecker; +use crate::http_server::user_lookup::user_session::session_utils::session_checker::SessionChecker; pub struct InternalSessionCachePurgeImpl { session_checker: SessionChecker, diff --git a/crates/service/web/storyteller_web/src/billing/stripe_internal_user_lookup_impl.rs b/crates/service/web/storyteller_web/src/billing/stripe_internal_user_lookup_impl.rs index 21b88ece3e..112d38be06 100644 --- a/crates/service/web/storyteller_web/src/billing/stripe_internal_user_lookup_impl.rs +++ b/crates/service/web/storyteller_web/src/billing/stripe_internal_user_lookup_impl.rs @@ -1,4 +1,4 @@ -use crate::http_server::session::session_checker::SessionChecker; +use crate::http_server::user_lookup::user_session::session_utils::session_checker::SessionChecker; use actix_web::HttpRequest; use async_trait::async_trait; use chrono::Utc; diff --git a/crates/service/web/storyteller_web/src/configs/plans/get_correct_plan_for_session.rs b/crates/service/web/storyteller_web/src/configs/plans/get_correct_plan_for_session.rs index ba270e4e08..53d03d4c8b 100644 --- a/crates/service/web/storyteller_web/src/configs/plans/get_correct_plan_for_session.rs +++ b/crates/service/web/storyteller_web/src/configs/plans/get_correct_plan_for_session.rs @@ -5,7 +5,7 @@ use server_environment::ServerEnvironment; use crate::configs::plans::plan::Plan; use crate::configs::plans::plan_list::{DEVELOPMENT_PREMIUM_PLANS_BY_SLUG, FREE_LOGGED_IN_PLAN, FREE_LOGGED_OUT_PLAN, LOYALTY_PLANS_BY_SLUG, PRODUCTION_PREMIUM_PLANS_BY_SLUG}; -use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_extended::UserSessionExtended; /// Look up the most appropriate plan for the session. /// This will probably grow to include a lot of factors. @@ -70,7 +70,7 @@ pub mod tests { use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session; use crate::configs::plans::plan_list::{ALL_PLANS_BY_SLUG, FREE_LOGGED_IN_PLAN, FREE_LOGGED_OUT_PLAN}; - use crate::http_server::session::lookup::user_session_extended::{UserSessionExtended, UserSessionSubscriptionPlan}; + use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_extended::{UserSessionExtended, UserSessionSubscriptionPlan}; #[test] fn test_free_logged_out_plan() { 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 30e479da1d..5950132f59 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 @@ -1,7 +1,7 @@ use std::fmt::{Display, Formatter}; use std::sync::Arc; -use crate::http_server::session::session_checker_error::SessionCheckerError; +use crate::http_server::user_lookup::user_session::session_utils::session_checker_error::SessionCheckerError; 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/animation/enqueue_face_animation.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/animation/enqueue_face_animation.rs index 5ab75450df..4640768fe0 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/animation/enqueue_face_animation.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/animation/enqueue_face_animation.rs @@ -28,7 +28,7 @@ use tokens::tokens::voice_conversion_results::VoiceConversionResultToken; use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session; use crate::http_server::requests::request_headers::get_routing_tag_header::get_routing_tag_header; use crate::http_server::requests::request_headers::has_debug_header::has_debug_header; -use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_extended::UserSessionExtended; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/animation/enqueue_rerender_animation.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/animation/enqueue_rerender_animation.rs index 2cf1a7f268..a4aec6e1b7 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/animation/enqueue_rerender_animation.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/animation/enqueue_rerender_animation.rs @@ -10,7 +10,7 @@ use actix_web::http::StatusCode; use actix_web::{web, HttpRequest, HttpResponse}; use log::{info, warn}; -use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_extended::UserSessionExtended; use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/media_uploads/list_user_media_uploads_of_type.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/media_uploads/list_user_media_uploads_of_type.rs index 5df5d6218c..33f128c399 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/media_uploads/list_user_media_uploads_of_type.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/media_uploads/list_user_media_uploads_of_type.rs @@ -8,7 +8,7 @@ use actix_web::{web, HttpMessage, HttpRequest, HttpResponse}; use chrono::{DateTime, Utc}; use log::warn; -use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_extended::UserSessionExtended; use crate::http_server::common_responses::common_web_error::CommonWebError; use enums::by_table::media_uploads::media_upload_type::MediaUploadType; use enums::common::visibility::Visibility; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/mocap/enqueue_mocapnet.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/mocap/enqueue_mocapnet.rs index b1ec67e92b..0c1e4ad235 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/mocap/enqueue_mocapnet.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/mocap/enqueue_mocapnet.rs @@ -10,7 +10,7 @@ use actix_web::http::StatusCode; use actix_web::{web, HttpRequest, HttpResponse}; use log::{error, info, warn}; -use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_extended::UserSessionExtended; use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType; use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_studio_workflow_handler.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_studio_workflow_handler.rs index 9a08810a9b..1160309f4b 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_studio_workflow_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_studio_workflow_handler.rs @@ -36,7 +36,7 @@ use crate::http_server::deprecated_endpoints::workflows::enqueue::vst_common::vs use crate::http_server::deprecated_endpoints::workflows::enqueue::vst_common::vst_response::VstSuccessResponse; use crate::http_server::requests::request_headers::get_routing_tag_header::get_routing_tag_header; use crate::http_server::requests::request_headers::has_debug_header::has_debug_header; -use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_extended::UserSessionExtended; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; use crate::state::server_state::ServerState; use crate::util::allowed_video_style_transfer_access::allowed_video_style_transfer_access; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_video_style_transfer_workflow_handler.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_video_style_transfer_workflow_handler.rs index 1fa1a56b90..d2cb340ff5 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_video_style_transfer_workflow_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue/enqueue_video_style_transfer_workflow_handler.rs @@ -37,7 +37,7 @@ use crate::http_server::deprecated_endpoints::workflows::enqueue::vst_common::vs use crate::http_server::requests::get_request_domain_branding::{get_request_domain_branding, DomainBranding}; use crate::http_server::requests::request_headers::get_routing_tag_header::get_routing_tag_header; use crate::http_server::requests::request_headers::has_debug_header::has_debug_header; -use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_extended::UserSessionExtended; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; use crate::state::server_state::ServerState; use crate::util::allowed_video_style_transfer_access::allowed_video_style_transfer_access; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue_comfy_ui_handler.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue_comfy_ui_handler.rs index 60fd6bf04b..bdf2ac943d 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue_comfy_ui_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue_comfy_ui_handler.rs @@ -32,7 +32,7 @@ use crate::http_server::common_responses::common_web_error::CommonWebError; use crate::configs::plans::plan_category::PlanCategory; use crate::http_server::requests::request_headers::get_routing_tag_header::get_routing_tag_header; use crate::http_server::requests::request_headers::has_debug_header::has_debug_header; -use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_extended::UserSessionExtended; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; use crate::state::server_state::ServerState; use crate::util::allowed_video_style_transfer_access::allowed_video_style_transfer_access; diff --git a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue_video_style_transfer_handler.rs b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue_video_style_transfer_handler.rs index 1eeb8cc71c..eeacbde794 100644 --- a/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue_video_style_transfer_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/workflows/enqueue_video_style_transfer_handler.rs @@ -33,7 +33,7 @@ use crate::configs::plans::plan_category::PlanCategory; use crate::http_server::deprecated_endpoints::workflows::coordinate_workflow_args::{coordinate_workflow_args, CoordinatedWorkflowArgs}; use crate::http_server::requests::request_headers::get_routing_tag_header::get_routing_tag_header; use crate::http_server::requests::request_headers::has_debug_header::has_debug_header; -use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_extended::UserSessionExtended; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; use crate::state::server_state::ServerState; use crate::util::allowed_video_style_transfer_access::allowed_video_style_transfer_access; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/api_keys/create_api_key_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/api_keys/create_api_key_handler.rs index 5500f3e515..17ef253968 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/api_keys/create_api_key_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/api_keys/create_api_key_handler.rs @@ -10,7 +10,7 @@ use http_server_common::request::get_request_ip::get_request_ip; use mysql_queries::queries::api_keys::insert_api_key::{insert_api_key, InsertApiKeyArgs}; use crate::http_server::common_responses::common_web_error::CommonWebError; -use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_feature_flags::UserSessionFeatureFlags; use crate::http_server::user_lookup::user_session::require_user_session::require_user_session; use crate::state::server_state::ServerState; use crate::util::generate_api_key::generate_api_key; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/app_state/components/get_permissions.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/app_state/components/get_permissions.rs index 03576c44a7..46acef0c38 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/app_state/components/get_permissions.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/app_state/components/get_permissions.rs @@ -1,4 +1,4 @@ -use crate::http_server::session::lookup::user_session_extended::{UserSessionExtended, UserSessionRoleAndPermissions}; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_extended::{UserSessionExtended, UserSessionRoleAndPermissions}; use enums::by_table::users::user_feature_flag::UserFeatureFlag; use std::collections::BTreeSet; use utoipa::ToSchema; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/app_state/components/get_premium_info.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/app_state/components/get_premium_info.rs index e1e0bf5b73..e7e1dec145 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/app_state/components/get_premium_info.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/app_state/components/get_premium_info.rs @@ -1,4 +1,4 @@ -use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_extended::UserSessionExtended; use utoipa::ToSchema; #[derive(Serialize, ToSchema)] diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/app_state/components/get_user_info.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/app_state/components/get_user_info.rs index fcc5d8d322..6c4ed495a7 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/app_state/components/get_user_info.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/app_state/components/get_user_info.rs @@ -1,5 +1,5 @@ use crate::http_server::common_responses::user_details_lite::UserDefaultAvatarInfo; -use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_extended::UserSessionExtended; use tokens::tokens::users::UserToken; use utoipa::ToSchema; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/redeem_beta_key_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/redeem_beta_key_handler.rs index ef87ab27cf..43a1562ffd 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/redeem_beta_key_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/redeem_beta_key_handler.rs @@ -6,7 +6,7 @@ use log::warn; use utoipa::ToSchema; use crate::http_server::common_responses::common_web_error::CommonWebError; -use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_feature_flags::UserSessionFeatureFlags; use enums::by_table::beta_keys::beta_key_product::BetaKeyProduct; use enums::by_table::users::user_feature_flag::UserFeatureFlag; use http_server_common::request::get_request_ip::get_request_ip; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/seedance_2p0_multi_function_video_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/seedance_2p0_multi_function_video_gen_handler.rs index 2fd1b5f71b..c73ba5db45 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/seedance_2p0_multi_function_video_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/seedance_2p0_multi_function_video_gen_handler.rs @@ -6,7 +6,7 @@ use crate::http_server::common_responses::common_web_error::CommonWebError; use crate::http_server::endpoint_helpers::refund_wallet_after_api_failure::refund_wallet_after_api_failure; use crate::http_server::endpoints::generate::common::map_seedance2pro_web_errors::map_seedance2pro_error_to_web_error; use crate::http_server::endpoints::generate::common::payments_error_test::payments_error_test; -use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_feature_flags::UserSessionFeatureFlags; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; use crate::http_server::web_utils::get_request_platform_type::get_request_platform_type; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_feature_flags/moderator_edit_user_feature_flags_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_feature_flags/moderator_edit_user_feature_flags_handler.rs index b405e10bda..d0c60b0929 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_feature_flags/moderator_edit_user_feature_flags_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_feature_flags/moderator_edit_user_feature_flags_handler.rs @@ -23,7 +23,7 @@ use mysql_queries::queries::users::user::update::set_user_feature_flags::{set_us use mysql_queries::queries::users::user_profiles::get_user_profile_by_token::get_user_profile_by_token; use tokens::tokens::users::UserToken; -use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_feature_flags::UserSessionFeatureFlags; use crate::http_server::common_responses::common_web_error::CommonWebError; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::user_lookup::user_session::require_moderator::require_moderator; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_feature_flags/moderator_list_user_feature_flags_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_feature_flags/moderator_list_user_feature_flags_handler.rs index ecade330cb..5c7b5442d4 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_feature_flags/moderator_list_user_feature_flags_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_feature_flags/moderator_list_user_feature_flags_handler.rs @@ -11,7 +11,7 @@ use mysql_queries::queries::users::user_profiles::get_user_profile_by_token::get use tokens::tokens::users::UserToken; use crate::http_server::common_responses::common_web_error::CommonWebError; -use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_feature_flags::UserSessionFeatureFlags; use crate::http_server::user_lookup::user_session::require_moderator::require_moderator; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_api/generate/image/omni_api_image_generate_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_api/generate/image/omni_api_image_generate_handler.rs index 77811495f8..ff52603ba1 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_api/generate/image/omni_api_image_generate_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_api/generate/image/omni_api_image_generate_handler.rs @@ -33,7 +33,7 @@ use crate::http_server::endpoints::omni_api::generate::image::insert_db_job::ins use crate::http_server::endpoints::omni_api::generate::image::insert_db_job::insert_seedance2pro_jobs::{insert_seedance2pro_jobs, InsertSeedance2proJobsArgs}; use crate::http_server::endpoints::omni_api::generate::image::insert_db_job::shared_job_args::SharedJobArgs; use crate::http_server::endpoints::omni_api::generate::image::pipeline_v2::run_pipeline_v2::{run_pipeline_v2, RunPipelineV2Args}; -use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_feature_flags::UserSessionFeatureFlags; use crate::http_server::user_lookup::api_keys::require_api_key_user::require_api_key_user; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_api/generate/video/omni_api_video_generate_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_api/generate/video/omni_api_video_generate_handler.rs index 1594305c47..c7f3ae5a7c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_api/generate/video/omni_api_video_generate_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_api/generate/video/omni_api_video_generate_handler.rs @@ -42,7 +42,7 @@ use crate::http_server::endpoints::omni_api::generate::video::insert_db_job::sha use crate::http_server::endpoints::omni_api::generate::video::kinovi_account::KinoviAccount; use crate::http_server::endpoints::omni_api::generate::video::pipeline_v2::run_pipeline_v2::{run_pipeline_v2, RunPipelineV2Args}; use crate::http_server::endpoints::omni_api::shared_utils::video::validate_video_request::validate_video_request; -use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_feature_flags::UserSessionFeatureFlags; use crate::http_server::user_lookup::api_keys::require_api_key_user::require_api_key_user; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/image/omni_gen_image_generate_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/image/omni_gen_image_generate_handler.rs index c874a4fb71..94abe1ee5f 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/image/omni_gen_image_generate_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/image/omni_gen_image_generate_handler.rs @@ -32,7 +32,7 @@ use crate::http_server::endpoints::omni_gen::generate::image::insert_db_job::ins use crate::http_server::endpoints::omni_gen::generate::image::insert_db_job::insert_seedance2pro_jobs::{insert_seedance2pro_jobs, InsertSeedance2proJobsArgs}; use crate::http_server::endpoints::omni_gen::generate::image::insert_db_job::shared_job_args::SharedJobArgs; use crate::http_server::endpoints::omni_gen::generate::image::pipeline_v2::run_pipeline_v2::{run_pipeline_v2, RunPipelineV2Args}; -use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_feature_flags::UserSessionFeatureFlags; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; use crate::http_server::web_utils::get_request_platform_type::get_request_platform_type; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/omni_gen_video_generate_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/omni_gen_video_generate_handler.rs index 9824680a02..40f867d6e0 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/omni_gen_video_generate_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/omni_gen_video_generate_handler.rs @@ -41,7 +41,7 @@ use crate::http_server::endpoints::omni_gen::generate::video::insert_db_job::sha use crate::http_server::endpoints::omni_gen::generate::video::kinovi_account::KinoviAccount; use crate::http_server::endpoints::omni_gen::generate::video::pipeline_v2::run_pipeline_v2::{run_pipeline_v2, RunPipelineV2Args}; use crate::http_server::endpoints::omni_gen::shared_utils::video::validate_video_request::validate_video_request; -use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_feature_flags::UserSessionFeatureFlags; use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format; use crate::http_server::web_utils::get_request_platform_type::get_request_platform_type; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/models/video/omni_gen_video_models_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/models/video/omni_gen_video_models_handler.rs index 9769eb23af..d50f5f7c48 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/models/video/omni_gen_video_models_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/models/video/omni_gen_video_models_handler.rs @@ -2,7 +2,7 @@ use std::sync::Arc; use crate::configs::omni_gen::video_models::OMNI_GEN_VIDEO_MODELS_AND_PROVIDERS; use crate::http_server::common_responses::common_web_error::CommonWebError; -use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_feature_flags::UserSessionFeatureFlags; use crate::state::server_state::ServerState; use actix_web::web::{Json, Query}; use actix_web::{web, HttpRequest}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/studio_gen2/enqueue_studio_gen2_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/studio_gen2/enqueue_studio_gen2_handler.rs index d36e35375a..5c976c6a51 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/studio_gen2/enqueue_studio_gen2_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/studio_gen2/enqueue_studio_gen2_handler.rs @@ -30,7 +30,7 @@ use crate::http_server::common_responses::common_web_error::CommonWebError; use crate::configs::plans::plan_category::PlanCategory; use crate::http_server::requests::request_headers::get_routing_tag_header::get_routing_tag_header; use crate::http_server::requests::request_headers::has_debug_header::has_debug_header; -use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_extended::UserSessionExtended; 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::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_f5_tts_handler/enqueue_infer_f5_tts_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_f5_tts_handler/enqueue_infer_f5_tts_handler.rs index db07766eed..925aa3002e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_f5_tts_handler/enqueue_infer_f5_tts_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_f5_tts_handler/enqueue_infer_f5_tts_handler.rs @@ -37,7 +37,7 @@ use crate::configs::app_startup::username_set::UsernameSet; use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session; use crate::configs::plans::plan::Plan; use crate::http_server::deprecated_endpoints::investor_demo::demo_cookie::request_has_demo_cookie; -use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_extended::UserSessionExtended; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts_handler/enqueue_infer_tts_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts_handler/enqueue_infer_tts_handler.rs index ac186f5ef4..17ff4aa849 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts_handler/enqueue_infer_tts_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts_handler/enqueue_infer_tts_handler.rs @@ -38,7 +38,7 @@ use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_se use crate::configs::plans::plan::Plan; use crate::http_server::deprecated_endpoints::investor_demo::demo_cookie::request_has_demo_cookie; use crate::http_server::endpoints::tts::enqueue_infer_tts_handler::get_tts_model_with_caching::get_tts_model_with_caching; -use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_extended::UserSessionExtended; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/user_referral_codes/create_referral_code_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/user_referral_codes/create_referral_code_handler.rs index 1ec2a043a2..14d464da1d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/user_referral_codes/create_referral_code_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/user_referral_codes/create_referral_code_handler.rs @@ -7,7 +7,7 @@ use utoipa::ToSchema; use artcraft_api_defs::user_referral_codes::create_referral_code::{CreateReferralCodeRequest, CreateReferralCodeResponse}; use crate::http_server::common_responses::common_web_error::CommonWebError; -use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_feature_flags::UserSessionFeatureFlags; use crate::state::server_state::ServerState; use mysql_queries::errors::database_insert_error::DatabaseInsertError; use mysql_queries::queries::user_referral_codes::create_referral_code::{create_referral_code, CreateReferralCodeArgs}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/users/edit_profile_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/users/edit_profile_handler.rs index 6c7a63a675..4cb136a50d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/users/edit_profile_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/users/edit_profile_handler.rs @@ -21,7 +21,7 @@ use redis_caching::redis_ttl_cache::RedisTtlCache; use redis_common::redis_cache_keys::RedisCacheKeys; use user_input_common::check_for_slurs::contains_slurs; -use crate::http_server::session::session_checker::SessionChecker; +use crate::http_server::user_lookup::user_session::session_utils::session_checker::SessionChecker; use crate::http_server::common_responses::common_web_error::CommonWebError; use crate::http_server::validations::validate_profile_cashapp_username::{normalize_cashapp_username_for_storage, validate_profile_cashapp_username}; use crate::http_server::validations::validate_profile_discord_username::validate_profile_discord_username; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/users/get_profile_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/users/get_profile_handler.rs index 0e97ffedd8..b9b263b046 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/users/get_profile_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/users/get_profile_handler.rs @@ -27,8 +27,8 @@ use crate::http_server::common_responses::user_avatars::default_avatar_color_fro use crate::http_server::common_responses::common_web_error::CommonWebError; use crate::http_server::common_responses::user_avatars::default_avatar_from_username::default_avatar_from_username; use crate::http_server::common_responses::user_details_lite::UserDetailsLight; -use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; -use crate::http_server::session::session_checker::SessionChecker; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_feature_flags::UserSessionFeatureFlags; +use crate::http_server::user_lookup::user_session::session_utils::session_checker::SessionChecker; // TODO: This is duplicated in query_user_profile diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/users/google_sso/handle_new_sso_account_for_new_user.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/users/google_sso/handle_new_sso_account_for_new_user.rs index bce507df70..e099b62b55 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/users/google_sso/handle_new_sso_account_for_new_user.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/users/google_sso/handle_new_sso_account_for_new_user.rs @@ -1,6 +1,6 @@ use crate::http_server::common_responses::common_web_error::CommonWebError; use crate::http_server::endpoints::users::google_sso::handle_new_sso_account::NewSsoAccountInfo; -use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_feature_flags::UserSessionFeatureFlags; use actix_artcraft::requests::get_request_signup_source_enum::get_request_signup_source_enum; use actix_web::HttpRequest; use enums::by_table::users::user_feature_flag::UserFeatureFlag; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/users/login_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/users/login_handler.rs index 64fb92182b..07138b04eb 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/users/login_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/users/login_handler.rs @@ -33,7 +33,7 @@ use utoipa::ToSchema; use artcraft_api_defs::users::login::{LoginErrorType, LoginRequest, LoginSuccessResponse}; use password::errors::password_confirm_error::PasswordConfirmError; use tokens::tokens::users::UserToken; -use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_feature_flags::UserSessionFeatureFlags; use crate::util::enroll_in_studio::enroll_in_studio; #[derive(Serialize, Debug, ToSchema)] diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/users/session_info_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/users/session_info_handler.rs index c3ca810b8a..e34ac72f37 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/users/session_info_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/users/session_info_handler.rs @@ -13,8 +13,8 @@ use enums::by_table::users::user_feature_flag::UserFeatureFlag; use crate::http_server::common_responses::common_web_error::CommonWebError; use crate::http_server::common_responses::user_details_lite_builder::UserDetailsLightBuilder; use actix_artcraft::sessions::anonymous_visitor_tracking::avt_cookie_manager::AvtCookieManager; -use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; -use crate::http_server::session::session_checker::SessionChecker; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_feature_flags::UserSessionFeatureFlags; +use crate::http_server::user_lookup::user_session::session_utils::session_checker::SessionChecker; #[utoipa::path( get, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/users/session_token_info_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/users/session_token_info_handler.rs index 3b40181675..2925297e7c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/users/session_token_info_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/users/session_token_info_handler.rs @@ -10,7 +10,7 @@ use utoipa::ToSchema; use http_server_common::response::response_error_helpers::to_simple_json_error; -use crate::http_server::session::session_checker::SessionChecker; +use crate::http_server::user_lookup::user_session::session_utils::session_checker::SessionChecker; use crate::http_server::common_responses::common_web_error::CommonWebError; use crate::state::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/enqueue_seed_vc_inference_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/enqueue_seed_vc_inference_handler.rs index 34659709da..6059dee028 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/enqueue_seed_vc_inference_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/enqueue_seed_vc_inference_handler.rs @@ -30,7 +30,7 @@ use crate::configs::app_startup::username_set::UsernameSet; use crate::http_server::common_responses::common_web_error::CommonWebError; use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session; use crate::http_server::deprecated_endpoints::investor_demo::demo_cookie::request_has_demo_cookie; -use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_extended::UserSessionExtended; use crate::state::server_state::ServerState; // TODO: Temporary for investor demo diff --git a/crates/service/web/storyteller_web/src/http_server/mod.rs b/crates/service/web/storyteller_web/src/http_server/mod.rs index c4aeed0e92..2bc90b5c60 100644 --- a/crates/service/web/storyteller_web/src/http_server/mod.rs +++ b/crates/service/web/storyteller_web/src/http_server/mod.rs @@ -6,7 +6,6 @@ pub mod endpoints; pub mod middleware; pub mod requests; pub mod routes; -pub mod session; pub mod user_lookup; pub mod validations; pub mod web_utils; \ No newline at end of file diff --git a/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/mod.rs b/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/mod.rs index 446fa123d5..af5848741f 100644 --- a/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/mod.rs +++ b/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/mod.rs @@ -1,3 +1,4 @@ pub mod require_moderator; pub mod require_user_session; pub mod require_user_session_extended; +pub mod session_utils; diff --git a/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/require_moderator.rs b/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/require_moderator.rs index 69466b4e1a..b9cb4bb7a1 100644 --- a/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/require_moderator.rs +++ b/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/require_moderator.rs @@ -5,7 +5,7 @@ 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; +use crate::http_server::user_lookup::user_session::session_utils::session_checker::SessionChecker; /// `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 diff --git a/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/require_user_session.rs b/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/require_user_session.rs index 65cf5d2063..57c48b3bf9 100644 --- a/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/require_user_session.rs +++ b/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/require_user_session.rs @@ -5,7 +5,7 @@ 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; +use crate::http_server::user_lookup::user_session::session_utils::session_checker::SessionChecker; /// `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 diff --git a/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/require_user_session_extended.rs b/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/require_user_session_extended.rs index 2bc037be10..a4c1fb1791 100644 --- a/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/require_user_session_extended.rs +++ b/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/require_user_session_extended.rs @@ -3,8 +3,8 @@ use log::warn; use sqlx::MySqlConnection; use crate::http_server::common_responses::common_web_error::CommonWebError; -use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; -use crate::http_server::session::session_checker::SessionChecker; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_extended::UserSessionExtended; +use crate::http_server::user_lookup::user_session::session_utils::session_checker::SessionChecker; /// Pass an in-flight connection (`&mut *connection`) to reuse one the handler already holds. /// (The extended lookup runs two queries, so it takes a concrete `&mut MySqlConnection` — which diff --git a/crates/service/web/storyteller_web/src/http_server/session/lookup/mod.rs b/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/session_utils/lookup/mod.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/session/lookup/mod.rs rename to crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/session_utils/lookup/mod.rs diff --git a/crates/service/web/storyteller_web/src/http_server/session/lookup/user_session_extended.rs b/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/session_utils/lookup/user_session_extended.rs similarity index 96% rename from crates/service/web/storyteller_web/src/http_server/session/lookup/user_session_extended.rs rename to crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/session_utils/lookup/user_session_extended.rs index cb2c56cb61..ee8dcae790 100644 --- a/crates/service/web/storyteller_web/src/http_server/session/lookup/user_session_extended.rs +++ b/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/session_utils/lookup/user_session_extended.rs @@ -3,7 +3,7 @@ use enums::common::payments_namespace::PaymentsNamespace; use enums::common::visibility::Visibility; use tokens::tokens::users::UserToken; -use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_feature_flags::UserSessionFeatureFlags; #[derive(Clone, Default)] pub struct UserSessionExtended { diff --git a/crates/service/web/storyteller_web/src/http_server/session/lookup/user_session_feature_flags.rs b/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/session_utils/lookup/user_session_feature_flags.rs similarity index 98% rename from crates/service/web/storyteller_web/src/http_server/session/lookup/user_session_feature_flags.rs rename to crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/session_utils/lookup/user_session_feature_flags.rs index 0f2e711b20..7db883bd1d 100644 --- a/crates/service/web/storyteller_web/src/http_server/session/lookup/user_session_feature_flags.rs +++ b/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/session_utils/lookup/user_session_feature_flags.rs @@ -113,7 +113,7 @@ mod tests { use enums::by_table::users::user_feature_flag::UserFeatureFlag; - use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; + use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_feature_flags::UserSessionFeatureFlags; mod construction { use super::*; diff --git a/crates/service/web/storyteller_web/src/http_server/session/mod.rs b/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/session_utils/mod.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/session/mod.rs rename to crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/session_utils/mod.rs diff --git a/crates/service/web/storyteller_web/src/http_server/session/session_checker.rs b/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/session_utils/session_checker.rs similarity index 96% rename from crates/service/web/storyteller_web/src/http_server/session/session_checker.rs rename to crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/session_utils/session_checker.rs index a1961a078d..2e0c0fa98d 100644 --- a/crates/service/web/storyteller_web/src/http_server/session/session_checker.rs +++ b/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/session_utils/session_checker.rs @@ -14,9 +14,9 @@ use redis_common::redis_cache_keys::RedisCacheKeys; use sqlx::pool::PoolConnection; use sqlx::{Executor, MySql, MySqlConnection, MySqlPool}; -use crate::http_server::session::lookup::user_session_extended::{UserSessionExtended, UserSessionPreferences, UserSessionPremiumPlanInfo, UserSessionRoleAndPermissions, UserSessionSubscriptionPlan, UserSessionUserDetails}; -use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; -use crate::http_server::session::session_checker_error::SessionCheckerError; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_extended::{UserSessionExtended, UserSessionPreferences, UserSessionPremiumPlanInfo, UserSessionRoleAndPermissions, UserSessionSubscriptionPlan, UserSessionUserDetails}; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_feature_flags::UserSessionFeatureFlags; +use crate::http_server::user_lookup::user_session::session_utils::session_checker_error::SessionCheckerError; #[derive(Clone)] pub struct SessionChecker { diff --git a/crates/service/web/storyteller_web/src/http_server/session/session_checker_error.rs b/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/session_utils/session_checker_error.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/session/session_checker_error.rs rename to crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/session_utils/session_checker_error.rs diff --git a/crates/service/web/storyteller_web/src/startup/build_dependencies.rs b/crates/service/web/storyteller_web/src/startup/build_dependencies.rs index a2ed3b4a4a..4f35e1545c 100644 --- a/crates/service/web/storyteller_web/src/startup/build_dependencies.rs +++ b/crates/service/web/storyteller_web/src/startup/build_dependencies.rs @@ -26,7 +26,7 @@ use url_config::third_party_url_redirector::ThirdPartyUrlRedirector; use crate::configs::app_startup::redis_rate_limiters::configure_redis_rate_limiters; use crate::configs::connect_to_database::connect_to_database; use crate::configs::static_api_tokens::StaticApiTokenSet; -use crate::http_server::session::session_checker::SessionChecker; +use crate::http_server::user_lookup::user_session::session_utils::session_checker::SessionChecker; use crate::http_server::web_utils::scoped_temp_dir_creator::ScopedTempDirCreator; use crate::startup::setup_pager::build_pager; use crate::startup::setup_bans::{ diff --git a/crates/service/web/storyteller_web/src/state/server_state.rs b/crates/service/web/storyteller_web/src/state/server_state.rs index ac1ff64572..64bccf990a 100644 --- a/crates/service/web/storyteller_web/src/state/server_state.rs +++ b/crates/service/web/storyteller_web/src/state/server_state.rs @@ -6,7 +6,7 @@ use crate::http_server::endpoints::media_files::list::list_featured_media_files_ use crate::http_server::endpoints::stats::result_transformer::CacheableQueueStats; use crate::http_server::endpoints::tts::list_tts_models::TtsModelRecordForResponse; use crate::http_server::endpoints::voice_conversion::list_voice_conversion_models_handler::VoiceConversionModel; -use crate::http_server::session::session_checker::SessionChecker; +use crate::http_server::user_lookup::user_session::session_utils::session_checker::SessionChecker; use crate::http_server::web_utils::redis_rate_limiter::RedisRateLimiter; use crate::http_server::web_utils::scoped_temp_dir_creator::ScopedTempDirCreator; use crate::startup::setup_inference_providers::InferenceProviders; diff --git a/crates/service/web/storyteller_web/src/util/allowed_explore_media_access.rs b/crates/service/web/storyteller_web/src/util/allowed_explore_media_access.rs index 2deba14b88..0f86b68b1a 100644 --- a/crates/service/web/storyteller_web/src/util/allowed_explore_media_access.rs +++ b/crates/service/web/storyteller_web/src/util/allowed_explore_media_access.rs @@ -1,7 +1,7 @@ use enums::by_table::users::user_feature_flag::UserFeatureFlag; use mysql_queries::queries::users::user_sessions::get_user_session_by_token::SessionUserRecord; -use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; -use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_extended::UserSessionExtended; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_feature_flags::UserSessionFeatureFlags; /// Check whether we should allow the request access to explore media. pub fn allowed_explore_media_access(maybe_session: Option) -> bool { diff --git a/crates/service/web/storyteller_web/src/util/allowed_studio_access.rs b/crates/service/web/storyteller_web/src/util/allowed_studio_access.rs index 475e2a0b67..2f9b19b482 100644 --- a/crates/service/web/storyteller_web/src/util/allowed_studio_access.rs +++ b/crates/service/web/storyteller_web/src/util/allowed_studio_access.rs @@ -1,7 +1,7 @@ use enums::by_table::users::user_feature_flag::UserFeatureFlag; use mysql_queries::queries::users::user_sessions::get_user_session_by_token::SessionUserRecord; -use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; -use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_extended::UserSessionExtended; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_feature_flags::UserSessionFeatureFlags; use crate::state::server_state::StaticFeatureFlags; diff --git a/crates/service/web/storyteller_web/src/util/allowed_video_style_transfer_access.rs b/crates/service/web/storyteller_web/src/util/allowed_video_style_transfer_access.rs index c64f78d113..b7a82653ac 100644 --- a/crates/service/web/storyteller_web/src/util/allowed_video_style_transfer_access.rs +++ b/crates/service/web/storyteller_web/src/util/allowed_video_style_transfer_access.rs @@ -1,7 +1,7 @@ use enums::by_table::users::user_feature_flag::UserFeatureFlag; use mysql_queries::queries::users::user_sessions::get_user_session_by_token::SessionUserRecord; -use crate::http_server::session::lookup::user_session_extended::UserSessionExtended; -use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_extended::UserSessionExtended; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_feature_flags::UserSessionFeatureFlags; use crate::state::server_state::StaticFeatureFlags; diff --git a/crates/service/web/storyteller_web/src/util/enroll_in_studio.rs b/crates/service/web/storyteller_web/src/util/enroll_in_studio.rs index 31f51806a7..3bf422ec42 100644 --- a/crates/service/web/storyteller_web/src/util/enroll_in_studio.rs +++ b/crates/service/web/storyteller_web/src/util/enroll_in_studio.rs @@ -7,7 +7,7 @@ use mysql_queries::queries::users::user::update::set_can_access_studio_transacti use mysql_queries::queries::users::user::update::set_user_feature_flags_transactional::{set_user_feature_flags_transactional, SetUserFeatureFlagTransactionalArgs}; use tokens::tokens::users::UserToken; -use crate::http_server::session::lookup::user_session_feature_flags::UserSessionFeatureFlags; +use crate::http_server::user_lookup::user_session::session_utils::lookup::user_session_feature_flags::UserSessionFeatureFlags; pub async fn enroll_in_studio( user_token: &UserToken,