auth bearer fix

x-api-key now says unauthorized

lnbits/decorators.py

@@ -1,5 +1,6 @@
 from functools import wraps
 from http import HTTPStatus
+from base64 import b64decode
 
 from fastapi.security import api_key
 from pydantic.types import UUID4
@@ -12,6 +13,7 @@ from fastapi.exceptions import HTTPException
 from fastapi.openapi.models import APIKey, APIKeyIn
 from fastapi.params import Security
 from fastapi.security.api_key import APIKeyHeader, APIKeyQuery
+from fastapi.security import OAuth2PasswordBearer
 from fastapi.security.base import SecurityBase
 from starlette.requests import Request
 
@@ -85,14 +87,19 @@ class WalletTypeInfo():
 
 api_key_header = APIKeyHeader(name="X-API-KEY", auto_error=False, description="Admin or Invoice key for wallet API's")
 api_key_query = APIKeyQuery(name="api-key", auto_error=False, description="Admin or Invoice key for wallet API's")
+oauth2_scheme = OAuth2PasswordBearer(tokenUrl="token")
 async def get_key_type(r: Request,
+                        token: str = Security(oauth2_scheme),
                         api_key_header: str = Security(api_key_header),
                         api_key_query: str = Security(api_key_query)) -> WalletTypeInfo:
     # 0: admin
     # 1: invoice
     # 2: invalid
+    # print("TOKEN", b64decode(token).decode("utf-8").split(":"))
+    
+    key_type, key = b64decode(token).decode("utf-8").split(":")
     try:
-        checker = WalletAdminKeyChecker(api_key=api_key_query)
+        checker = WalletAdminKeyChecker(api_key=key if token else api_key_query)
         await checker.__call__(r)
         return WalletTypeInfo(0, checker.wallet)
     except HTTPException as e:
@@ -104,7 +111,7 @@ async def get_key_type(r: Request,
         raise
 
     try:
-        checker = WalletInvoiceKeyChecker()
+        checker = WalletInvoiceKeyChecker(api_key=key if token else None)
         await checker.__call__(r)
         return WalletTypeInfo(1, checker.wallet)
     except HTTPException as e: