From 032d4ccc9cbe8beb18b429344586ef9bb9448850 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sat, 11 Apr 2026 19:37:20 -0400 Subject: [PATCH] move billing route --- .../plugins/billing/src/default_routes.rs | 9 ++----- crates/service/plugins/billing/src/lib.rs | 1 - .../billing/src/users/http_endpoints/mod.rs | 1 - .../service/plugins/billing/src/users/mod.rs | 1 - .../list_active_user_subscriptions_handler.rs | 2 +- .../endpoints/billing_fakeyou/mod.rs | 1 + .../src/http_server/endpoints/mod.rs | 1 + .../video/tests/test_seedance_1p5_pro.rs | 1 + .../add_application_routes.rs | 6 +++-- .../billing_fakeyou_routes.rs | 26 +++++++++++++++++++ .../routes/application_routes/mod.rs | 1 + 11 files changed, 37 insertions(+), 13 deletions(-) delete mode 100644 crates/service/plugins/billing/src/users/http_endpoints/mod.rs delete mode 100644 crates/service/plugins/billing/src/users/mod.rs rename crates/service/{plugins/billing/src/users/http_endpoints => web/storyteller_web/src/http_server/endpoints/billing_fakeyou}/list_active_user_subscriptions_handler.rs (99%) create mode 100644 crates/service/web/storyteller_web/src/http_server/endpoints/billing_fakeyou/mod.rs create mode 100644 crates/service/web/storyteller_web/src/http_server/routes/application_routes/billing_fakeyou_routes.rs diff --git a/crates/service/plugins/billing/src/default_routes.rs b/crates/service/plugins/billing/src/default_routes.rs index 48879d2b9d..a53238b4be 100644 --- a/crates/service/plugins/billing/src/default_routes.rs +++ b/crates/service/plugins/billing/src/default_routes.rs @@ -10,7 +10,6 @@ use crate::stripe::http_endpoints::checkout::create::stripe_create_checkout_sess use crate::stripe::http_endpoints::customer_portal::stripe_create_customer_portal_session_json_handler::stripe_create_customer_portal_session_json_handler; use crate::stripe::http_endpoints::customer_portal::stripe_create_customer_portal_session_redirect_handler::stripe_create_customer_portal_session_redirect_handler; use crate::stripe::http_endpoints::webhook::stripe_webhook_handler::stripe_webhook_handler; -use crate::users::http_endpoints::list_active_user_subscriptions_handler::list_active_user_subscriptions_handler; pub fn add_suggested_stripe_billing_routes (app: App) -> App where @@ -23,13 +22,9 @@ pub fn add_suggested_stripe_billing_routes (app: App) -> App InitError = (), >, { + // NB: The /v1/billing/active_subscriptions route has been moved to + // storyteller-web (billing_fakeyou_routes). Only Stripe routes remain here. app.service(web::scope("/v1") - .service(web::scope("/billing") - .service(web::resource("/active_subscriptions") - .route(web::get().to(list_active_user_subscriptions_handler)) - .route(web::head().to(|| HttpResponse::Ok())) - ) - ) .service(web::scope("/stripe") .service(web::resource("/webhook") .route(web::post().to(stripe_webhook_handler)) diff --git a/crates/service/plugins/billing/src/lib.rs b/crates/service/plugins/billing/src/lib.rs index 80fca9a41d..bccaba88d4 100644 --- a/crates/service/plugins/billing/src/lib.rs +++ b/crates/service/plugins/billing/src/lib.rs @@ -19,4 +19,3 @@ pub mod default_routes; pub mod paypal; pub mod stripe; -pub mod users; diff --git a/crates/service/plugins/billing/src/users/http_endpoints/mod.rs b/crates/service/plugins/billing/src/users/http_endpoints/mod.rs deleted file mode 100644 index ee35cf6ff0..0000000000 --- a/crates/service/plugins/billing/src/users/http_endpoints/mod.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod list_active_user_subscriptions_handler; \ No newline at end of file diff --git a/crates/service/plugins/billing/src/users/mod.rs b/crates/service/plugins/billing/src/users/mod.rs deleted file mode 100644 index 0115081390..0000000000 --- a/crates/service/plugins/billing/src/users/mod.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod http_endpoints; \ No newline at end of file diff --git a/crates/service/plugins/billing/src/users/http_endpoints/list_active_user_subscriptions_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/billing_fakeyou/list_active_user_subscriptions_handler.rs similarity index 99% rename from crates/service/plugins/billing/src/users/http_endpoints/list_active_user_subscriptions_handler.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/billing_fakeyou/list_active_user_subscriptions_handler.rs index 9df9056393..27c8bbacf6 100644 --- a/crates/service/plugins/billing/src/users/http_endpoints/list_active_user_subscriptions_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/billing_fakeyou/list_active_user_subscriptions_handler.rs @@ -98,4 +98,4 @@ pub async fn list_active_user_subscriptions_handler( Ok(HttpResponse::Ok() .content_type("application/json") .body(body)) -} \ No newline at end of file +} diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/billing_fakeyou/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/billing_fakeyou/mod.rs new file mode 100644 index 0000000000..7832a22ca7 --- /dev/null +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/billing_fakeyou/mod.rs @@ -0,0 +1 @@ +pub mod list_active_user_subscriptions_handler; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/mod.rs index 016be34e71..cfc5476cb7 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/mod.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/mod.rs @@ -1,6 +1,7 @@ pub mod analytics; pub mod app_state; pub mod beta_keys; +pub mod billing_fakeyou; pub mod characters; pub mod comments; pub mod credits; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/tests/test_seedance_1p5_pro.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/tests/test_seedance_1p5_pro.rs index ffa670f8f0..9e9219019a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/tests/test_seedance_1p5_pro.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/tests/test_seedance_1p5_pro.rs @@ -44,6 +44,7 @@ mod tests { reference_image_media_tokens: None, reference_video_media_tokens: None, reference_audio_media_tokens: None, + reference_character_tokens: None, resolution, aspect_ratio, quality: None, diff --git a/crates/service/web/storyteller_web/src/http_server/routes/application_routes/add_application_routes.rs b/crates/service/web/storyteller_web/src/http_server/routes/application_routes/add_application_routes.rs index 3a606d47db..f243cb42c2 100644 --- a/crates/service/web/storyteller_web/src/http_server/routes/application_routes/add_application_routes.rs +++ b/crates/service/web/storyteller_web/src/http_server/routes/application_routes/add_application_routes.rs @@ -1,4 +1,5 @@ use crate::http_server::routes::application_routes::analytics_routes::add_analytics_routes; +use crate::http_server::routes::application_routes::billing_fakeyou_routes::add_billing_fakeyou_routes; use crate::http_server::routes::application_routes::character_routes::add_character_routes; use crate::http_server::routes::application_routes::comments_routes::add_comments_routes; use crate::http_server::routes::application_routes::credits_routes::add_credits_routes; @@ -74,8 +75,9 @@ where app = add_stripe_artcraft_routes(app); // /v1/stripe_artcraft/... app = add_subscription_routes(app); // /v1/subscriptions/... - // FakeYou Billing component - still necessary for FakeYou monetization - app = add_suggested_stripe_billing_routes(app); // /stripe, billing, webhooks, etc. + // FakeYou Billing + app = add_billing_fakeyou_routes(app); // /v1/billing/active_subscriptions + app = add_suggested_stripe_billing_routes(app); // /stripe, webhooks, etc. app } diff --git a/crates/service/web/storyteller_web/src/http_server/routes/application_routes/billing_fakeyou_routes.rs b/crates/service/web/storyteller_web/src/http_server/routes/application_routes/billing_fakeyou_routes.rs new file mode 100644 index 0000000000..a49a4171a9 --- /dev/null +++ b/crates/service/web/storyteller_web/src/http_server/routes/application_routes/billing_fakeyou_routes.rs @@ -0,0 +1,26 @@ +use crate::http_server::endpoints::billing_fakeyou::list_active_user_subscriptions_handler::list_active_user_subscriptions_handler; +use actix_http::body::MessageBody; +use actix_service::ServiceFactory; +use actix_web::dev::{ServiceRequest, ServiceResponse}; +use actix_web::{web, App, Error, HttpResponse}; + +pub fn add_billing_fakeyou_routes(app: App) -> App +where + B: MessageBody, + T: ServiceFactory< + ServiceRequest, + Config = (), + Response = ServiceResponse, + Error = Error, + InitError = (), + >, +{ + app.service(web::scope("/v1") + .service(web::scope("/billing") + .service(web::resource("/active_subscriptions") + .route(web::get().to(list_active_user_subscriptions_handler)) + .route(web::head().to(|| HttpResponse::Ok())) + ) + ) + ) +} diff --git a/crates/service/web/storyteller_web/src/http_server/routes/application_routes/mod.rs b/crates/service/web/storyteller_web/src/http_server/routes/application_routes/mod.rs index 286be45a59..120b3fe977 100644 --- a/crates/service/web/storyteller_web/src/http_server/routes/application_routes/mod.rs +++ b/crates/service/web/storyteller_web/src/http_server/routes/application_routes/mod.rs @@ -1,4 +1,5 @@ mod analytics_routes; +mod billing_fakeyou_routes; mod character_routes; mod comments_routes; mod credits_routes;