airflow-file-auth-manager 0.1.2__py3-none-any.whl → 0.1.4__py3-none-any.whl

airflow_file_auth_manager/endpoints.py

@@ -4,9 +4,9 @@ from __future__ import annotations
 
 import logging
 from pathlib import Path
-from typing import TYPE_CHECKING, Annotated
+from typing import TYPE_CHECKING
 
-from fastapi import FastAPI, Form, Request, Response
+from fastapi import FastAPI, Request, Response
 from fastapi.responses import HTMLResponse, JSONResponse, RedirectResponse
 from fastapi.staticfiles import StaticFiles
 from jinja2 import Environment, FileSystemLoader
@@ -66,8 +66,6 @@ def create_auth_app(auth_manager: FileAuthManager) -> FastAPI:
     async def create_token(
         request: Request,
         response: Response,
-        username: Annotated[str | None, Form()] = None,
-        password: Annotated[str | None, Form()] = None,
     ) -> Response:
         """Authenticate user and create JWT token.
 
@@ -77,9 +75,12 @@ def create_auth_app(auth_manager: FileAuthManager) -> FastAPI:
         - Browser sessions: HttpOnly cookies (protected from XSS)
         - API clients: Bearer tokens in response body (use Authorization header)
         """
-        # Handle JSON request
+        # Handle request based on content type
         content_type = request.headers.get("content-type", "")
         is_form_submission = "application/x-www-form-urlencoded" in content_type
+        username: str | None = None
+        password: str | None = None
+        form_data = None
 
         if "application/json" in content_type:
             try:
@@ -91,13 +92,17 @@ def create_auth_app(auth_manager: FileAuthManager) -> FastAPI:
                     status_code=400,
                     content={"error": "Invalid JSON body"},
                 )
+        elif is_form_submission:
+            form_data = await request.form()
+            username = form_data.get("username")
+            password = form_data.get("password")
 
         # Validate input
         if not username or not password:
             logger.warning("AUDIT: Login attempt with missing credentials")
             if is_form_submission:
                 return RedirectResponse(
-                    url="/auth/file/login?error=Username+and+password+required",
+                    url="/auth/login?error=Username+and+password+required",
                     status_code=303,
                 )
             return JSONResponse(
@@ -112,7 +117,7 @@ def create_auth_app(auth_manager: FileAuthManager) -> FastAPI:
                           username, request.client.host if request.client else "unknown")
             if is_form_submission:
                 return RedirectResponse(
-                    url="/auth/file/login?error=Invalid+username+or+password",
+                    url="/auth/login?error=Invalid+username+or+password",
                     status_code=303,
                 )
             return JSONResponse(
@@ -120,19 +125,16 @@ def create_auth_app(auth_manager: FileAuthManager) -> FastAPI:
                 content={"error": "Invalid username or password"},
             )
 
-        # Create JWT token
-        from airflow.api_fastapi.auth.tokens import create_jwt_token
-
-        token_payload = auth_manager.serialize_user(user)
-        token = create_jwt_token(token_payload, expiration_seconds=jwt_expiration)
+        # Create JWT token using auth manager's method
+        token = auth_manager.generate_jwt(user, expiration_time_in_seconds=jwt_expiration)
 
         logger.info("AUDIT: User logged in: %s (IP: %s)",
                    username, request.client.host if request.client else "unknown")
 
         # Form submission - set HttpOnly cookie and redirect
         if is_form_submission:
