paywall converted but create invoice creates BAD REQUEST

lnbits/extensions/paywall/views_api.py

@@ -1,81 +1,68 @@
-from quart import g, jsonify, request
 from http import HTTPStatus
 
+from fastapi import Depends, Query
+from starlette.exceptions import HTTPException
+
 from lnbits.core.crud import get_user, get_wallet
-from lnbits.core.services import create_invoice, check_invoice_status
-from lnbits.decorators import api_check_wallet_key, api_validate_post_request
+from lnbits.core.services import check_invoice_status, create_invoice
+from lnbits.decorators import WalletTypeInfo, get_key_type
 
 from . import paywall_ext
-from .crud import create_paywall, get_paywall, get_paywalls, delete_paywall
+from .crud import create_paywall, delete_paywall, get_paywall, get_paywalls
+from .models import CheckPaywallInvoice, CreatePaywall, CreatePaywallInvoice
 
 
-@paywall_ext.route("/api/v1/paywalls", methods=["GET"])
-@api_check_wallet_key("invoice")
-async def api_paywalls():
-    wallet_ids = [g.wallet.id]
+@paywall_ext.get("/api/v1/paywalls")
+async def api_paywalls(wallet: WalletTypeInfo = Depends(get_key_type), all_wallets: bool = Query(False)):
+    wallet_ids = [wallet.wallet.id]
 
-    if "all_wallets" in request.args:
-        wallet_ids = (await get_user(g.wallet.user)).wallet_ids
+    if all_wallets:
+        wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids
 
-    return (
-        jsonify([paywall._asdict() for paywall in await get_paywalls(wallet_ids)]),
-        HTTPStatus.OK,
-    )
+    return [paywall.dict() for paywall in await get_paywalls(wallet_ids)]
 
 
-@paywall_ext.route("/api/v1/paywalls", methods=["POST"])
-@api_check_wallet_key("invoice")
-@api_validate_post_request(
-    schema={
-        "url": {"type": "string", "empty": False, "required": True},
-        "memo": {"type": "string", "empty": False, "required": True},
-        "description": {
-            "type": "string",
-            "empty": True,
-            "nullable": True,
-            "required": False,
-        },
-        "amount": {"type": "integer", "min": 0, "required": True},
-        "remembers": {"type": "boolean", "required": True},
-    }
-)
-async def api_paywall_create():
-    paywall = await create_paywall(wallet_id=g.wallet.id, **g.data)
-    return jsonify(paywall._asdict()), HTTPStatus.CREATED
+@paywall_ext.post("/api/v1/paywalls")
+async def api_paywall_create(data: CreatePaywall, wallet: WalletTypeInfo = Depends(get_key_type)):
+    paywall = await create_paywall(wallet_id=wallet.wallet.id, data=data)
+    return paywall.dict()
 
 
-@paywall_ext.route("/api/v1/paywalls/<paywall_id>", methods=["DELETE"])
-@api_check_wallet_key("invoice")
-async def api_paywall_delete(paywall_id):
+@paywall_ext.delete("/api/v1/paywalls/{paywall_id}")
+async def api_paywall_delete(paywall_id, wallet: WalletTypeInfo = Depends(get_key_type)):
     paywall = await get_paywall(paywall_id)
 
     if not paywall:
-        return jsonify({"message": "Paywall does not exist."}), HTTPStatus.NOT_FOUND
+        raise HTTPException(
+                status_code=HTTPStatus.NOT_FOUND,
+                detail="Paywall does not exist."
+            )
 
-    if paywall.wallet != g.wallet.id:
-        return jsonify({"message": "Not your paywall."}), HTTPStatus.FORBIDDEN
+    if paywall.wallet != wallet.wallet.id:
+        raise HTTPException(
+                status_code=HTTPStatus.FORBIDDEN,
+                detail="Not your paywall."
+            )
 
     await delete_paywall(paywall_id)
-
-    return "", HTTPStatus.NO_CONTENT
+    raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
 
 
-@paywall_ext.route("/api/v1/paywalls/<paywall_id>/invoice", methods=["POST"])
-@api_validate_post_request(
-    schema={"amount": {"type": "integer", "min": 1, "required": True}}
-)
-async def api_paywall_create_invoice(paywall_id):
+@paywall_ext.post("/api/v1/paywalls/{paywall_id}/invoice")
+async def api_paywall_create_invoice(paywall_id, data: CreatePaywallInvoice, wallet: WalletTypeInfo = Depends(get_key_type)):
     paywall = await get_paywall(paywall_id)
-
-    if g.data["amount"] < paywall.amount:
-        return (
-            jsonify({"message": f"Minimum amount is {paywall.amount} sat."}),
-            HTTPStatus.BAD_REQUEST,
-        )
+    print("PAYW", paywall)
+    print("DATA", data)
+    
+    if data.amount < paywall.amount:
+        raise HTTPException(
+                status_code=HTTPStatus.BAD_REQUEST,
+                detail=f"Minimum amount is {paywall.amount} sat."
+            )
 
     try:
         amount = (
-            g.data["amount"] if g.data["amount"] > paywall.amount else paywall.amount
+            data.amount if data.amount > paywall.amount else paywall.amount
         )
         payment_hash, payment_request = await create_invoice(
             wallet_id=paywall.wallet,
@@ -84,38 +71,35 @@ async def api_paywall_create_invoice(paywall_id):
             extra={"tag": "paywall"},
         )
     except Exception as e:
-        return jsonify({"message": str(e)}), HTTPStatus.INTERNAL_SERVER_ERROR
+        raise HTTPException(
+                status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
+                detail=str(e)
+            )
 
-    return (
-        jsonify({"payment_hash": payment_hash, "payment_request": payment_request}),
-        HTTPStatus.CREATED,
-    )
+    return {"payment_hash": payment_hash, "payment_request": payment_request}
 
 
-@paywall_ext.route("/api/v1/paywalls/<paywall_id>/check_invoice", methods=["POST"])
-@api_validate_post_request(
-    schema={"payment_hash": {"type": "string", "empty": False, "required": True}}
-)
-async def api_paywal_check_invoice(paywall_id):
+@paywall_ext.post("/api/v1/paywalls/{paywall_id}/check_invoice")
+async def api_paywal_check_invoice(data: CheckPaywallInvoice, paywall_id):
     paywall = await get_paywall(paywall_id)
-
+    payment_hash = data.payment_hash
     if not paywall:
-        return jsonify({"message": "Paywall does not exist."}), HTTPStatus.NOT_FOUND
+        raise HTTPException(
+                status_code=HTTPStatus.NOT_FOUND,
+                detail="Paywall does not exist."
+            )
 
     try:
-        status = await check_invoice_status(paywall.wallet, g.data["payment_hash"])
+        status = await check_invoice_status(paywall.wallet, payment_hash)
         is_paid = not status.pending
     except Exception:
-        return jsonify({"paid": False}), HTTPStatus.OK
+        return {"paid": False}
 
     if is_paid:
         wallet = await get_wallet(paywall.wallet)
-        payment = await wallet.get_payment(g.data["payment_hash"])
+        payment = await wallet.get_payment(payment_hash)
         await payment.set_pending(False)
 
-        return (
-            jsonify({"paid": True, "url": paywall.url, "remembers": paywall.remembers}),
-            HTTPStatus.OK,
-        )
+        return {"paid": True, "url": paywall.url, "remembers": paywall.remembers}
 
-    return jsonify({"paid": False}), HTTPStatus.OK
+    return {"paid": False}