feat: update offlineshop extension

lnbits/extensions/offlineshop/views_api.py

@@ -1,10 +1,16 @@
-from typing import Optional
+import json
+
+from typing import List, Optional
+from fastapi.params import Depends
 from pydantic.main import BaseModel
 
 from http import HTTPStatus
-from lnurl.exceptions import InvalidUrl as LnurlInvalidUrl  # type: ignore
+from lnurl.exceptions import InvalidUrl as LnurlInvalidUrl
+from starlette.exceptions import HTTPException
+from starlette.requests import Request
+from starlette.responses import HTMLResponse, JSONResponse  # type: ignore
 
-from lnbits.decorators import api_check_wallet_key, api_validate_post_request
+from lnbits.decorators import WalletTypeInfo, get_key_type
 from lnbits.utils.exchange_rates import currencies
 from lnbits.requestvars import g
 
@@ -22,46 +28,43 @@ from .models import ShopCounter
 
 @offlineshop_ext.get("/api/v1/currencies")
 async def api_list_currencies_available():
-    return jsonify(list(currencies.keys()))
+    return json.dumps(list(currencies.keys()))
 
 
 @offlineshop_ext.get("/api/v1/offlineshop")
-@api_check_wallet_key("invoice")
-async def api_shop_from_wallet():
-    shop = await get_or_create_shop_by_wallet(g().wallet.id)
+# @api_check_wallet_key("invoice")
+async def api_shop_from_wallet(r: Request, wallet: WalletTypeInfo = Depends(get_key_type)):
+    shop = await get_or_create_shop_by_wallet(wallet.wallet.id)
     items = await get_items(shop.id)
 
     try:
-        return (
-                {
-                    **shop._asdict(),
-                    **{
-                        "otp_key": shop.otp_key,
-                        "items": [item.values() for item in items],
-                    },
-                },
-            HTTPStatus.OK,
-        )
+        return {
+            **shop.dict(),
+            **{
+                "otp_key": shop.otp_key,
+                "items": [item.values(r) for item in items],
+            },
+        }
     except LnurlInvalidUrl:
-        return (
-                {
-                    "message": "LNURLs need to be delivered over a publically accessible `https` domain or Tor."
-                },
-            HTTPStatus.UPGRADE_REQUIRED,
+        raise HTTPException(
+            status_code=HTTPStatus.UPGRADE_REQUIRED,
+            detail="LNURLs need to be delivered over a publically accessible `https` domain or Tor.",
         )
 
+
 class CreateItemsData(BaseModel):
-    name:  str
+    name: str
     description: str
-    image:  Optional[str]
-    price:  int
-    unit:  str
+    image: Optional[str]
+    price: int
+    unit: str
+
 
 @offlineshop_ext.post("/api/v1/offlineshop/items")
 @offlineshop_ext.put("/api/v1/offlineshop/items/{item_id}")
-@api_check_wallet_key("invoice")
-async def api_add_or_update_item(data: CreateItemsData, item_id=None):
-    shop = await get_or_create_shop_by_wallet(g().wallet.id)
+# @api_check_wallet_key("invoice")
+async def api_add_or_update_item(data: CreateItemsData, item_id=None, wallet: WalletTypeInfo = Depends(get_key_type)):
+    shop = await get_or_create_shop_by_wallet(wallet.wallet.id)
     if item_id == None:
         await add_item(
             shop.id,
@@ -71,7 +74,7 @@ async def api_add_or_update_item(data: CreateItemsData, item_id=None):
             data.price,
             data.unit,
         )
-        return "", HTTPStatus.CREATED
+        return HTMLResponse(status_code=HTTPStatus.CREATED) 
     else:
         await update_item(
             shop.id,
@@ -82,36 +85,35 @@ async def api_add_or_update_item(data: CreateItemsData, item_id=None):
             data.price,
             data.unit,
         )
-        return "", HTTPStatus.OK
 
 
 @offlineshop_ext.delete("/api/v1/offlineshop/items/{item_id}")
-@api_check_wallet_key("invoice")
-async def api_delete_item(item_id):
-    shop = await get_or_create_shop_by_wallet(g().wallet.id)
+# @api_check_wallet_key("invoice")
+async def api_delete_item(item_id, wallet: WalletTypeInfo = Depends(get_key_type)):
+    shop = await get_or_create_shop_by_wallet(wallet.wallet.id)
     await delete_item_from_shop(shop.id, item_id)
-    return "", HTTPStatus.NO_CONTENT
+    raise HTTPException(status_code=HTTPStatus.NO_CONTENT)
 
 
 class CreateMethodData(BaseModel):
-    method:  str
+    method: str
     wordlist: Optional[str]
 
+
 @offlineshop_ext.put("/api/v1/offlineshop/method")
-@api_check_wallet_key("invoice")
-async def api_set_method(data: CreateMethodData):
+# @api_check_wallet_key("invoice")
+async def api_set_method(data: CreateMethodData, wallet: WalletTypeInfo = Depends(get_key_type)):
     method = data.method
 
     wordlist = data.wordlist.split("\n") if data.wordlist else None
     wordlist = [word.strip() for word in wordlist if word.strip()]
 
-    shop = await get_or_create_shop_by_wallet(g().wallet.id)
+    shop = await get_or_create_shop_by_wallet(wallet.wallet.id)
     if not shop:
-        return "", HTTPStatus.NOT_FOUND
+        raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
 
     updated_shop = await set_method(shop.id, method, "\n".join(wordlist))
     if not updated_shop:
-        return "", HTTPStatus.NOT_FOUND
+        raise HTTPException(status_code=HTTPStatus.NOT_FOUND)
 
     ShopCounter.reset(updated_shop)
-    return "", HTTPStatus.OK