fix(types): resolver diagnosticos estaticos de tipado y modelos v3.6.1
This commit is contained in:
+68
-15
@@ -4,26 +4,25 @@ Implements Hybrid Authentication:
|
||||
- Local Authentication with Admin fallback
|
||||
- Google OAuth 2.0 institutional login
|
||||
- Moodle Delegated Authentication
|
||||
- Impersonation mode for Administrators
|
||||
- Dual Token JWT management with HttpOnly cookies
|
||||
"""
|
||||
from typing import Optional
|
||||
import requests
|
||||
from fastapi import APIRouter, Depends, HTTPException, Request, Response, status
|
||||
from pydantic import ValidationError
|
||||
|
||||
from app import db
|
||||
from app.models.user import User
|
||||
from app.models.role import Role
|
||||
from app.models.setting import SystemSetting
|
||||
from app.services.user_service import UserService
|
||||
from app.services.jwt_service import JWTService
|
||||
from app.services.moodle_client import moodle_client
|
||||
from app.services.audit_service import AuditService
|
||||
from dependencies import get_current_user, require_roles, get_token_from_request
|
||||
from dependencies import get_current_user, get_token_from_request
|
||||
from database import get_flask_app
|
||||
from schemas.auth import (
|
||||
LoginRequest,
|
||||
GoogleAuthRequest,
|
||||
MoodleAuthRequest,
|
||||
ImpersonateRequest,
|
||||
RefreshTokenRequest
|
||||
)
|
||||
|
||||
@@ -143,11 +142,27 @@ def google_auth(payload: GoogleAuthRequest, response: Response):
|
||||
detail=f"Dominio @{email_domain} no autorizado. Sólo se permiten cuentas institucionales: {allowed_domains_str}."
|
||||
)
|
||||
|
||||
user = user_service.get_or_create_google_user(
|
||||
email=email,
|
||||
name=payload.name or email.split('@')[0],
|
||||
photo=payload.photo
|
||||
)
|
||||
user = User.query.filter(User.email.ilike(email)).first()
|
||||
if not user:
|
||||
parts = (payload.name or email.split('@')[0]).split()
|
||||
first_name = parts[0] if parts else 'Usuario'
|
||||
last_name = ' '.join(parts[1:]) if len(parts) > 1 else 'Google'
|
||||
docente_role = Role.query.filter(Role.name.ilike('Docente')).first()
|
||||
user = User(
|
||||
email=email,
|
||||
name=payload.name or f"{first_name} {last_name}",
|
||||
first_name=first_name,
|
||||
last_name=last_name,
|
||||
role='Docente' if not docente_role else docente_role.name,
|
||||
role_id=docente_role.id if docente_role else None,
|
||||
is_active=True
|
||||
)
|
||||
user.set_password(f"GoogleSSO_{email}")
|
||||
db.session.add(user)
|
||||
db.session.commit()
|
||||
|
||||
if not user.is_active:
|
||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Su cuenta institucional está inactiva.")
|
||||
|
||||
tokens = JWTService.generate_tokens(user)
|
||||
profile = user_service.get_profile_data(user)
|
||||
@@ -171,9 +186,44 @@ def moodle_auth(payload: MoodleAuthRequest, response: Response):
|
||||
if not moodle_enabled:
|
||||
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="El inicio de sesión con Moodle no está habilitado.")
|
||||
|
||||
user = user_service.authenticate_moodle(payload.username, payload.password)
|
||||
server_url = str(SystemSetting.get_value('moodle_server_url', 'http://10.0.0.207/moodle') or 'http://10.0.0.207/moodle').rstrip('/')
|
||||
service_name = str(SystemSetting.get_value('moodle_service_name', 'moodle_api') or 'moodle_api')
|
||||
|
||||
try:
|
||||
resp = requests.post(f"{server_url}/login/token.php", data={
|
||||
'username': payload.username,
|
||||
'password': payload.password,
|
||||
'service': service_name
|
||||
}, timeout=10)
|
||||
res_data = resp.json()
|
||||
except Exception as e:
|
||||
raise HTTPException(status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail=f"No se pudo conectar a Moodle: {str(e)}")
|
||||
|
||||
if 'token' not in res_data:
|
||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Credenciales de Moodle inválidas.")
|
||||
|
||||
username = payload.username.strip()
|
||||
user = User.query.filter(
|
||||
(User.email.ilike(f"{username}@%")) |
|
||||
(User.document_number == username)
|
||||
).first()
|
||||
|
||||
if not user:
|
||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Credenciales de Moodle inválidas o usuario no sincronizado.")
|
||||
role_obj = Role.query.filter(Role.name.ilike('Docente')).first()
|
||||
user = User(
|
||||
email=f"{username}@unicaba.edu.ar",
|
||||
name=username,
|
||||
document_number=username if username.isdigit() else None,
|
||||
role=role_obj.name if role_obj else 'Docente',
|
||||
role_id=role_obj.id if role_obj else None,
|
||||
is_active=True
|
||||
)
|
||||
user.set_password(f"MoodleLinked_{username}")
|
||||
db.session.add(user)
|
||||
db.session.commit()
|
||||
|
||||
if not user.is_active:
|
||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Su cuenta en Edu-Space está desactivada.")
|
||||
|
||||
tokens = JWTService.generate_tokens(user)
|
||||
profile = user_service.get_profile_data(user)
|
||||
@@ -193,7 +243,8 @@ def moodle_auth(payload: MoodleAuthRequest, response: Response):
|
||||
def get_current_user_profile(user: User = Depends(get_current_user)):
|
||||
"""Retorna la ficha del perfil del usuario actualmente autenticado."""
|
||||
with flask_app.app_context():
|
||||
profile = user_service.get_profile_data(user)
|
||||
u = User.query.get(user.id) or user
|
||||
profile = user_service.get_profile_data(u)
|
||||
return {
|
||||
'status': 'success',
|
||||
'user': profile
|
||||
@@ -218,7 +269,7 @@ def logout(request: Request, response: Response):
|
||||
@auth_router.post("/refresh")
|
||||
def refresh_token(request: Request, response: Response, payload: Optional[RefreshTokenRequest] = None):
|
||||
"""Renueva el token de acceso a partir de un refresh token válido."""
|
||||
token = (payload and payload.refresh_token) or request.cookies.get('refresh_token')
|
||||
token: Optional[str] = (payload.refresh_token if payload else None) or request.cookies.get('refresh_token')
|
||||
if not token:
|
||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="No se proporcionó refresh token.")
|
||||
|
||||
@@ -226,7 +277,9 @@ def refresh_token(request: Request, response: Response, payload: Optional[Refres
|
||||
try:
|
||||
decoded = JWTService.decode_token(token, expected_type='refresh')
|
||||
user_id = decoded.get('sub')
|
||||
user = User.query.get(int(user_id))
|
||||
if not user_id:
|
||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Token no contiene sub válido.")
|
||||
user = User.query.get(int(str(user_id)))
|
||||
if not user or not user.is_active:
|
||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Usuario no encontrado o inactivo.")
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ FastAPI Reservations Router (/api/v1/reservations)
|
||||
Handles creation, listing, updating, cancelling, confirmation and full conflict matrix validation.
|
||||
"""
|
||||
from typing import Optional, Any, Dict
|
||||
from datetime import datetime, timedelta
|
||||
from datetime import datetime, timedelta, timezone
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query, status, Request
|
||||
|
||||
from app import db
|
||||
@@ -33,7 +33,7 @@ def list_reservations(
|
||||
):
|
||||
"""Consulta de reservas por rango de fechas y/o aula."""
|
||||
with flask_app.app_context():
|
||||
now = datetime.utcnow()
|
||||
now = datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
try:
|
||||
start_dt = datetime.strptime(start_date, '%Y-%m-%d') if start_date else now.replace(hour=0, minute=0, second=0)
|
||||
except ValueError:
|
||||
@@ -52,19 +52,26 @@ def list_reservations(
|
||||
is_virt = bool(r.is_virtual or (r.classroom and r.classroom.is_virtual))
|
||||
if is_hide_virtual and is_virt:
|
||||
continue
|
||||
if floor and r.classroom and str(r.classroom.floor).strip().lower() != str(floor).strip().lower():
|
||||
if floor and r.classroom and str(r.classroom.floor).strip().lower() != floor.strip().lower():
|
||||
continue
|
||||
if shift and r.shift and shift.lower() not in r.shift.lower():
|
||||
continue
|
||||
r_user: Any = getattr(r, 'user', None)
|
||||
u_name = (getattr(r_user, 'name', '') or '').lower() if r_user else ''
|
||||
if search:
|
||||
s_lower = search.lower()
|
||||
subj_n = (r.subject_name or '').lower()
|
||||
subj_c = (r.subject_code or '').lower()
|
||||
c_name = (r.classroom.code if r.classroom else '').lower()
|
||||
u_name = (r.user.name if r.user else '').lower()
|
||||
if s_lower not in subj_n and s_lower not in subj_c and s_lower not in c_name and s_lower not in u_name:
|
||||
continue
|
||||
|
||||
user_dict = {
|
||||
'id': getattr(r_user, 'id', None),
|
||||
'name': getattr(r_user, 'name', None),
|
||||
'email': getattr(r_user, 'email', None)
|
||||
} if r_user else None
|
||||
|
||||
result.append({
|
||||
'id': r.id,
|
||||
'classroom_id': r.classroom_id,
|
||||
@@ -86,12 +93,8 @@ def list_reservations(
|
||||
'virtual_link': r.commission.virtual_link,
|
||||
'max_students': r.commission.max_students
|
||||
} if r.commission else None,
|
||||
'teacher_name': r.user.name if r.user else None,
|
||||
'user': {
|
||||
'id': r.user.id,
|
||||
'name': r.user.name,
|
||||
'email': r.user.email
|
||||
} if r.user else None,
|
||||
'teacher_name': getattr(r_user, 'name', None) if r_user else None,
|
||||
'user': user_dict,
|
||||
'start_time': r.start_time.isoformat(),
|
||||
'end_time': r.end_time.isoformat(),
|
||||
'purpose': r.purpose,
|
||||
@@ -128,6 +131,14 @@ def get_reservation(reservation_id: int, current_user: User = Depends(get_curren
|
||||
duration_min = int((r.end_time - r.start_time).total_seconds() / 60) if (r.start_time and r.end_time) else 120
|
||||
is_virt = bool(r.is_virtual or (r.classroom and r.classroom.is_virtual))
|
||||
|
||||
r_user: Any = getattr(r, 'user', None)
|
||||
u_name = getattr(r_user, 'name', None) if r_user else None
|
||||
u_id = getattr(r_user, 'id', None) if r_user else None
|
||||
u_email = getattr(r_user, 'email', None) if r_user else None
|
||||
name_parts = str(u_name).split() if u_name else []
|
||||
first_name = getattr(r_user, 'first_name', name_parts[0] if name_parts else 'Usuario') if r_user else 'Usuario'
|
||||
last_name = getattr(r_user, 'last_name', ' '.join(name_parts[1:]) if len(name_parts) > 1 else '') if r_user else ''
|
||||
|
||||
return {
|
||||
'id': r.id,
|
||||
'classroom_id': r.classroom_id,
|
||||
@@ -160,14 +171,14 @@ def get_reservation(reservation_id: int, current_user: User = Depends(get_curren
|
||||
} if (r.commission and r.commission.subject) else None
|
||||
} if r.commission else None,
|
||||
'teacher_id': r.user_id,
|
||||
'teacher_name': r.user.name if r.user else None,
|
||||
'teacher_name': u_name,
|
||||
'user': {
|
||||
'id': r.user.id,
|
||||
'name': r.user.name,
|
||||
'first_name': getattr(r.user, 'first_name', r.user.name.split()[0] if r.user.name else 'Usuario'),
|
||||
'last_name': getattr(r.user, 'last_name', ' '.join(r.user.name.split()[1:]) if r.user.name and len(r.user.name.split()) > 1 else ''),
|
||||
'email': r.user.email
|
||||
} if r.user else None,
|
||||
'id': u_id,
|
||||
'name': u_name,
|
||||
'first_name': first_name,
|
||||
'last_name': last_name,
|
||||
'email': u_email
|
||||
} if r_user else None,
|
||||
'start_time': r.start_time.isoformat(),
|
||||
'end_time': r.end_time.isoformat(),
|
||||
'duration': duration_min,
|
||||
|
||||
Reference in New Issue
Block a user