feat(auth): add persistent login session for tablets and PWA (double-channel cookie + bearer token, 30 days remember-me, credential autofill)
This commit is contained in:
+33
-17
@@ -1,6 +1,8 @@
|
||||
# ==============================================================================
|
||||
# Endpoints de Autenticación (/api/v1/auth)
|
||||
# Soporte de persistencia extendida para PWA/Tablets y Doble Canal (Cookie + Bearer)
|
||||
# ==============================================================================
|
||||
from datetime import timedelta
|
||||
from typing import Optional
|
||||
from fastapi import APIRouter, Response, Request, HTTPException, status, Depends
|
||||
from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
|
||||
@@ -16,23 +18,24 @@ def get_current_user_payload(
|
||||
request: Request,
|
||||
bearer: Optional[HTTPAuthorizationCredentials] = Depends(security_bearer),
|
||||
) -> dict:
|
||||
"""Extrae el token JWT desde la cookie HttpOnly o el header Bearer."""
|
||||
"""
|
||||
Extrae y valida el token JWT desde la cookie HttpOnly o el header Bearer.
|
||||
Si la cookie expiró o no está presente, intenta validar el token Bearer (crítico para PWA/tablets).
|
||||
"""
|
||||
token = request.cookies.get("access_token")
|
||||
if not token and bearer:
|
||||
token = bearer.credentials
|
||||
payload = decodificar_access_token(token) if token else None
|
||||
|
||||
if not token:
|
||||
# Fallback transparente a Authorization: Bearer
|
||||
if not payload and bearer and bearer.credentials:
|
||||
token = bearer.credentials
|
||||
payload = decodificar_access_token(token)
|
||||
|
||||
if not payload:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||
detail="No se encontró una sesión activa o token válido",
|
||||
)
|
||||
|
||||
payload = decodificar_access_token(token)
|
||||
if not payload:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||
detail="Token inválido o expirado",
|
||||
)
|
||||
return payload
|
||||
|
||||
|
||||
@@ -41,21 +44,33 @@ obtener_usuario_actual = get_current_user_payload
|
||||
|
||||
@router.post("/login", response_model=LoginResponse, summary="Iniciar sesión de operador")
|
||||
async def login(login_req: LoginRequest, response: Response):
|
||||
"""Autentica al guardia o supervisor y emite una cookie HttpOnly con JWT."""
|
||||
"""
|
||||
Autentica al guardia o supervisor. Emite cookie persistente y token JWT en el body
|
||||
para que la sesión permanezca conectada en tablets, navegadores y PWAs.
|
||||
"""
|
||||
if login_req.remember_me:
|
||||
delta = timedelta(days=30)
|
||||
max_age_seg = 30 * 24 * 3600 # 30 días
|
||||
else:
|
||||
delta = timedelta(hours=12)
|
||||
max_age_seg = 12 * 3600 # 12 horas (turno guardia)
|
||||
|
||||
res_dto, token = AuthService.autenticar_usuario(
|
||||
username=login_req.username,
|
||||
password_raw=login_req.password,
|
||||
workstation_name=login_req.workstation_name,
|
||||
expires_delta=delta,
|
||||
)
|
||||
|
||||
# Cookie HttpOnly segura
|
||||
# Cookie HttpOnly persistente
|
||||
response.set_cookie(
|
||||
key="access_token",
|
||||
value=token,
|
||||
httponly=True,
|
||||
samesite="lax",
|
||||
secure=False, # En LAN sin HTTPS directo se permite False; en Nginx SSL pasará a True
|
||||
max_age=1800, # 30 minutos
|
||||
secure=False, # Permite HTTP en LAN y HTTPS en PWA
|
||||
max_age=max_age_seg,
|
||||
path="/",
|
||||
)
|
||||
|
||||
return res_dto
|
||||
@@ -64,15 +79,16 @@ async def login(login_req: LoginRequest, response: Response):
|
||||
@router.post("/logout", summary="Cerrar sesión")
|
||||
async def logout(response: Response):
|
||||
"""Elimina la cookie de sesión activa."""
|
||||
response.delete_cookie(key="access_token")
|
||||
response.delete_cookie(key="access_token", path="/")
|
||||
return {"status": "ok", "message": "Sesión cerrada exitosamente"}
|
||||
|
||||
|
||||
@router.get("/me", response_model=UserSessionDTO, summary="Obtener usuario actual en sesión")
|
||||
async def get_current_user(payload: dict = Depends(get_current_user_payload)):
|
||||
"""Retorna la información del usuario autenticado."""
|
||||
"""Retorna la información del usuario autenticado preservando rol y parámetros."""
|
||||
return UserSessionDTO(
|
||||
user_id=int(payload["sub"]),
|
||||
username=payload["username"],
|
||||
role="OPERADOR",
|
||||
role=payload.get("role", "OPERADOR"),
|
||||
system_parameter=payload.get("system_parameter"),
|
||||
)
|
||||
|
||||
@@ -46,8 +46,8 @@ class Settings(BaseSettings):
|
||||
|
||||
# Seguridad JWT
|
||||
SECRET_KEY: str = "dev_secret_key_change_in_production_min_32_chars_1234567890"
|
||||
ACCESS_TOKEN_EXPIRE_MINUTES: int = 30
|
||||
REFRESH_TOKEN_EXPIRE_DAYS: int = 7
|
||||
ACCESS_TOKEN_EXPIRE_MINUTES: int = 43200 # 30 días para puestos de control / tablets persistentes
|
||||
REFRESH_TOKEN_EXPIRE_DAYS: int = 30
|
||||
|
||||
# Estación por Defecto
|
||||
DEFAULT_WORKSTATION_NAME: str = "GARITA_PRINCIPAL"
|
||||
|
||||
@@ -9,6 +9,7 @@ class LoginRequest(BaseModel):
|
||||
username: str = Field(..., min_length=1, description="Nombre de usuario del operador")
|
||||
password: str = Field(..., min_length=1, description="Contraseña de acceso")
|
||||
workstation_name: Optional[str] = Field(None, description="Identificador de la estación de trabajo/tablet")
|
||||
remember_me: bool = Field(True, description="Si es True, mantiene la sesión activa de forma persistente (30 días)")
|
||||
|
||||
|
||||
class UserSessionDTO(BaseModel):
|
||||
@@ -23,3 +24,5 @@ class LoginResponse(BaseModel):
|
||||
message: str = "Autenticación exitosa"
|
||||
user: UserSessionDTO
|
||||
workstation: Optional[str] = None
|
||||
token: Optional[str] = None
|
||||
token_type: str = "bearer"
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
# ==============================================================================
|
||||
# Servicio de Autenticación y Control de Sesión
|
||||
# ==============================================================================
|
||||
from datetime import timedelta
|
||||
from typing import Optional, Tuple
|
||||
from fastapi import HTTPException, status
|
||||
from app.repositories.auth_repository import AuthRepository
|
||||
@@ -11,7 +12,10 @@ from app.schemas.auth_schema import LoginResponse, UserSessionDTO
|
||||
class AuthService:
|
||||
@staticmethod
|
||||
def autenticar_usuario(
|
||||
username: str, password_raw: str, workstation_name: Optional[str] = None
|
||||
username: str,
|
||||
password_raw: str,
|
||||
workstation_name: Optional[str] = None,
|
||||
expires_delta: Optional[timedelta] = None,
|
||||
) -> Tuple[LoginResponse, str]:
|
||||
"""Valida credenciales, genera token JWT y registra auditoría."""
|
||||
user_row = AuthRepository.obtener_usuario_por_nombre(username)
|
||||
@@ -31,14 +35,17 @@ class AuthService:
|
||||
user_id = user_row["UsuarioID"]
|
||||
nombre = user_row["Nombre"].strip()
|
||||
system_param = user_row.get("SystemParameter")
|
||||
role = "SUPERVISOR" if system_param == 1 else "OPERADOR"
|
||||
|
||||
# Generar Token JWT
|
||||
# Generar Token JWT con soporte de rol y parámetros de sesión
|
||||
token_data = {
|
||||
"sub": str(user_id),
|
||||
"username": nombre,
|
||||
"workstation": workstation_name or "",
|
||||
"role": role,
|
||||
"system_parameter": system_param,
|
||||
}
|
||||
token = crear_access_token(token_data)
|
||||
token = crear_access_token(token_data, expires_delta=expires_delta)
|
||||
|
||||
# Registrar auditoría en usrlogin
|
||||
AuthRepository.registrar_evento_login(user_id)
|
||||
@@ -46,7 +53,7 @@ class AuthService:
|
||||
user_dto = UserSessionDTO(
|
||||
user_id=user_id,
|
||||
username=nombre,
|
||||
role="SUPERVISOR" if system_param == 1 else "OPERADOR",
|
||||
role=role,
|
||||
system_parameter=system_param,
|
||||
)
|
||||
|
||||
@@ -55,6 +62,8 @@ class AuthService:
|
||||
message="Autenticación exitosa",
|
||||
user=user_dto,
|
||||
workstation=workstation_name,
|
||||
token=token,
|
||||
token_type="bearer",
|
||||
)
|
||||
|
||||
return response, token
|
||||
|
||||
Reference in New Issue
Block a user