🩹 fixed bearer token authentication

config-sample.py

@@ -1,5 +1,4 @@
-username = "apiuser"
+token = 'topsecret_token'
-password = "topsecret"
 
 
 domain = "lists.example.org"

main.py

@@ -1,6 +1,6 @@
 from typing import Annotated
-from fastapi import Depends, FastAPI
+from fastapi import Depends, FastAPI, HTTPException
-from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
+from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
 
 import hsadmin
 import config
@@ -8,25 +8,20 @@ import config
 
 app = FastAPI()
 
-oauth2_scheme = OAuth2PasswordBearer(tokenUrl="token")
+security = HTTPBearer()
-
-@app.get("/")
-def root():
-    return {"Hello": "World"};
-
-@app.post("/token")
-async def login(form_data: Annotated[OAuth2PasswordRequestForm, Depends()]):
-
-    if not config.username == form_data.username:
-        raise HTTPException(status_code=400, detail="Incorrect username or password")
-    if not config.password == form_data.password:
-        raise HTTPException(status_code=400, detail="Incorrect username or password")
-
-    return {"access_token": form_data.username, "token_type": "bearer"}
 
+def check_token(token: str) -> bool:
+    """Check if the token is valid"""
+    return token == config.token
 
 @app.put("/list/{listname}")
-def create_list(token: Annotated[str, Depends(oauth2_scheme)], listname: str):
+def create_list(token: Annotated[HTTPAuthorizationCredentials, Depends(security)], listname: str):
+
+    # Authenticate
+    if not check_token(token.credentials):
+        raise HTTPException(status_code=401, detail="Invalid token")
+
+    # Create email
     api = hsadmin.login()
     if hsadmin.email_exists(api, config.domain, listname):
         return {"Success": "false", "Message": "list already exists"}
@@ -36,7 +31,13 @@ def create_list(token: Annotated[str, Depends(oauth2_scheme)], listname: str):
     return {"Success": "false", "Message": result}
 
 @app.delete("/list/{listname}")
-def delete_list(token: Annotated[str, Depends(oauth2_scheme)], listname: str):
+def delete_list(token: Annotated[HTTPAuthorizationCredentials, Depends(security)], listname: str):
+
+    # Authenticate
+    if not check_token(token.credentials):
+        raise HTTPException(status_code=401, detail="Invalid token")
+
+    # Delete email
     api = hsadmin.login()
     if not hsadmin.email_exists(api, config.domain, listname):
         return {"Success": "false", "Message": "list does not exist"}
@@ -44,4 +45,3 @@ def delete_list(token: Annotated[str, Depends(oauth2_scheme)], listname: str):
     if result == True:
         return {"Success": "true"}
     return {"Success": "false", "Message": result}
-