-            form_data = await request.form()
-            next_url = form_data.get("next", "/")
+            # form_data was already read above
+            next_url = form_data.get("next", "/") if form_data else "/"
 
             # Detect if using HTTPS
             is_secure = (
@@ -167,7 +169,7 @@ def create_auth_app(auth_manager: FileAuthManager) -> FastAPI:
         logger.info("AUDIT: User logged out (IP: %s)",
                    request.client.host if request.client else "unknown")
 
-        redirect_response = RedirectResponse(url="/auth/file/login", status_code=303)
+        redirect_response = RedirectResponse(url="/auth/login", status_code=303)
         redirect_response.delete_cookie(key="airflow_jwt")
         return redirect_response
 

airflow_file_auth_manager/file_auth_manager.py

@@ -89,14 +89,14 @@ class FileAuthManager(BaseAuthManager[FileUser]):
 
     def get_url_login(self, *, next_url: str | None = None) -> str:
         """Get the login page URL."""
-        url = "/auth/file/login"
+        url = "/auth/login"
         if next_url:
             url = f"{url}?{urlencode({'next': next_url})}"
         return url
 
     def get_url_logout(self) -> str:
         """Get the logout URL."""
-        return "/auth/file/logout"
+        return "/auth/logout"
 
     # =========================================================================
     # Serialization Methods (for JWT)

airflow_file_auth_manager/templates/login.html

@@ -195,7 +195,7 @@
 
         <p class="description">Enter your username and password below:</p>
 
-        <form action="/auth/file/token" method="POST">
+        <form action="/auth/token" method="POST">
             <input type="hidden" name="next" value="{{ next_url }}">
 
             <div class="form-group">

{airflow_file_auth_manager-0.1.2.dist-info → airflow_file_auth_manager-0.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: airflow-file-auth-manager
-Version: 0.1.2
+Version: 0.1.4
 Summary: YAML file-based lightweight Auth Manager for Apache Airflow 3.x
 Project-URL: Homepage, https://github.com/choo121600/airflow-file-auth-manager
 Project-URL: Repository, https://github.com/choo121600/airflow-file-auth-manager

{airflow_file_auth_manager-0.1.2.dist-info → airflow_file_auth_manager-0.1.4.dist-info}/RECORD

@@ -1,15 +1,15 @@
 airflow_file_auth_manager/__init__.py,sha256=M1nQascdVasmnx9yih96Htl-Z626KIVAtALBJ9KyCd0,993
 airflow_file_auth_manager/cli.py,sha256=seJ5Vu1R763DFVfd3tsBIk6RaGIXlarB1gSu3WVv03c,8935
-airflow_file_auth_manager/endpoints.py,sha256=SDPRs0DLAl500VouvknpJTvIoIKpBySPzPDsLUJaEKs,6222
-airflow_file_auth_manager/file_auth_manager.py,sha256=RnrHdSlUnj4zpEvIAoaHKuH8N-qhGskwVt2oUrAR9Vc,13091
+airflow_file_auth_manager/endpoints.py,sha256=bX-9kHjyZu3H11QhYVwb-dQhuZTTFuL1kChm6vnFTx8,6300
+airflow_file_auth_manager/file_auth_manager.py,sha256=hRTudfXHL6c0OMptArFmSP1vWbNsBpfHRbTtsLfO1e4,13081
 airflow_file_auth_manager/password.py,sha256=C-a6vjOxnht9X4OE_xrlvWH1DaEMJwK9OV20fE0OQJ8,2689
 airflow_file_auth_manager/policy.py,sha256=luj1EhVAKLZxubr7h4Au171-R1Q_HmGb78QEWqWQync,5159
 airflow_file_auth_manager/user.py,sha256=lxskYF8rQGEzgxKu6NzDtXLPtNRY2AspBKu89RiIEZg,2278
 airflow_file_auth_manager/user_store.py,sha256=VV1D0vWlm5Z_l-bcXLEQpueY5Gfx7xUdUqBpFDLlLIA,11717
 airflow_file_auth_manager/static/styles.css,sha256=-gxvqlQCHpZtif-93OpqgcyYTe__9Sr92Np-9N97S04,1675
-airflow_file_auth_manager/templates/login.html,sha256=jPUyUzrUUc8USzBIuql1itcHUok7SrwVjWsZ-xhrnIA,8392
-airflow_file_auth_manager-0.1.2.dist-info/METADATA,sha256=n0Gw6416sKt-bx9Xw6eE2oYvXyCcJ0fOsqiKHYsFozA,11041
-airflow_file_auth_manager-0.1.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-airflow_file_auth_manager-0.1.2.dist-info/entry_points.txt,sha256=bQgxFNgbmAewrv9RAZ_tYUNZy5IxS_Zhlj6vgG9lbqY,168
-airflow_file_auth_manager-0.1.2.dist-info/licenses/LICENSE,sha256=fw8CKBXZ_-V6K5pxfUmJP3e_7QUvFq8XncuZ27tvarg,10177
-airflow_file_auth_manager-0.1.2.dist-info/RECORD,,
+airflow_file_auth_manager/templates/login.html,sha256=OMHv2c6OsnMsKKXYFaQwnHzVtAjUQe9HSZgoaI2DGY8,8387
+airflow_file_auth_manager-0.1.4.dist-info/METADATA,sha256=wXnEUxAXQZHqFDlRBcTyDEB-LGBuEeI0m1qQLeLn0oQ,11041
+airflow_file_auth_manager-0.1.4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+airflow_file_auth_manager-0.1.4.dist-info/entry_points.txt,sha256=bQgxFNgbmAewrv9RAZ_tYUNZy5IxS_Zhlj6vgG9lbqY,168
+airflow_file_auth_manager-0.1.4.dist-info/licenses/LICENSE,sha256=fw8CKBXZ_-V6K5pxfUmJP3e_7QUvFq8XncuZ27tvarg,10177
+airflow_file_auth_manager-0.1.4.dist-info/RECORD,,