diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/create_beta_keys_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/create_beta_keys_handler.rs index 60a73fcd9b..56279f59db 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/create_beta_keys_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/create_beta_keys_handler.rs @@ -60,7 +60,7 @@ pub async fn create_beta_keys_handler( server_state: web::Data>, ) -> Result { - let user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool) + let user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool) .await .map_err(|err| match err { RequireModeratorError::ServerError => CommonWebError::from_error(err), diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/edit_beta_key_distributed_flag_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/edit_beta_key_distributed_flag_handler.rs index 186edb0087..fd571432c4 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/edit_beta_key_distributed_flag_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/edit_beta_key_distributed_flag_handler.rs @@ -58,7 +58,7 @@ pub async fn edit_beta_key_distributed_flag_handler( server_state: web::Data>, ) -> Result { - let user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool) + let user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool) .await .map_err(|err| match err { RequireModeratorError::ServerError => CommonWebError::from_error(err), diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/edit_beta_key_note_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/edit_beta_key_note_handler.rs index f2d5eb189d..b74bf9632e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/edit_beta_key_note_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/beta_keys/edit_beta_key_note_handler.rs @@ -57,7 +57,7 @@ pub async fn edit_beta_key_note_handler( server_state: web::Data>, ) -> Result { - let user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool) + let user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool) .await .map_err(|err| match err { RequireModeratorError::ServerError => CommonWebError::from_error(err), diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_pmx/upload_pmx_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_pmx/upload_pmx_media_file_handler.rs index 249aabb4c6..c6f8ef2c21 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_pmx/upload_pmx_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_pmx/upload_pmx_media_file_handler.rs @@ -115,7 +115,7 @@ pub async fn upload_pmx_media_file_handler( // ==================== READ SESSION ==================== // // NB: We require a moderator to upload PMX files. - let user_session = require_moderator(&http_request, &server_state, &mut *mysql_connection) + let user_session = require_moderator(&http_request, &server_state.session_checker, &mut *mysql_connection) .await .map_err(|err| match err { RequireModeratorError::ServerError => MediaFileUploadError::ServerError, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/alerts/moderation_send_alert_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/alerts/moderation_send_alert_handler.rs index 02461d7bf9..10c031642a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/alerts/moderation_send_alert_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/alerts/moderation_send_alert_handler.rs @@ -35,7 +35,7 @@ pub async fn moderation_send_alert_handler( server_state: web::Data>, ) -> Result, CommonWebError> { - let user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool) + let user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool) .await .map_err(|err| { warn!("Moderator check failed: {:?}", err); diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/debug_logs/moderation_list_debug_logs_for_token_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/debug_logs/moderation_list_debug_logs_for_token_handler.rs index 95c8e4c1b0..f3d965a0fb 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/debug_logs/moderation_list_debug_logs_for_token_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/debug_logs/moderation_list_debug_logs_for_token_handler.rs @@ -72,7 +72,7 @@ pub async fn moderation_list_debug_logs_for_token_handler( query: web::Query, server_state: web::Data>, ) -> Result, CommonWebError> { - let _user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool).await.map_err(|err| { + let _user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool).await.map_err(|err| { warn!("Moderator check failed: {:?}", err); CommonWebError::NotAuthorized })?; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/info/moderator_token_info_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/info/moderator_token_info_handler.rs index 5cc7fd789a..1d68ad087a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/info/moderator_token_info_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/info/moderator_token_info_handler.rs @@ -60,7 +60,7 @@ pub async fn moderator_get_token_info_handler( server_state: web::Data> ) -> Result { - let user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool) + let user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool) .await .map_err(|err| match err { RequireModeratorError::ServerError => CommonWebError::from_error(err), diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/moderation_get_job_by_token_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/moderation_get_job_by_token_handler.rs index 9ad2925906..65753eac80 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/moderation_get_job_by_token_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/moderation_get_job_by_token_handler.rs @@ -90,7 +90,7 @@ pub async fn moderation_get_job_by_token_handler( path: web::Path, server_state: web::Data>, ) -> Result, CommonWebError> { - let _user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool).await.map_err(|err| { + let _user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool).await.map_err(|err| { warn!("Moderator check failed: {:?}", err); CommonWebError::NotAuthorized })?; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/user/list_user_jobs_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/user/list_user_jobs_handler.rs index a2fd48e542..2a2195112e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/user/list_user_jobs_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/user/list_user_jobs_handler.rs @@ -36,7 +36,7 @@ pub async fn list_user_jobs_handler( server_state: web::Data>, ) -> Result, CommonWebError> { - let _user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool) + let _user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool) .await .map_err(|_| CommonWebError::NotAuthorized)?; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/staff_audit_logs/moderator_list_staff_audit_logs_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/staff_audit_logs/moderator_list_staff_audit_logs_handler.rs index 9aca4c940a..f0aeb83dd6 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/staff_audit_logs/moderator_list_staff_audit_logs_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/staff_audit_logs/moderator_list_staff_audit_logs_handler.rs @@ -74,7 +74,7 @@ pub async fn moderator_list_staff_audit_logs_handler( server_state: web::Data>, ) -> Result, CommonWebError> { - let _user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool).await.map_err(|err| { + let _user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool).await.map_err(|err| { warn!("Moderator check failed: {:?}", err); CommonWebError::NotAuthorized })?; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user/moderator_list_subscribing_users_by_signup_date.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user/moderator_list_subscribing_users_by_signup_date.rs index 829064899a..c4410e5f13 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user/moderator_list_subscribing_users_by_signup_date.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user/moderator_list_subscribing_users_by_signup_date.rs @@ -36,7 +36,7 @@ pub async fn moderator_list_subscribing_users_by_signup_date_handler( server_state: web::Data>, ) -> Result, CommonWebError> { - let _user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool) + let _user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool) .await .map_err(|_| CommonWebError::NotAuthorized)?; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user/moderator_list_users_by_signup_date.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user/moderator_list_users_by_signup_date.rs index 810b224265..c0b3a863ff 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user/moderator_list_users_by_signup_date.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user/moderator_list_users_by_signup_date.rs @@ -36,7 +36,7 @@ pub async fn moderator_list_users_by_signup_date_handler( server_state: web::Data>, ) -> Result, CommonWebError> { - let _user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool) + let _user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool) .await .map_err(|_| CommonWebError::NotAuthorized)?; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user/moderator_user_lookup_by_stripe_customer_id_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user/moderator_user_lookup_by_stripe_customer_id_handler.rs index ecd1e66a16..4070f3991b 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user/moderator_user_lookup_by_stripe_customer_id_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user/moderator_user_lookup_by_stripe_customer_id_handler.rs @@ -33,7 +33,7 @@ pub async fn moderator_user_lookup_by_stripe_customer_id_handler( server_state: web::Data>, ) -> Result, CommonWebError> { - let _user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool) + let _user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool) .await .map_err(|_| CommonWebError::NotAuthorized)?; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user/moderator_user_lookup_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user/moderator_user_lookup_handler.rs index 933f7b4cab..76d65c60b7 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user/moderator_user_lookup_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user/moderator_user_lookup_handler.rs @@ -40,7 +40,7 @@ pub async fn moderator_user_lookup_handler( server_state: web::Data>, ) -> Result, CommonWebError> { - let _user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool) + let _user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool) .await .map_err(|_| CommonWebError::NotAuthorized)?; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_bans/moderation_ban_user_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_bans/moderation_ban_user_handler.rs index daad736c19..4564ef88fb 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_bans/moderation_ban_user_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_bans/moderation_ban_user_handler.rs @@ -59,7 +59,7 @@ pub async fn moderation_ban_user_handler( ) -> Result, CommonWebError> { // 1. Require moderator with ban permissions. - let user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool).await.map_err(|err| { + let user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool).await.map_err(|err| { warn!("Moderator check failed: {:?}", err); CommonWebError::NotAuthorized })?; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_emails/moderator_change_user_email_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_emails/moderator_change_user_email_handler.rs index 938caa7634..2397fcb16a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_emails/moderator_change_user_email_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_emails/moderator_change_user_email_handler.rs @@ -69,7 +69,7 @@ pub async fn moderator_change_user_email_handler( ) -> Result, CommonWebError> { // 1. Require moderator. - let user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool).await.map_err(|err| { + let user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool).await.map_err(|err| { warn!("Moderator check failed: {:?}", err); CommonWebError::NotAuthorized })?; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_emails/moderator_list_email_address_changes_for_user_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_emails/moderator_list_email_address_changes_for_user_handler.rs index eb876f3d49..3dad00de6a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_emails/moderator_list_email_address_changes_for_user_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_emails/moderator_list_email_address_changes_for_user_handler.rs @@ -101,7 +101,7 @@ pub async fn moderator_list_email_address_changes_for_user_handler( ) -> Result, CommonWebError> { // 1. Require moderator. - let _user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool).await.map_err(|err| { + let _user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool).await.map_err(|err| { warn!("Moderator check failed: {:?}", err); CommonWebError::NotAuthorized })?; 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 693197e342..1a1447d921 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 @@ -87,7 +87,7 @@ pub async fn moderator_edit_user_feature_flags_handler( redis_pool: Data>, ) -> Result { - let user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool).await.map_err(|err| { + let user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool).await.map_err(|err| { warn!("Moderator check failed: {:?}", err); CommonWebError::NotAuthorized })?; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_feature_flags/moderator_list_all_available_user_feature_flags_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_feature_flags/moderator_list_all_available_user_feature_flags_handler.rs index 03cdc18681..7c50456fa1 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_feature_flags/moderator_list_all_available_user_feature_flags_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_feature_flags/moderator_list_all_available_user_feature_flags_handler.rs @@ -47,7 +47,7 @@ pub async fn moderator_list_all_available_user_feature_flags_handler( http_request: HttpRequest, server_state: web::Data>, ) -> Result, CommonWebError> { - let _user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool).await.map_err(|err| { + let _user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool).await.map_err(|err| { warn!("Moderator check failed: {:?}", err); CommonWebError::NotAuthorized })?; 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 721214351d..70250543f7 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 @@ -54,7 +54,7 @@ pub async fn moderator_list_user_feature_flags_handler( path: Path, server_state: web::Data>, ) -> Result, CommonWebError> { - let _user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool).await.map_err(|err| { + let _user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool).await.map_err(|err| { warn!("Moderator check failed: {:?}", err); CommonWebError::NotAuthorized })?; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_referrals/moderator_list_global_user_referrals_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_referrals/moderator_list_global_user_referrals_handler.rs index fbe44018bc..6c8385457f 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_referrals/moderator_list_global_user_referrals_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_referrals/moderator_list_global_user_referrals_handler.rs @@ -40,7 +40,7 @@ pub async fn moderator_list_global_user_referrals_handler( server_state: web::Data>, ) -> Result, CommonWebError> { - let _user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool).await.map_err(|err| { + let _user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool).await.map_err(|err| { warn!("Moderator check failed: {:?}", err); CommonWebError::NotAuthorized })?; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_referrals/moderator_list_user_referrals_for_user_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_referrals/moderator_list_user_referrals_for_user_handler.rs index 7866a9e015..272bc51ef4 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_referrals/moderator_list_user_referrals_for_user_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_referrals/moderator_list_user_referrals_for_user_handler.rs @@ -45,7 +45,7 @@ pub async fn moderator_list_user_referrals_for_user_handler( server_state: web::Data>, ) -> Result, CommonWebError> { - let _user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool).await.map_err(|err| { + let _user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool).await.map_err(|err| { warn!("Moderator check failed: {:?}", err); CommonWebError::NotAuthorized })?; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_sessions/moderator_list_user_session_impersonation_requests_for_user_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_sessions/moderator_list_user_session_impersonation_requests_for_user_handler.rs index ba2c4e6c59..7ad904d6c2 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_sessions/moderator_list_user_session_impersonation_requests_for_user_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_sessions/moderator_list_user_session_impersonation_requests_for_user_handler.rs @@ -79,7 +79,7 @@ pub async fn moderator_list_user_session_impersonation_requests_for_user_handler server_state: web::Data>, ) -> Result, CommonWebError> { - let _user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool).await.map_err(|err| { + let _user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool).await.map_err(|err| { warn!("Moderator check failed: {:?}", err); CommonWebError::NotAuthorized })?; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_sessions/moderator_list_user_session_impersonation_requests_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_sessions/moderator_list_user_session_impersonation_requests_handler.rs index fc122a308f..08f56c95da 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_sessions/moderator_list_user_session_impersonation_requests_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_sessions/moderator_list_user_session_impersonation_requests_handler.rs @@ -73,7 +73,7 @@ pub async fn moderator_list_user_session_impersonation_requests_handler( server_state: web::Data>, ) -> Result, CommonWebError> { - let _user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool).await.map_err(|err| { + let _user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool).await.map_err(|err| { warn!("Moderator check failed: {:?}", err); CommonWebError::NotAuthorized })?; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_sessions/moderator_user_session_impersonation_request_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_sessions/moderator_user_session_impersonation_request_handler.rs index 5f8f123f62..87850fdaaf 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_sessions/moderator_user_session_impersonation_request_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_sessions/moderator_user_session_impersonation_request_handler.rs @@ -69,7 +69,7 @@ pub async fn moderator_user_session_impersonation_request_handler( ) -> Result, CommonWebError> { // 1. Require moderator session. - let user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool).await.map_err(|err| { + let user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool).await.map_err(|err| { warn!("Moderator check failed: {:?}", err); CommonWebError::NotAuthorized })?; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_stripe_data/moderator_get_user_stripe_customer_ids_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_stripe_data/moderator_get_user_stripe_customer_ids_handler.rs index f600316679..c423548a03 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_stripe_data/moderator_get_user_stripe_customer_ids_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_stripe_data/moderator_get_user_stripe_customer_ids_handler.rs @@ -43,7 +43,7 @@ pub async fn moderator_get_user_stripe_customer_ids_handler( .acquire() .await?; - let _moderator_session = require_moderator(&http_request, &server_state, &mut *mysql_connection) + let _moderator_session = require_moderator(&http_request, &server_state.session_checker, &mut *mysql_connection) .await .map_err(|_| CommonWebError::NotAuthorized)?; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallet_ledger_entries/list_wallet_ledger_entries_by_wallet_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallet_ledger_entries/list_wallet_ledger_entries_by_wallet_handler.rs index 34581a9f51..4de22adeaf 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallet_ledger_entries/list_wallet_ledger_entries_by_wallet_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallet_ledger_entries/list_wallet_ledger_entries_by_wallet_handler.rs @@ -36,7 +36,7 @@ pub async fn list_wallet_ledger_entries_by_wallet_handler( server_state: web::Data>, ) -> Result, CommonWebError> { - let _user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool) + let _user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool) .await .map_err(|_| CommonWebError::NotAuthorized)?; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallet_ledger_entries/moderator_get_wallet_ledger_entry_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallet_ledger_entries/moderator_get_wallet_ledger_entry_handler.rs index 1645183780..cbe11215bb 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallet_ledger_entries/moderator_get_wallet_ledger_entry_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallet_ledger_entries/moderator_get_wallet_ledger_entry_handler.rs @@ -36,7 +36,7 @@ pub async fn moderator_get_wallet_ledger_entry_handler( server_state: web::Data>, ) -> Result, CommonWebError> { - let _user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool) + let _user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool) .await .map_err(|_| CommonWebError::NotAuthorized)?; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallets/list_user_wallets_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallets/list_user_wallets_handler.rs index 67d07cb41a..c9f702a9e5 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallets/list_user_wallets_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallets/list_user_wallets_handler.rs @@ -36,7 +36,7 @@ pub async fn list_user_wallets_handler( server_state: web::Data>, ) -> Result, CommonWebError> { - let _user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool) + let _user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool) .await .map_err(|_| CommonWebError::NotAuthorized)?; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallets/moderator_add_banked_balance_to_wallet_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallets/moderator_add_banked_balance_to_wallet_handler.rs index 5dce2f7f5a..24136e8507 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallets/moderator_add_banked_balance_to_wallet_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallets/moderator_add_banked_balance_to_wallet_handler.rs @@ -46,7 +46,7 @@ pub async fn moderator_add_banked_balance_to_wallet_handler( server_state: web::Data>, ) -> Result, CommonWebError> { - let user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool) + let user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool) .await .map_err(|err| { warn!("Moderator check failed: {:?}", err); diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallets/moderator_create_wallet_for_user_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallets/moderator_create_wallet_for_user_handler.rs index f4941aa680..aa31e5a891 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallets/moderator_create_wallet_for_user_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallets/moderator_create_wallet_for_user_handler.rs @@ -37,7 +37,7 @@ pub async fn moderator_create_wallet_for_user_handler( server_state: web::Data>, ) -> Result, CommonWebError> { - let _user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool) + let _user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool) .await .map_err(|_| CommonWebError::NotAuthorized)?; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallets/moderator_get_wallet_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallets/moderator_get_wallet_handler.rs index 81349e0e89..ac2a5914d4 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallets/moderator_get_wallet_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/wallets/moderator_get_wallet_handler.rs @@ -36,7 +36,7 @@ pub async fn moderator_get_wallet_handler( server_state: web::Data>, ) -> Result, CommonWebError> { - let _user_session = require_moderator(&http_request, &server_state, &server_state.mysql_pool) + let _user_session = require_moderator(&http_request, &server_state.session_checker, &server_state.mysql_pool) .await .map_err(|_| CommonWebError::NotAuthorized)?; diff --git a/crates/service/web/storyteller_web/src/http_server/web_utils/user_session/require_moderator.rs b/crates/service/web/storyteller_web/src/http_server/web_utils/user_session/require_moderator.rs index 32eee56055..dea644367c 100644 --- a/crates/service/web/storyteller_web/src/http_server/web_utils/user_session/require_moderator.rs +++ b/crates/service/web/storyteller_web/src/http_server/web_utils/user_session/require_moderator.rs @@ -7,7 +7,7 @@ use sqlx::{Executor, MySql}; use mysql_queries::queries::users::user_sessions::get_user_session_by_token::SessionUserRecord; -use crate::state::server_state::ServerState; +use crate::http_server::session::session_checker::SessionChecker; #[derive(Debug)] pub enum RequireModeratorError { @@ -31,13 +31,12 @@ impl Error for RequireModeratorError {} /// one the handler already holds. pub async fn require_moderator<'e, 'c : 'e, E>( http_request: &HttpRequest, - server_state: &ServerState, + session_checker: &SessionChecker, mysql_executor: E, ) -> Result where E: 'e + Executor<'c, Database = MySql> { - let maybe_user_session = server_state - .session_checker + let maybe_user_session = session_checker .maybe_get_user_session_from_executor(http_request, mysql_executor) .await .map_err(|e| {