diff --git a/Cargo.toml b/Cargo.toml index 5512d02a5f..02a817a17f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,11 +12,6 @@ members = [ "crates/cli/database_backup", "crates/cli/database_cleanup", - # Plugins are complete subsystems that can be plugged into services (users, billing, etc.) - "crates/plugins/billing", - "crates/plugins/inference_workloads", - "crates/plugins/users", - # Shared libraries "crates/lib/cloud_storage", "crates/lib/config", @@ -50,4 +45,9 @@ members = [ "crates/service/web/image_generation_service", "crates/service/web/storyteller_web", "crates/service/web/websocket_gateway", + + # Service Plugins: complete subsystems that can be plugged into services (users, billing, etc.) + "crates/service/plugins/billing", + "crates/service/plugins/inference_workloads", + "crates/service/plugins/users", ] diff --git a/crates/plugins/README.md b/crates/service/plugins/README.md similarity index 100% rename from crates/plugins/README.md rename to crates/service/plugins/README.md diff --git a/crates/plugins/billing/Cargo.toml b/crates/service/plugins/billing/Cargo.toml similarity index 82% rename from crates/plugins/billing/Cargo.toml rename to crates/service/plugins/billing/Cargo.toml index 247f08ff07..f875a0483a 100644 --- a/crates/plugins/billing/Cargo.toml +++ b/crates/service/plugins/billing/Cargo.toml @@ -15,11 +15,11 @@ path = "src/lib.rs" [dependencies] # Internal -container_common = { path = "../../lib/container_common" } -database_queries = { path = "../../lib/database_queries" } -http_server_common = { path = "../../lib/http_server_common" } -reusable_types = { path = "../../_types/reusable_types" } -url_config = { path = "../../lib/url_config" } +container_common = { path = "../../../lib/container_common" } +database_queries = { path = "../../../lib/database_queries" } +http_server_common = { path = "../../../lib/http_server_common" } +reusable_types = { path = "../../../_types/reusable_types" } +url_config = { path = "../../../lib/url_config" } # External anyhow = "1.0.40" diff --git a/crates/plugins/billing/src/default_routes.rs b/crates/service/plugins/billing/src/default_routes.rs similarity index 100% rename from crates/plugins/billing/src/default_routes.rs rename to crates/service/plugins/billing/src/default_routes.rs diff --git a/crates/plugins/billing/src/lib.rs b/crates/service/plugins/billing/src/lib.rs similarity index 100% rename from crates/plugins/billing/src/lib.rs rename to crates/service/plugins/billing/src/lib.rs diff --git a/crates/plugins/billing/src/paypal/mod.rs b/crates/service/plugins/billing/src/paypal/mod.rs similarity index 100% rename from crates/plugins/billing/src/paypal/mod.rs rename to crates/service/plugins/billing/src/paypal/mod.rs diff --git a/crates/plugins/billing/src/stripe/helpers/common_metadata_keys.rs b/crates/service/plugins/billing/src/stripe/helpers/common_metadata_keys.rs similarity index 100% rename from crates/plugins/billing/src/stripe/helpers/common_metadata_keys.rs rename to crates/service/plugins/billing/src/stripe/helpers/common_metadata_keys.rs diff --git a/crates/plugins/billing/src/stripe/helpers/enums/mod.rs b/crates/service/plugins/billing/src/stripe/helpers/enums/mod.rs similarity index 100% rename from crates/plugins/billing/src/stripe/helpers/enums/mod.rs rename to crates/service/plugins/billing/src/stripe/helpers/enums/mod.rs diff --git a/crates/plugins/billing/src/stripe/helpers/enums/recurring_interval_to_reusable_type.rs b/crates/service/plugins/billing/src/stripe/helpers/enums/recurring_interval_to_reusable_type.rs similarity index 100% rename from crates/plugins/billing/src/stripe/helpers/enums/recurring_interval_to_reusable_type.rs rename to crates/service/plugins/billing/src/stripe/helpers/enums/recurring_interval_to_reusable_type.rs diff --git a/crates/plugins/billing/src/stripe/helpers/enums/subscription_status_to_reusable_type.rs b/crates/service/plugins/billing/src/stripe/helpers/enums/subscription_status_to_reusable_type.rs similarity index 100% rename from crates/plugins/billing/src/stripe/helpers/enums/subscription_status_to_reusable_type.rs rename to crates/service/plugins/billing/src/stripe/helpers/enums/subscription_status_to_reusable_type.rs diff --git a/crates/plugins/billing/src/stripe/helpers/expand_customer_id.rs b/crates/service/plugins/billing/src/stripe/helpers/expand_customer_id.rs similarity index 100% rename from crates/plugins/billing/src/stripe/helpers/expand_customer_id.rs rename to crates/service/plugins/billing/src/stripe/helpers/expand_customer_id.rs diff --git a/crates/plugins/billing/src/stripe/helpers/expand_product_id.rs b/crates/service/plugins/billing/src/stripe/helpers/expand_product_id.rs similarity index 100% rename from crates/plugins/billing/src/stripe/helpers/expand_product_id.rs rename to crates/service/plugins/billing/src/stripe/helpers/expand_product_id.rs diff --git a/crates/plugins/billing/src/stripe/helpers/expand_subscription_id.rs b/crates/service/plugins/billing/src/stripe/helpers/expand_subscription_id.rs similarity index 100% rename from crates/plugins/billing/src/stripe/helpers/expand_subscription_id.rs rename to crates/service/plugins/billing/src/stripe/helpers/expand_subscription_id.rs diff --git a/crates/plugins/billing/src/stripe/helpers/mod.rs b/crates/service/plugins/billing/src/stripe/helpers/mod.rs similarity index 100% rename from crates/plugins/billing/src/stripe/helpers/mod.rs rename to crates/service/plugins/billing/src/stripe/helpers/mod.rs diff --git a/crates/plugins/billing/src/stripe/helpers/verify_stripe_webhook_ip_address.rs b/crates/service/plugins/billing/src/stripe/helpers/verify_stripe_webhook_ip_address.rs similarity index 100% rename from crates/plugins/billing/src/stripe/helpers/verify_stripe_webhook_ip_address.rs rename to crates/service/plugins/billing/src/stripe/helpers/verify_stripe_webhook_ip_address.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/checkout/create/mod.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/checkout/create/mod.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/checkout/create/mod.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/checkout/create/mod.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/checkout/create/stripe_create_checkout_session_error.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/checkout/create/stripe_create_checkout_session_error.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/checkout/create/stripe_create_checkout_session_error.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/checkout/create/stripe_create_checkout_session_error.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/checkout/create/stripe_create_checkout_session_json_handler.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/checkout/create/stripe_create_checkout_session_json_handler.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/checkout/create/stripe_create_checkout_session_json_handler.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/checkout/create/stripe_create_checkout_session_json_handler.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/checkout/create/stripe_create_checkout_session_redirect_handler.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/checkout/create/stripe_create_checkout_session_redirect_handler.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/checkout/create/stripe_create_checkout_session_redirect_handler.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/checkout/create/stripe_create_checkout_session_redirect_handler.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/checkout/create/stripe_create_checkout_session_shared.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/checkout/create/stripe_create_checkout_session_shared.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/checkout/create/stripe_create_checkout_session_shared.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/checkout/create/stripe_create_checkout_session_shared.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/checkout/mod.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/checkout/mod.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/checkout/mod.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/checkout/mod.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/customer_portal/mod.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/customer_portal/mod.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/customer_portal/mod.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/customer_portal/mod.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/customer_portal/stripe_create_customer_portal_session_error.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/customer_portal/stripe_create_customer_portal_session_error.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/customer_portal/stripe_create_customer_portal_session_error.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/customer_portal/stripe_create_customer_portal_session_error.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/customer_portal/stripe_create_customer_portal_session_json_handler.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/customer_portal/stripe_create_customer_portal_session_json_handler.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/customer_portal/stripe_create_customer_portal_session_json_handler.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/customer_portal/stripe_create_customer_portal_session_json_handler.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/customer_portal/stripe_create_customer_portal_session_redirect_handler.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/customer_portal/stripe_create_customer_portal_session_redirect_handler.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/customer_portal/stripe_create_customer_portal_session_redirect_handler.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/customer_portal/stripe_create_customer_portal_session_redirect_handler.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/customer_portal/stripe_create_customer_portal_session_shared.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/customer_portal/stripe_create_customer_portal_session_shared.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/customer_portal/stripe_create_customer_portal_session_shared.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/customer_portal/stripe_create_customer_portal_session_shared.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/mod.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/mod.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/mod.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/mod.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/webhook/mod.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/mod.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/webhook/mod.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/webhook/mod.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/webhook/stripe_webhook_handler.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/stripe_webhook_handler.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/webhook/stripe_webhook_handler.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/webhook/stripe_webhook_handler.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/charge/charge_succeeded_handler.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/charge/charge_succeeded_handler.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/charge/charge_succeeded_handler.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/charge/charge_succeeded_handler.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/charge/mod.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/charge/mod.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/charge/mod.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/charge/mod.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/checkout_session/checkout_session_completed_handler.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/checkout_session/checkout_session_completed_handler.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/checkout_session/checkout_session_completed_handler.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/checkout_session/checkout_session_completed_handler.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/checkout_session/mod.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/checkout_session/mod.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/checkout_session/mod.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/checkout_session/mod.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer/customer_created_handler.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer/customer_created_handler.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer/customer_created_handler.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer/customer_created_handler.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer/customer_deleted_handler.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer/customer_deleted_handler.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer/customer_deleted_handler.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer/customer_deleted_handler.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer/customer_updated_handler.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer/customer_updated_handler.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer/customer_updated_handler.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer/customer_updated_handler.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer/mod.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer/mod.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer/mod.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer/mod.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/calculate_subscription_end_date.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/calculate_subscription_end_date.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/calculate_subscription_end_date.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/calculate_subscription_end_date.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/common.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/common.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/common.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/common.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/customer_subscription_created_handler.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/customer_subscription_created_handler.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/customer_subscription_created_handler.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/customer_subscription_created_handler.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/customer_subscription_deleted_handler.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/customer_subscription_deleted_handler.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/customer_subscription_deleted_handler.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/customer_subscription_deleted_handler.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/customer_subscription_updated_handler.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/customer_subscription_updated_handler.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/customer_subscription_updated_handler.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/customer_subscription_updated_handler.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/mod.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/mod.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/mod.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/mod.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/subscription_event_extractor.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/subscription_event_extractor.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/subscription_event_extractor.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/subscription_event_extractor.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/invoice/invoice_paid_handler.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/invoice/invoice_paid_handler.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/invoice/invoice_paid_handler.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/invoice/invoice_paid_handler.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/invoice/invoice_payment_failed.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/invoice/invoice_payment_failed.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/invoice/invoice_payment_failed.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/invoice/invoice_payment_failed.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/invoice/invoice_payment_succeeded_handler.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/invoice/invoice_payment_succeeded_handler.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/invoice/invoice_payment_succeeded_handler.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/invoice/invoice_payment_succeeded_handler.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/invoice/invoice_updated_handler.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/invoice/invoice_updated_handler.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/invoice/invoice_updated_handler.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/invoice/invoice_updated_handler.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/invoice/mod.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/invoice/mod.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/invoice/mod.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/invoice/mod.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/mod.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/mod.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/mod.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/mod.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/payment_intent/mod.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/payment_intent/mod.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/payment_intent/mod.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/payment_intent/mod.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/payment_intent/payment_intent_succeeded_handler.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/payment_intent/payment_intent_succeeded_handler.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/payment_intent/payment_intent_succeeded_handler.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/payment_intent/payment_intent_succeeded_handler.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/stripe_webhook_error.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/stripe_webhook_error.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/stripe_webhook_error.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/stripe_webhook_error.rs diff --git a/crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/stripe_webhook_summary.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/stripe_webhook_summary.rs similarity index 100% rename from crates/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/stripe_webhook_summary.rs rename to crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/stripe_webhook_summary.rs diff --git a/crates/plugins/billing/src/stripe/mod.rs b/crates/service/plugins/billing/src/stripe/mod.rs similarity index 100% rename from crates/plugins/billing/src/stripe/mod.rs rename to crates/service/plugins/billing/src/stripe/mod.rs diff --git a/crates/plugins/billing/src/stripe/stripe_config.rs b/crates/service/plugins/billing/src/stripe/stripe_config.rs similarity index 100% rename from crates/plugins/billing/src/stripe/stripe_config.rs rename to crates/service/plugins/billing/src/stripe/stripe_config.rs diff --git a/crates/plugins/billing/src/stripe/traits/internal_product_to_stripe_lookup.rs b/crates/service/plugins/billing/src/stripe/traits/internal_product_to_stripe_lookup.rs similarity index 100% rename from crates/plugins/billing/src/stripe/traits/internal_product_to_stripe_lookup.rs rename to crates/service/plugins/billing/src/stripe/traits/internal_product_to_stripe_lookup.rs diff --git a/crates/plugins/billing/src/stripe/traits/internal_subscription_product_lookup.rs b/crates/service/plugins/billing/src/stripe/traits/internal_subscription_product_lookup.rs similarity index 100% rename from crates/plugins/billing/src/stripe/traits/internal_subscription_product_lookup.rs rename to crates/service/plugins/billing/src/stripe/traits/internal_subscription_product_lookup.rs diff --git a/crates/plugins/billing/src/stripe/traits/internal_user_lookup.rs b/crates/service/plugins/billing/src/stripe/traits/internal_user_lookup.rs similarity index 100% rename from crates/plugins/billing/src/stripe/traits/internal_user_lookup.rs rename to crates/service/plugins/billing/src/stripe/traits/internal_user_lookup.rs diff --git a/crates/plugins/billing/src/stripe/traits/mod.rs b/crates/service/plugins/billing/src/stripe/traits/mod.rs similarity index 100% rename from crates/plugins/billing/src/stripe/traits/mod.rs rename to crates/service/plugins/billing/src/stripe/traits/mod.rs diff --git a/crates/plugins/billing/src/users/http_endpoints/list_active_user_subscriptions_handler.rs b/crates/service/plugins/billing/src/users/http_endpoints/list_active_user_subscriptions_handler.rs similarity index 100% rename from crates/plugins/billing/src/users/http_endpoints/list_active_user_subscriptions_handler.rs rename to crates/service/plugins/billing/src/users/http_endpoints/list_active_user_subscriptions_handler.rs diff --git a/crates/plugins/billing/src/users/http_endpoints/mod.rs b/crates/service/plugins/billing/src/users/http_endpoints/mod.rs similarity index 100% rename from crates/plugins/billing/src/users/http_endpoints/mod.rs rename to crates/service/plugins/billing/src/users/http_endpoints/mod.rs diff --git a/crates/plugins/billing/src/users/mod.rs b/crates/service/plugins/billing/src/users/mod.rs similarity index 100% rename from crates/plugins/billing/src/users/mod.rs rename to crates/service/plugins/billing/src/users/mod.rs diff --git a/crates/plugins/inference_workloads/Cargo.toml b/crates/service/plugins/inference_workloads/Cargo.toml similarity index 91% rename from crates/plugins/inference_workloads/Cargo.toml rename to crates/service/plugins/inference_workloads/Cargo.toml index ee4ecb0b2d..49f8ec9ef9 100644 --- a/crates/plugins/inference_workloads/Cargo.toml +++ b/crates/service/plugins/inference_workloads/Cargo.toml @@ -15,7 +15,7 @@ path = "src/lib.rs" [dependencies] # Internal -container_common = { path = "../../lib/container_common" } +container_common = { path = "../../../lib/container_common" } # External anyhow = "1.0.40" diff --git a/crates/plugins/inference_workloads/src/lib.rs b/crates/service/plugins/inference_workloads/src/lib.rs similarity index 100% rename from crates/plugins/inference_workloads/src/lib.rs rename to crates/service/plugins/inference_workloads/src/lib.rs diff --git a/crates/plugins/users/Cargo.toml b/crates/service/plugins/users/Cargo.toml similarity index 73% rename from crates/plugins/users/Cargo.toml rename to crates/service/plugins/users/Cargo.toml index 184f0af84a..c8ce066ac6 100644 --- a/crates/plugins/users/Cargo.toml +++ b/crates/service/plugins/users/Cargo.toml @@ -15,13 +15,13 @@ path = "src/lib.rs" [dependencies] # Internal -container_common = { path = "../../lib/container_common" } -database_queries = { path = "../../lib/database_queries" } -enums = { path = "../../_types/enums" } -http_server_common = { path = "../../lib/http_server_common" } -reusable_types = { path = "../../_types/reusable_types" } -tokens = { path = "../../_types/tokens" } -user_input_common = { path = "../../lib/user_input_common" } +container_common = { path = "../../../lib/container_common" } +database_queries = { path = "../../../lib/database_queries" } +enums = { path = "../../../_types/enums" } +http_server_common = { path = "../../../lib/http_server_common" } +reusable_types = { path = "../../../_types/reusable_types" } +tokens = { path = "../../../_types/tokens" } +user_input_common = { path = "../../../lib/user_input_common" } # External anyhow = "1.0.40" diff --git a/crates/plugins/users/src/default_routes.rs b/crates/service/plugins/users/src/default_routes.rs similarity index 100% rename from crates/plugins/users/src/default_routes.rs rename to crates/service/plugins/users/src/default_routes.rs diff --git a/crates/plugins/users/src/endpoints/create_account_handler.rs b/crates/service/plugins/users/src/endpoints/create_account_handler.rs similarity index 100% rename from crates/plugins/users/src/endpoints/create_account_handler.rs rename to crates/service/plugins/users/src/endpoints/create_account_handler.rs diff --git a/crates/plugins/users/src/endpoints/edit_profile_handler.rs b/crates/service/plugins/users/src/endpoints/edit_profile_handler.rs similarity index 100% rename from crates/plugins/users/src/endpoints/edit_profile_handler.rs rename to crates/service/plugins/users/src/endpoints/edit_profile_handler.rs diff --git a/crates/plugins/users/src/endpoints/get_profile_handler.rs b/crates/service/plugins/users/src/endpoints/get_profile_handler.rs similarity index 100% rename from crates/plugins/users/src/endpoints/get_profile_handler.rs rename to crates/service/plugins/users/src/endpoints/get_profile_handler.rs diff --git a/crates/plugins/users/src/endpoints/login_handler.rs b/crates/service/plugins/users/src/endpoints/login_handler.rs similarity index 100% rename from crates/plugins/users/src/endpoints/login_handler.rs rename to crates/service/plugins/users/src/endpoints/login_handler.rs diff --git a/crates/plugins/users/src/endpoints/logout_handler.rs b/crates/service/plugins/users/src/endpoints/logout_handler.rs similarity index 100% rename from crates/plugins/users/src/endpoints/logout_handler.rs rename to crates/service/plugins/users/src/endpoints/logout_handler.rs diff --git a/crates/plugins/users/src/endpoints/mod.rs b/crates/service/plugins/users/src/endpoints/mod.rs similarity index 100% rename from crates/plugins/users/src/endpoints/mod.rs rename to crates/service/plugins/users/src/endpoints/mod.rs diff --git a/crates/plugins/users/src/endpoints/session_info_handler.rs b/crates/service/plugins/users/src/endpoints/session_info_handler.rs similarity index 100% rename from crates/plugins/users/src/endpoints/session_info_handler.rs rename to crates/service/plugins/users/src/endpoints/session_info_handler.rs diff --git a/crates/plugins/users/src/lib.rs b/crates/service/plugins/users/src/lib.rs similarity index 75% rename from crates/plugins/users/src/lib.rs rename to crates/service/plugins/users/src/lib.rs index 8d23f8f9f6..0789e01d7f 100644 --- a/crates/plugins/users/src/lib.rs +++ b/crates/service/plugins/users/src/lib.rs @@ -1,8 +1,8 @@ #[macro_use] extern crate lazy_static; #[macro_use] extern crate serde_derive; -pub const RESERVED_USERNAMES : &'static str = include_str!("../../../../db/reserved_usernames.txt"); -pub const RESERVED_SUBSTRINGS : &'static str = include_str!("../../../../db/reserved_usernames_including.txt"); +pub const RESERVED_USERNAMES : &'static str = include_str!("../../../../../db/reserved_usernames.txt"); +pub const RESERVED_SUBSTRINGS : &'static str = include_str!("../../../../../db/reserved_usernames_including.txt"); pub mod default_routes; pub mod endpoints; diff --git a/crates/plugins/users/src/utils/email_to_gravatar.rs b/crates/service/plugins/users/src/utils/email_to_gravatar.rs similarity index 100% rename from crates/plugins/users/src/utils/email_to_gravatar.rs rename to crates/service/plugins/users/src/utils/email_to_gravatar.rs diff --git a/crates/plugins/users/src/utils/mod.rs b/crates/service/plugins/users/src/utils/mod.rs similarity index 100% rename from crates/plugins/users/src/utils/mod.rs rename to crates/service/plugins/users/src/utils/mod.rs diff --git a/crates/plugins/users/src/utils/session_checker.rs b/crates/service/plugins/users/src/utils/session_checker.rs similarity index 100% rename from crates/plugins/users/src/utils/session_checker.rs rename to crates/service/plugins/users/src/utils/session_checker.rs diff --git a/crates/plugins/users/src/utils/session_cookie_manager.rs b/crates/service/plugins/users/src/utils/session_cookie_manager.rs similarity index 100% rename from crates/plugins/users/src/utils/session_cookie_manager.rs rename to crates/service/plugins/users/src/utils/session_cookie_manager.rs diff --git a/crates/plugins/users/src/utils/user_session_extended.rs b/crates/service/plugins/users/src/utils/user_session_extended.rs similarity index 100% rename from crates/plugins/users/src/utils/user_session_extended.rs rename to crates/service/plugins/users/src/utils/user_session_extended.rs diff --git a/crates/plugins/users/src/validations/is_reserved_username.rs b/crates/service/plugins/users/src/validations/is_reserved_username.rs similarity index 100% rename from crates/plugins/users/src/validations/is_reserved_username.rs rename to crates/service/plugins/users/src/validations/is_reserved_username.rs diff --git a/crates/plugins/users/src/validations/mod.rs b/crates/service/plugins/users/src/validations/mod.rs similarity index 100% rename from crates/plugins/users/src/validations/mod.rs rename to crates/service/plugins/users/src/validations/mod.rs diff --git a/crates/plugins/users/src/validations/validate_passwords.rs b/crates/service/plugins/users/src/validations/validate_passwords.rs similarity index 100% rename from crates/plugins/users/src/validations/validate_passwords.rs rename to crates/service/plugins/users/src/validations/validate_passwords.rs diff --git a/crates/plugins/users/src/validations/validate_profile_cashapp_username.rs b/crates/service/plugins/users/src/validations/validate_profile_cashapp_username.rs similarity index 100% rename from crates/plugins/users/src/validations/validate_profile_cashapp_username.rs rename to crates/service/plugins/users/src/validations/validate_profile_cashapp_username.rs diff --git a/crates/plugins/users/src/validations/validate_profile_discord_username.rs b/crates/service/plugins/users/src/validations/validate_profile_discord_username.rs similarity index 100% rename from crates/plugins/users/src/validations/validate_profile_discord_username.rs rename to crates/service/plugins/users/src/validations/validate_profile_discord_username.rs diff --git a/crates/plugins/users/src/validations/validate_profile_github_username.rs b/crates/service/plugins/users/src/validations/validate_profile_github_username.rs similarity index 100% rename from crates/plugins/users/src/validations/validate_profile_github_username.rs rename to crates/service/plugins/users/src/validations/validate_profile_github_username.rs diff --git a/crates/plugins/users/src/validations/validate_profile_twitch_username.rs b/crates/service/plugins/users/src/validations/validate_profile_twitch_username.rs similarity index 100% rename from crates/plugins/users/src/validations/validate_profile_twitch_username.rs rename to crates/service/plugins/users/src/validations/validate_profile_twitch_username.rs diff --git a/crates/plugins/users/src/validations/validate_profile_twitter_username.rs b/crates/service/plugins/users/src/validations/validate_profile_twitter_username.rs similarity index 100% rename from crates/plugins/users/src/validations/validate_profile_twitter_username.rs rename to crates/service/plugins/users/src/validations/validate_profile_twitter_username.rs diff --git a/crates/plugins/users/src/validations/validate_profile_website_url.rs b/crates/service/plugins/users/src/validations/validate_profile_website_url.rs similarity index 100% rename from crates/plugins/users/src/validations/validate_profile_website_url.rs rename to crates/service/plugins/users/src/validations/validate_profile_website_url.rs diff --git a/crates/plugins/users/src/validations/validate_username.rs b/crates/service/plugins/users/src/validations/validate_username.rs similarity index 100% rename from crates/plugins/users/src/validations/validate_username.rs rename to crates/service/plugins/users/src/validations/validate_username.rs diff --git a/crates/service/web/storyteller_web/Cargo.toml b/crates/service/web/storyteller_web/Cargo.toml index 6b889e4a02..7d4b6e463e 100644 --- a/crates/service/web/storyteller_web/Cargo.toml +++ b/crates/service/web/storyteller_web/Cargo.toml @@ -39,8 +39,8 @@ url_config = { path = "../../../lib/url_config" } user_input_common = { path = "../../../lib/user_input_common" } # Internal Components -billing_component = { path = "../../../plugins/billing" } -users_component = { path = "../../../plugins/users" } +billing_component = { path = "../../plugins/billing" } +users_component = { path = "../../plugins/users" } # Vendored code newrelic-telemetry = { path = "../../../vendor/newrelic-telemetry-sdk-rust" }