diff --git a/crates/service/web/storyteller_web/src/routes/add_routes.rs b/crates/service/web/storyteller_web/src/routes/add_routes.rs index 011a355b9f..3bc6226b71 100644 --- a/crates/service/web/storyteller_web/src/routes/add_routes.rs +++ b/crates/service/web/storyteller_web/src/routes/add_routes.rs @@ -145,6 +145,7 @@ use crate::http_server::endpoints::w2l::set_w2l_template_mod_approval::set_w2l_t use crate::http_server::endpoints::workflows::enqueue_comfy_ui_handler::enqueue_comfy_ui_handler; use crate::http_server::endpoints::workflows::enqueue_video_style_transfer_handler::enqueue_video_style_transfer_handler; use crate::http_server::endpoints::workflows::enqueue_workflow_upload_request::enqueue_workflow_upload_request; +use crate::routes::beta_key_routes::add_beta_key_routes; use crate::routes::job_routes::add_job_routes; use crate::routes::media_files_routes::add_media_file_routes; use crate::routes::moderation_routes::add_moderator_routes; @@ -182,6 +183,7 @@ pub fn add_routes (app: App, server_environment: ServerEnvironment) -> app = add_featured_item_routes(app); /* /v1/featured_item/... */ app = add_subscription_routes(app); /* /v1/subscriptions/... */ app = add_voice_designer_routes(app); /* /v1/voice_designer */ + app = add_beta_key_routes(app); /* /v1/beta_keys */ app = add_image_gen_routes(app); app = add_weights_routes(app); app = add_workflow_routes(app); @@ -192,14 +194,6 @@ pub fn add_routes (app: App, server_environment: ServerEnvironment) -> // // } - // ==================== Beta keys ==================== - - let mut app = RouteBuilder::from_app(app) - .add_get("/v1/beta_keys/list", list_beta_keys_handler) - .add_post("/v1/beta_keys/create", create_beta_keys_handler) - .add_post("/v1/beta_keys/redeem", redeem_beta_key_handler) - .into_app(); - // ==================== Comments ==================== let mut app = RouteBuilder::from_app(app) diff --git a/crates/service/web/storyteller_web/src/routes/beta_key_routes.rs b/crates/service/web/storyteller_web/src/routes/beta_key_routes.rs new file mode 100644 index 0000000000..e567fa97ba --- /dev/null +++ b/crates/service/web/storyteller_web/src/routes/beta_key_routes.rs @@ -0,0 +1,35 @@ +use actix_http::body::MessageBody; +use actix_service::ServiceFactory; +use actix_web::{App, Error, HttpResponse, web}; +use actix_web::dev::{ServiceRequest, ServiceResponse}; + +use crate::http_server::endpoints::beta_keys::create_beta_keys_handler::create_beta_keys_handler; +use crate::http_server::endpoints::beta_keys::list_beta_keys_handler::list_beta_keys_handler; +use crate::http_server::endpoints::beta_keys::redeem_beta_key_handler::redeem_beta_key_handler; + +pub fn add_beta_key_routes (app: App) -> App + where + B: MessageBody, + T: ServiceFactory< + ServiceRequest, + Config = (), + Response = ServiceResponse, + Error = Error, + InitError = (), + >, +{ + app.service(web::scope("/v1/beta_keys") + .service(web::resource("/list") + .route(web::get().to(list_beta_keys_handler)) + .route(web::head().to(|| HttpResponse::Ok())) + ) + .service(web::resource("/create") + .route(web::post().to(create_beta_keys_handler)) + .route(web::head().to(|| HttpResponse::Ok())) + ) + .service(web::resource("/redeem") + .route(web::post().to(redeem_beta_key_handler)) + .route(web::head().to(|| HttpResponse::Ok())) + ) + ) +} diff --git a/crates/service/web/storyteller_web/src/routes/mod.rs b/crates/service/web/storyteller_web/src/routes/mod.rs index d68ddec279..5ec1906180 100644 --- a/crates/service/web/storyteller_web/src/routes/mod.rs +++ b/crates/service/web/storyteller_web/src/routes/mod.rs @@ -2,4 +2,5 @@ pub mod add_routes; pub mod job_routes; pub mod media_files_routes; pub mod moderation_routes; -pub mod weights_routes; \ No newline at end of file +pub mod weights_routes; +pub mod beta_key_routes; \ No newline at end of file