From 2f04ac75aefee8611ed97621149700f29012cb1c Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 13 May 2026 13:07:07 -0400 Subject: [PATCH] more ergo --- ...get_user_token_by_username_with_executor.rs | 18 ++++-------------- ...iption_checkout_with_user_signup_handler.rs | 9 ++------- .../endpoints/users/create_account_handler.rs | 9 ++------- .../users/google_sso/google_sso_handler.rs | 9 ++------- 4 files changed, 10 insertions(+), 35 deletions(-) diff --git a/crates/schema/database/mysql_queries/src/queries/users/user/get/get_user_token_by_username_with_executor.rs b/crates/schema/database/mysql_queries/src/queries/users/user/get/get_user_token_by_username_with_executor.rs index aa3643b3c2..efb1ec778a 100644 --- a/crates/schema/database/mysql_queries/src/queries/users/user/get/get_user_token_by_username_with_executor.rs +++ b/crates/schema/database/mysql_queries/src/queries/users/user/get/get_user_token_by_username_with_executor.rs @@ -1,24 +1,14 @@ -use std::marker::PhantomData; - use sqlx::{Executor, MySql}; use tokens::tokens::users::UserToken; -pub struct GetUserTokenByUsernameArgs<'e, 'c, E> -where - E: 'e + Executor<'c, Database = MySql>, -{ - pub username: &'e str, - pub mysql_executor: E, - pub phantom: PhantomData<&'c E>, -} - pub async fn get_user_token_by_username_with_executor<'e, 'c: 'e, E>( - args: GetUserTokenByUsernameArgs<'e, 'c, E>, + username: &str, + mysql_executor: E, ) -> Result, sqlx::Error> where E: 'e + Executor<'c, Database = MySql>, { - let username = args.username.to_lowercase(); + let username = username.to_lowercase(); let result = sqlx::query_as!( UsernameRecord, @@ -31,7 +21,7 @@ LIMIT 1 "#, username ) - .fetch_one(args.mysql_executor) + .fetch_one(mysql_executor) .await; match result { diff --git a/crates/service/plugins/billing_artcraft/src/endpoints/checkout_with_user_signup/stripe_artcraft_create_subscription_checkout_with_user_signup_handler.rs b/crates/service/plugins/billing_artcraft/src/endpoints/checkout_with_user_signup/stripe_artcraft_create_subscription_checkout_with_user_signup_handler.rs index 06b13c722c..34172e732c 100644 --- a/crates/service/plugins/billing_artcraft/src/endpoints/checkout_with_user_signup/stripe_artcraft_create_subscription_checkout_with_user_signup_handler.rs +++ b/crates/service/plugins/billing_artcraft/src/endpoints/checkout_with_user_signup/stripe_artcraft_create_subscription_checkout_with_user_signup_handler.rs @@ -5,8 +5,7 @@ use crate::endpoints::checkout_with_user_signup::user_creation_case::user_creati use crate::endpoints::checkout_with_user_signup::user_exists_case::user_exists_case; use crate::utils::artcraft_stripe_config::ArtcraftStripeConfigWithClient; use crate::utils::common_web_error::CommonWebError; -use mysql_queries::queries::users::user::get::get_user_token_by_username_with_executor::{get_user_token_by_username_with_executor, GetUserTokenByUsernameArgs}; -use std::marker::PhantomData; +use mysql_queries::queries::users::user::get::get_user_token_by_username_with_executor::get_user_token_by_username_with_executor; use actix_artcraft::sessions::user_sessions::http_user_session_manager::HttpUserSessionManager; use actix_web::web::{Data, Json}; use actix_web::{web, HttpRequest, HttpResponse}; @@ -106,11 +105,7 @@ pub async fn stripe_artcraft_create_subscription_checkout_with_user_signup_handl if lookup_username.is_empty() { None } else { - match get_user_token_by_username_with_executor(GetUserTokenByUsernameArgs { - username: &lookup_username, - mysql_executor: &mut *mysql_connection, - phantom: PhantomData, - }).await { + match get_user_token_by_username_with_executor(&lookup_username, &mut *mysql_connection).await { Ok(token) => token, Err(err) => { warn!("Referral user lookup failed (continuing): {:?}", err); diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/users/create_account_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/users/create_account_handler.rs index d559967e8d..e8c2d32f48 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/users/create_account_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/users/create_account_handler.rs @@ -9,8 +9,7 @@ use std::fmt::Formatter; use crate::util::cleaners::sanitize_referral_username::sanitize_referral_username; use crate::http_server::validations::is_reserved_username::is_reserved_username; -use mysql_queries::queries::users::user::get::get_user_token_by_username_with_executor::{get_user_token_by_username_with_executor, GetUserTokenByUsernameArgs}; -use std::marker::PhantomData; +use mysql_queries::queries::users::user::get::get_user_token_by_username_with_executor::get_user_token_by_username_with_executor; use crate::http_server::validations::validate_passwords::validate_passwords; use crate::http_server::validations::validate_username::validate_username; use crate::util::enroll_in_studio::enroll_in_studio; @@ -226,11 +225,7 @@ pub async fn create_account_handler( if lookup_username.is_empty() { None } else { - match get_user_token_by_username_with_executor(GetUserTokenByUsernameArgs { - username: &lookup_username, - mysql_executor: &**mysql_pool, - phantom: PhantomData, - }).await { + match get_user_token_by_username_with_executor(&lookup_username, &**mysql_pool).await { Ok(token) => token, Err(err) => { warn!("Referral user lookup failed (continuing): {:?}", err); diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/users/google_sso/google_sso_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/users/google_sso/google_sso_handler.rs index cba4c49918..2c3f268feb 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/users/google_sso/google_sso_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/users/google_sso/google_sso_handler.rs @@ -20,8 +20,7 @@ use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn}; use mysql_queries::queries::google_sign_in_accounts::get_google_sign_in_account_by_subject::get_google_sign_in_account; -use mysql_queries::queries::users::user::get::get_user_token_by_username_with_executor::{get_user_token_by_username_with_executor, GetUserTokenByUsernameArgs}; -use std::marker::PhantomData; +use mysql_queries::queries::users::user::get::get_user_token_by_username_with_executor::get_user_token_by_username_with_executor; use mysql_queries::queries::users::user_sessions::create_user_session_with_transactor::create_user_session_with_transactor; use mysql_queries::utils::transactor::Transactor; use sqlx::{Acquire, MySqlPool}; @@ -267,11 +266,7 @@ pub async fn google_sso_handler( if lookup_username.is_empty() { None } else { - match get_user_token_by_username_with_executor(GetUserTokenByUsernameArgs { - username: &lookup_username, - mysql_executor: &mut *mysql_connection, - phantom: PhantomData, - }).await { + match get_user_token_by_username_with_executor(&lookup_username, &mut *mysql_connection).await { Ok(token) => token, Err(err) => { warn!("Referral user lookup failed (continuing): {:?}", err);