Update to Razorpay Orders checkout

main.py

@@ -15,7 +15,7 @@ if not os.getenv("GROQ_API_KEY") and os.getenv("HF_TOKEN"):
     os.environ["GROQ_API_KEY"] = os.getenv("HF_TOKEN")
 
 from humanizer import humanize_text
-from usage import check_usage_limit, increment_usage, get_user_profile, update_user_subscription, cancel_user_subscription
+from usage import check_usage_limit, increment_usage, get_user_profile, upgrade_user_plan, cancel_user_subscription
 
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi import Request
@@ -74,7 +74,14 @@ class HumanizeResponse(BaseModel):
     purpose: str
     usage: dict  # { count, limit, plan }
 
-class CreateSubscriptionRequest(BaseModel):
+class CreateOrderRequest(BaseModel):
+    user_id: str
+    plan: str
+
+class VerifyPaymentRequest(BaseModel):
+    razorpay_order_id: str
+    razorpay_payment_id: str
+    razorpay_signature: str
     user_id: str
     plan: str
 
@@ -136,72 +143,57 @@ async def get_user_plan(user_id: str):
         raise HTTPException(status_code=404, detail="User not found")
     return {"plan": profile.get("plan", "free")}
 
-@app.post("/create-subscription")
-async def create_subscription(request: CreateSubscriptionRequest):
+@app.post("/api/create-order")
+async def create_order(request: CreateOrderRequest):
+    if not request.user_id:
+        raise HTTPException(status_code=401, detail="Unauthorized")
     if request.plan not in ["starter", "pro"]:
         raise HTTPException(status_code=400, detail="Invalid plan")
     
-    plan_id = RAZORPAY_STARTER_PLAN_ID if request.plan == "starter" else RAZORPAY_PRO_PLAN_ID
+    # Map plans to amounts (e.g. Starter = $9 = ₹750 = 75000 paise)
+    amount = 75000 if request.plan == "starter" else 150000
+    
+    if amount < 100:
+        raise HTTPException(status_code=400, detail="Amount must be at least 100 paise")
     
     try:
-        subscription_data = {
-            "plan_id": plan_id,
-            "customer_notify": 1,
-            "total_count": 12,
-            "notes": {
-                "user_id": request.user_id
-            }
+        order_data = {
+            "amount": amount,
+            "currency": "INR",
+            "receipt": request.user_id
+        }
+        order = razorpay_client.order.create(order_data)
+        return {
+            "order_id": order["id"],
+            "amount": amount,
+            "currency": "INR",
+            "key_id": RAZORPAY_KEY_ID
         }
-        subscription = razorpay_client.subscription.create(subscription_data)
-        return {"subscription_id": subscription["id"], "key_id": RAZORPAY_KEY_ID}
     except Exception as e:
         raise HTTPException(status_code=500, detail=str(e))
 
-@app.post("/razorpay-webhook")
-async def razorpay_webhook(request: Request):
-    payload = await request.body()
-    signature = request.headers.get("X-Razorpay-Signature", "")
-    
-    if not RAZORPAY_WEBHOOK_SECRET:
-        raise HTTPException(status_code=500, detail="Webhook secret not configured")
-        
-    expected_signature = hmac.new(
-        key=RAZORPAY_WEBHOOK_SECRET.encode('utf-8'),
-        msg=payload,
-        digestmod='sha256'
-    ).hexdigest()
-    
-    if not hmac.compare_digest(expected_signature, signature):
-        raise HTTPException(status_code=400, detail="Invalid signature")
+@app.post("/api/verify-payment")
+async def verify_payment(request: VerifyPaymentRequest):
+    if not request.razorpay_order_id or not request.razorpay_payment_id or not request.razorpay_signature:
+        raise HTTPException(status_code=400, detail="Missing required fields")
         
     try:
-        data = json.loads(payload.decode('utf-8'))
-        event = data.get("event")
+        expected_signature = hmac.new(
+            key=RAZORPAY_KEY_SECRET.encode('utf-8'),
+            msg=(request.razorpay_order_id + "|" + request.razorpay_payment_id).encode('utf-8'),
+            digestmod='sha256'
+        ).hexdigest()
         
-        if event == "subscription.charged":
-            sub_entity = data.get("payload", {}).get("subscription", {}).get("entity", {})
-            user_id = sub_entity.get("notes", {}).get("user_id")
-            subscription_id = sub_entity.get("id")
-            plan_id = sub_entity.get("plan_id")
+        if not hmac.compare_digest(expected_signature, request.razorpay_signature):
+            raise HTTPException(status_code=400, detail="Invalid signature")
+            
+        profile = get_user_profile(request.user_id)
+        if profile and profile.get("plan") != request.plan:
+            upgrade_user_plan(request.user_id, request.plan)
             
-            plan_name = "free"
-            if plan_id == RAZORPAY_STARTER_PLAN_ID:
-                plan_name = "starter"
-            elif plan_id == RAZORPAY_PRO_PLAN_ID:
-                plan_name = "pro"
-                
-            if user_id and plan_name != "free":
-                profile = get_user_profile(user_id)
-                if profile and profile.get("plan") != plan_name:
-                    update_user_subscription(user_id, plan_name, subscription_id)
-                    
-        elif event in ["subscription.cancelled", "subscription.halted"]:
-            sub_entity = data.get("payload", {}).get("subscription", {}).get("entity", {})
-            user_id = sub_entity.get("notes", {}).get("user_id")
-            if user_id:
-                cancel_user_subscription(user_id)
-                
         return {"status": "ok"}
+    except HTTPException:
+        raise
     except Exception as e:
         raise HTTPException(status_code=500, detail=str(e))
 

usage.py

@@ -54,12 +54,11 @@ def increment_usage(user_id: str) -> None:
         {"humanization_count": new_count}
     ).eq("id", user_id).execute()
 
-def update_user_subscription(user_id: str, plan: str, subscription_id: str) -> None:
-    """Update user plan and reset usage."""
+def upgrade_user_plan(user_id: str, plan: str) -> None:
+    """Update user plan for a one-time order and reset usage."""
     client = get_supabase()
     client.table("profiles").update({
         "plan": plan,
-        "razorpay_subscription_id": subscription_id,
         "humanization_count": 0
     }).eq("id", user_id).execute()