feat: added option for api auth

Author: Mesh-ach

src/webapp/main.py

@@ -97,30 +97,25 @@ def read_root() -> Any:
 @app.post("/token-from-api-key")
 async def access_token_from_api_key(
     sql_session: Annotated[Session, Depends(get_session)],
-    form_data: Annotated[OAuth2PasswordRequestForm, Depends()],
     api_key_enduser_tuple: str = Security(get_api_key),
 ) -> Token:
     """Generate a token from an API key."""
     local_session.set(sql_session)
 
     user = authenticate_api_key(api_key_enduser_tuple, local_session.get())
-    valid = check_creds(form_data.username, form_data.password)
-    logger.info(f"api_key input: {api_key_enduser_tuple}")
-    logger.info(f"user: {user}")
-    logger.info(f"valid creds: {valid}")
 
-    if not user and not valid:
+    if not user:
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
             detail="Invalid API key and credentials",
             headers={"WWW-Authenticate": "X-API-KEY"},
         )
-    email = user.email if user else form_data.username
+
     access_token_expires = timedelta(
         minutes=int(env_vars["ACCESS_TOKEN_EXPIRE_MINUTES"])
     )
     access_token = create_access_token(
-        data={"sub": email}, expires_delta=access_token_expires
+        data={"sub": user.email}, expires_delta=access_token_expires
     )
     return Token(access_token=access_token, token_type="bearer")
 

src/webapp/main_test.py

@@ -146,14 +146,13 @@ def test_get_root(client: TestClient):
 
 
 def test_retrieve_token_gen_from_api_key(client: TestClient):
-    with patch.dict("os.environ", {"USERNAME": "fake", "PASSWORD": "fake"}):
-        response = client.post(
-            "/token-from-api-key",
-            headers={"X-API-KEY": "key_1"},
-            data={"username": "fake", "password": "fake"},
-        )
-        assert response.status_code == 200
-        assert response.json()["token_type"] == "bearer"
+    """Test POST /token-from-api-key."""
+    response = client.post(
+        "/token-from-api-key",
+        headers={"X-API-KEY": "key_1"},
+    )
+    assert response.status_code == 200
+    assert response.json()["token_type"] == "bearer"
 
 
 def test_get_cross_isnt_users(client: TestClient):