Add subcription feature 6
This commit is contained in:
@@ -1,5 +1,12 @@
|
||||
"""
|
||||
Subscription routes for API Gateway - Direct subscription endpoints
|
||||
|
||||
New URL Pattern Architecture:
|
||||
- Registration: /registration/payment-setup, /registration/complete, /registration/state/{state_id}
|
||||
- Tenant Subscription: /tenants/{tenant_id}/subscription/*
|
||||
- Setup Intents: /setup-intents/{setup_intent_id}/verify
|
||||
- Payment Customers: /payment-customers/create
|
||||
- Plans: /plans (public)
|
||||
"""
|
||||
|
||||
from fastapi import APIRouter, Request, Response, HTTPException, Path
|
||||
@@ -15,74 +22,202 @@ logger = logging.getLogger(__name__)
|
||||
router = APIRouter()
|
||||
|
||||
# ================================================================
|
||||
# SUBSCRIPTION ENDPOINTS - Direct routing to tenant service
|
||||
# PUBLIC ENDPOINTS (No Authentication)
|
||||
# ================================================================
|
||||
|
||||
@router.api_route("/tenants/subscriptions/{tenant_id}/{path:path}", methods=["GET", "POST", "PUT", "DELETE", "OPTIONS"])
|
||||
async def proxy_subscription_endpoints(request: Request, tenant_id: str = Path(...), path: str = ""):
|
||||
"""Proxy subscription requests directly to tenant service"""
|
||||
target_path = f"/api/v1/tenants/subscriptions/{tenant_id}/{path}".rstrip("/")
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
@router.api_route("/subscriptions/plans", methods=["GET", "OPTIONS"])
|
||||
async def proxy_subscription_plans(request: Request):
|
||||
"""Proxy subscription plans request to tenant service"""
|
||||
target_path = "/plans"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
@router.api_route("/plans", methods=["GET", "OPTIONS"])
|
||||
async def proxy_plans(request: Request):
|
||||
"""Proxy plans request to tenant service"""
|
||||
target_path = "/plans"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
@router.api_route("/subscriptions/{tenant_id}/invoices", methods=["GET", "OPTIONS"])
|
||||
async def proxy_invoices(request: Request, tenant_id: str = Path(...)):
|
||||
"""Proxy invoices request to tenant service"""
|
||||
target_path = f"/api/v1/subscriptions/{tenant_id}/invoices"
|
||||
@router.api_route("/plans/{tier}", methods=["GET", "OPTIONS"])
|
||||
async def proxy_plan_details(request: Request, tier: str = Path(...)):
|
||||
"""Proxy specific plan details request to tenant service"""
|
||||
target_path = f"/plans/{tier}"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
@router.api_route("/subscriptions/{tenant_id}/status", methods=["GET", "OPTIONS"])
|
||||
@router.api_route("/plans/{tier}/features", methods=["GET", "OPTIONS"])
|
||||
async def proxy_plan_features(request: Request, tier: str = Path(...)):
|
||||
"""Proxy plan features request to tenant service"""
|
||||
target_path = f"/plans/{tier}/features"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
@router.api_route("/plans/{tier}/limits", methods=["GET", "OPTIONS"])
|
||||
async def proxy_plan_limits(request: Request, tier: str = Path(...)):
|
||||
"""Proxy plan limits request to tenant service"""
|
||||
target_path = f"/plans/{tier}/limits"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
@router.api_route("/plans/compare", methods=["GET", "OPTIONS"])
|
||||
async def proxy_plan_compare(request: Request):
|
||||
"""Proxy plan comparison request to tenant service"""
|
||||
target_path = "/plans/compare"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
# ================================================================
|
||||
# REGISTRATION FLOW ENDPOINTS (No Tenant Context)
|
||||
# ================================================================
|
||||
|
||||
@router.api_route("/registration/payment-setup", methods=["POST", "OPTIONS"])
|
||||
async def proxy_registration_payment_setup(request: Request):
|
||||
"""Proxy registration payment setup request to tenant service"""
|
||||
target_path = "/api/v1/registration/payment-setup"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
@router.api_route("/registration/complete", methods=["POST", "OPTIONS"])
|
||||
async def proxy_registration_complete(request: Request):
|
||||
"""Proxy registration completion request to tenant service"""
|
||||
target_path = "/api/v1/registration/complete"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
@router.api_route("/registration/state/{state_id}", methods=["GET", "OPTIONS"])
|
||||
async def proxy_registration_state(request: Request, state_id: str = Path(...)):
|
||||
"""Proxy registration state request to tenant service"""
|
||||
target_path = f"/api/v1/registration/state/{state_id}"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
# ================================================================
|
||||
# TENANT SUBSCRIPTION STATUS ENDPOINTS
|
||||
# ================================================================
|
||||
|
||||
@router.api_route("/tenants/{tenant_id}/subscription/status", methods=["GET", "OPTIONS"])
|
||||
async def proxy_subscription_status(request: Request, tenant_id: str = Path(...)):
|
||||
"""Proxy subscription status request to tenant service"""
|
||||
target_path = f"/api/v1/subscriptions/{tenant_id}/status"
|
||||
target_path = f"/api/v1/tenants/{tenant_id}/subscription/status"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
@router.api_route("/subscriptions/{tenant_id}/payment-method", methods=["GET", "OPTIONS"])
|
||||
@router.api_route("/tenants/{tenant_id}/subscription/details", methods=["GET", "OPTIONS"])
|
||||
async def proxy_subscription_details(request: Request, tenant_id: str = Path(...)):
|
||||
"""Proxy subscription details request to tenant service"""
|
||||
target_path = f"/api/v1/tenants/{tenant_id}/subscription/details"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
@router.api_route("/tenants/{tenant_id}/subscription/tier", methods=["GET", "OPTIONS"])
|
||||
async def proxy_subscription_tier(request: Request, tenant_id: str = Path(...)):
|
||||
"""Proxy subscription tier request to tenant service (cached)"""
|
||||
target_path = f"/api/v1/tenants/{tenant_id}/subscription/tier"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
@router.api_route("/tenants/{tenant_id}/subscription/limits", methods=["GET", "OPTIONS"])
|
||||
async def proxy_subscription_limits(request: Request, tenant_id: str = Path(...)):
|
||||
"""Proxy subscription limits request to tenant service"""
|
||||
target_path = f"/api/v1/tenants/{tenant_id}/subscription/limits"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
@router.api_route("/tenants/{tenant_id}/subscription/usage", methods=["GET", "OPTIONS"])
|
||||
async def proxy_subscription_usage(request: Request, tenant_id: str = Path(...)):
|
||||
"""Proxy subscription usage request to tenant service"""
|
||||
target_path = f"/api/v1/tenants/{tenant_id}/subscription/usage"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
@router.api_route("/tenants/{tenant_id}/subscription/features/{feature}", methods=["GET", "OPTIONS"])
|
||||
async def proxy_subscription_feature(request: Request, tenant_id: str = Path(...), feature: str = Path(...)):
|
||||
"""Proxy subscription feature check request to tenant service"""
|
||||
target_path = f"/api/v1/tenants/{tenant_id}/subscription/features/{feature}"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
# ================================================================
|
||||
# SUBSCRIPTION MANAGEMENT ENDPOINTS
|
||||
# ================================================================
|
||||
|
||||
@router.api_route("/tenants/{tenant_id}/subscription/cancel", methods=["POST", "OPTIONS"])
|
||||
async def proxy_subscription_cancel(request: Request, tenant_id: str = Path(...)):
|
||||
"""Proxy subscription cancellation request to tenant service"""
|
||||
target_path = f"/api/v1/tenants/{tenant_id}/subscription/cancel"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
@router.api_route("/tenants/{tenant_id}/subscription/reactivate", methods=["POST", "OPTIONS"])
|
||||
async def proxy_subscription_reactivate(request: Request, tenant_id: str = Path(...)):
|
||||
"""Proxy subscription reactivation request to tenant service"""
|
||||
target_path = f"/api/v1/tenants/{tenant_id}/subscription/reactivate"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
@router.api_route("/tenants/{tenant_id}/subscription/validate-upgrade/{new_plan}", methods=["GET", "OPTIONS"])
|
||||
async def proxy_validate_upgrade(request: Request, tenant_id: str = Path(...), new_plan: str = Path(...)):
|
||||
"""Proxy plan upgrade validation request to tenant service"""
|
||||
target_path = f"/api/v1/tenants/{tenant_id}/subscription/validate-upgrade/{new_plan}"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
@router.api_route("/tenants/{tenant_id}/subscription/upgrade", methods=["POST", "OPTIONS"])
|
||||
async def proxy_subscription_upgrade(request: Request, tenant_id: str = Path(...)):
|
||||
"""Proxy subscription upgrade request to tenant service"""
|
||||
target_path = f"/api/v1/tenants/{tenant_id}/subscription/upgrade"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
# ================================================================
|
||||
# QUOTA & LIMIT CHECK ENDPOINTS
|
||||
# ================================================================
|
||||
|
||||
@router.api_route("/tenants/{tenant_id}/subscription/limits/locations", methods=["GET", "OPTIONS"])
|
||||
async def proxy_location_limits(request: Request, tenant_id: str = Path(...)):
|
||||
"""Proxy location limits check request to tenant service"""
|
||||
target_path = f"/api/v1/tenants/{tenant_id}/subscription/limits/locations"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
@router.api_route("/tenants/{tenant_id}/subscription/limits/products", methods=["GET", "OPTIONS"])
|
||||
async def proxy_product_limits(request: Request, tenant_id: str = Path(...)):
|
||||
"""Proxy product limits check request to tenant service"""
|
||||
target_path = f"/api/v1/tenants/{tenant_id}/subscription/limits/products"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
@router.api_route("/tenants/{tenant_id}/subscription/limits/users", methods=["GET", "OPTIONS"])
|
||||
async def proxy_user_limits(request: Request, tenant_id: str = Path(...)):
|
||||
"""Proxy user limits check request to tenant service"""
|
||||
target_path = f"/api/v1/tenants/{tenant_id}/subscription/limits/users"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
@router.api_route("/tenants/{tenant_id}/subscription/limits/recipes", methods=["GET", "OPTIONS"])
|
||||
async def proxy_recipe_limits(request: Request, tenant_id: str = Path(...)):
|
||||
"""Proxy recipe limits check request to tenant service"""
|
||||
target_path = f"/api/v1/tenants/{tenant_id}/subscription/limits/recipes"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
@router.api_route("/tenants/{tenant_id}/subscription/limits/suppliers", methods=["GET", "OPTIONS"])
|
||||
async def proxy_supplier_limits(request: Request, tenant_id: str = Path(...)):
|
||||
"""Proxy supplier limits check request to tenant service"""
|
||||
target_path = f"/api/v1/tenants/{tenant_id}/subscription/limits/suppliers"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
# ================================================================
|
||||
# PAYMENT MANAGEMENT ENDPOINTS
|
||||
# ================================================================
|
||||
|
||||
@router.api_route("/tenants/{tenant_id}/subscription/payment-method", methods=["GET", "POST", "OPTIONS"])
|
||||
async def proxy_payment_method(request: Request, tenant_id: str = Path(...)):
|
||||
"""Proxy payment method request to tenant service"""
|
||||
target_path = f"/api/v1/subscriptions/{tenant_id}/payment-method"
|
||||
target_path = f"/api/v1/tenants/{tenant_id}/subscription/payment-method"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
@router.api_route("/subscriptions/cancel", methods=["POST", "OPTIONS"])
|
||||
async def proxy_subscription_cancel(request: Request):
|
||||
"""Proxy subscription cancellation request to tenant service"""
|
||||
target_path = "/api/v1/subscriptions/cancel"
|
||||
@router.api_route("/tenants/{tenant_id}/subscription/invoices", methods=["GET", "OPTIONS"])
|
||||
async def proxy_invoices(request: Request, tenant_id: str = Path(...)):
|
||||
"""Proxy invoices request to tenant service"""
|
||||
target_path = f"/api/v1/tenants/{tenant_id}/subscription/invoices"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
@router.api_route("/subscriptions/create-for-registration", methods=["POST", "OPTIONS"])
|
||||
async def proxy_create_for_registration(request: Request):
|
||||
"""Proxy create-for-registration request to tenant service"""
|
||||
target_path = "/api/v1/subscriptions/create-for-registration"
|
||||
# ================================================================
|
||||
# SETUP INTENT VERIFICATION
|
||||
# ================================================================
|
||||
|
||||
@router.api_route("/setup-intents/{setup_intent_id}/verify", methods=["GET", "OPTIONS"])
|
||||
async def proxy_setup_intent_verify(request: Request, setup_intent_id: str = Path(...)):
|
||||
"""Proxy SetupIntent verification request to tenant service"""
|
||||
target_path = f"/api/v1/setup-intents/{setup_intent_id}/verify"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
# ================================================================
|
||||
# PAYMENT CUSTOMER MANAGEMENT
|
||||
# ================================================================
|
||||
|
||||
@router.api_route("/payment-customers/create", methods=["POST", "OPTIONS"])
|
||||
async def proxy_payment_customer_create(request: Request):
|
||||
"""Proxy payment customer creation request to tenant service"""
|
||||
target_path = "/api/v1/payment-customers/create"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
@router.api_route("/setup-intents/{setup_intent_id}/verify", methods=["GET", "OPTIONS"])
|
||||
async def proxy_setup_intent_verify(request: Request, setup_intent_id: str):
|
||||
"""Proxy SetupIntent verification request to tenant service"""
|
||||
target_path = f"/api/v1/setup-intents/{setup_intent_id}/verify"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
|
||||
@router.api_route("/subscriptions/reactivate", methods=["POST", "OPTIONS"])
|
||||
async def proxy_subscription_reactivate(request: Request):
|
||||
"""Proxy subscription reactivation request to tenant service"""
|
||||
target_path = "/api/v1/subscriptions/reactivate"
|
||||
return await _proxy_to_tenant_service(request, target_path)
|
||||
# ================================================================
|
||||
# USAGE FORECAST ENDPOINTS
|
||||
# ================================================================
|
||||
|
||||
@router.api_route("/usage-forecast", methods=["GET", "OPTIONS"])
|
||||
async def proxy_usage_forecast(request: Request):
|
||||
@@ -125,7 +260,7 @@ async def _proxy_request(request: Request, target_path: str, service_url: str):
|
||||
|
||||
# Use unified HeaderManager for consistent header forwarding
|
||||
headers = header_manager.get_all_headers_for_proxy(request)
|
||||
|
||||
|
||||
# Debug logging
|
||||
user_context = getattr(request.state, 'user', None)
|
||||
service_context = getattr(request.state, 'service', None)
|
||||
@@ -179,4 +314,4 @@ async def _proxy_request(request: Request, target_path: str, service_url: str):
|
||||
raise HTTPException(
|
||||
status_code=500,
|
||||
detail="Internal gateway error"
|
||||
)
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user