airflow-file-auth-manager 0.1.3__tar.gz → 0.1.5__tar.gz

{airflow_file_auth_manager-0.1.3 → airflow_file_auth_manager-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: airflow-file-auth-manager
-Version: 0.1.3
+Version: 0.1.5
 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.3 → airflow_file_auth_manager-0.1.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "airflow-file-auth-manager"
-version = "0.1.3"
+version = "0.1.5"
 description = "YAML file-based lightweight Auth Manager for Apache Airflow 3.x"
 readme = "README.md"
 license = "Apache-2.0"

{airflow_file_auth_manager-0.1.3 → airflow_file_auth_manager-0.1.5}/src/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,20 +75,28 @@ 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:
                 body = await request.json()
                 username = body.get("username")
                 password = body.get("password")
-            except Exception:
+            except Exception as e:
+                logger.error("Failed to parse JSON body: %s", e)
                 return JSONResponse(
                     status_code=400,
-                    content={"error": "Invalid JSON body"},
+                    content={"error": f"Invalid JSON body: {e}"},
                 )
+        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:
@@ -120,19 +126,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 = (
@@ -142,7 +145,7 @@ def create_auth_app(auth_manager: FileAuthManager) -> FastAPI:
 
             redirect_response = RedirectResponse(url=str(next_url), status_code=303)
             redirect_response.set_cookie(
-                key="airflow_jwt",
+                key="_token",
                 value=token,
                 max_age=jwt_expiration,
                 httponly=True,  # Protect from XSS attacks
@@ -168,7 +171,7 @@ def create_auth_app(auth_manager: FileAuthManager) -> FastAPI:
                    request.client.host if request.client else "unknown")
 
         redirect_response = RedirectResponse(url="/auth/login", status_code=303)
-        redirect_response.delete_cookie(key="airflow_jwt")
+        redirect_response.delete_cookie(key="_token")
         return redirect_response
 
     return app