fix(credential): desacople modal qr vs carnet completo, dni y usuario en perfil, y resolucion robusta en dni parser v3.8.54

This commit is contained in:
2026-10-28 15:22:17 -03:00
parent b752493a74
commit 1ce6ca0ea5
23 changed files with 334 additions and 156 deletions
+1 -1
View File
@@ -7,7 +7,7 @@ from typing import Any
from database import db, get_db, engine, SessionLocal, session
from config.config import Config
__version__ = "3.8.53"
__version__ = "3.8.54"
class DummyContext:
def __enter__(self):
+23
View File
@@ -49,6 +49,27 @@ class User(db.Model):
from app.constants.document_types import format_document
return format_document(self.document_type, self.document_number)
@property
def username(self) -> str:
"""Alias o identificador de acceso: DNI o prefijo de email institucional."""
if self.document_number:
return self.document_number
if self.email and '@' in self.email:
return self.email.split('@')[0]
return self.email or f"user_{self.id}"
@property
def auth_provider_label(self) -> str:
"""Determina la procedencia y mecanismo de autenticación del usuario."""
ph = str(self.password_hash or '')
if ph.startswith('GoogleSSO_'):
return 'Google Workspace (@unicaba.edu.ar)'
if ph.startswith('MoodleLinked_'):
return 'Moodle Campus Virtual'
if self.email and self.email.endswith('@unicaba.edu.ar'):
return 'Institucional UniCABA'
return 'Cuenta Local'
# Relationships
reservations = db.relationship('Reservation', backref='user', lazy=True, cascade='all, delete-orphan')
@@ -164,6 +185,8 @@ class User(db.Model):
'document_type': self.document_type or 'DNI',
'document_number': self.document_number or '',
'document_formatted': self.get_formatted_document(),
'username': self.username,
'auth_provider_label': self.auth_provider_label,
'role': self.role,
'role_id': self.role_id,
'is_active': self.is_active,
+6 -1
View File
@@ -17,11 +17,16 @@ class UserRepository(BaseRepository[User]):
user = User.query.filter(func.lower(User.email) == clean).first()
if user:
return user
# Si el usuario ingresó solo el nombre de cuenta (ej. 'admin' o 'bedelia')
# Si el usuario ingresó solo el nombre de cuenta o su DNI (ej. 'admin', 'bedelia' o '34247025')
if '@' not in clean:
clean_digits = clean.replace('.', '').replace(',', '').replace(' ', '')
user = User.query.filter(
or_(
func.lower(User.email) == f"{clean}@edu-space.com",
func.lower(User.email).like(f"{clean}@%"),
User.document_number == clean,
User.document_number == clean_digits,
func.replace(User.document_number, '.', '') == clean_digits,
func.lower(User.name) == clean,
func.lower(User.role) == clean.upper()
)
+4 -4
View File
@@ -12,7 +12,7 @@ def limpiar_numero_documento(doc_raw: str) -> Tuple[str, Optional[str]]:
"""
if not doc_raw:
return "", None
doc_clean = str(doc_raw).strip()
doc_clean = doc_raw.strip()
doc_sin_puntos = doc_clean.replace('.', '').replace(',', '').replace(' ', '')
# Patrón: Prefijo F o M seguido de 5 a 9 dígitos
@@ -40,10 +40,10 @@ def parsear_dni(raw_text: str) -> Dict[str, str]:
return {}
# Limpiar terminadores y retornos de carro
raw_clean = str(raw_text).strip().replace('\r', '').replace('\n', '')
raw_clean = raw_text.strip().replace('\r', '').replace('\n', '')
# Algunos escáneres o formatos vienen separados por @ en lugar de comillas dobles
text = raw_clean.replace('@', '"')
# Algunos escáneres o formatos vienen separados por @, comillas simples ' o barras |
text = raw_clean.replace('@', '"').replace("'", '"').replace('´', '"').replace('|', '"')
parts = text.split('"')
# Limpiar espacios de cada segmento
+4
View File
@@ -47,6 +47,10 @@ class JWTService:
'email': user.email,
'name': user.name,
'role': role_name,
'document_type': getattr(user, 'document_type', 'DNI') or 'DNI',
'document_number': getattr(user, 'document_number', '') or '',
'dni': getattr(user, 'document_number', '') or '',
'username': getattr(user, 'username', '') or getattr(user, 'document_number', '') or (user.email.split('@')[0] if user.email else ''),
'is_admin': user.is_admin(),
'permissions': permissions,
'type': 'access',
+24 -7
View File
@@ -8,6 +8,7 @@ from datetime import datetime, timedelta, timezone, date
from typing import Dict, Any, Optional, Tuple, List
import jwt
from sqlalchemy import func, or_
from config.config import Config
from app import db
from app.models.user import User
@@ -138,12 +139,18 @@ class QRSecurityService:
# C. Reconocimiento universal de DNI Argentino (Formatos Renaper 2009, 2012, 2026, Mi Argentina y PDF417 / QR)
dni_info = parsear_dni(clean_normalized)
if dni_info and dni_info.get("documento"):
doc = dni_info["documento"]
user_by_dni = User.query.filter_by(document_number=doc).first()
if not user_by_dni:
user_by_dni = User.query.filter(
(User.username == doc) | (User.email.like(f"{doc}@%"))
).first()
doc = dni_info["documento"].strip()
doc_stripped = doc.lstrip("0") or doc
user_by_dni = User.query.filter(
or_(
User.document_number == doc,
User.document_number == doc_stripped,
func.replace(User.document_number, ".", "") == doc,
func.replace(User.document_number, ".", "") == doc_stripped,
User.email.ilike(f"{doc}@%"),
User.email.ilike(f"{doc_stripped}@%")
)
).first()
if user_by_dni:
if not user_by_dni.is_active:
@@ -165,7 +172,17 @@ class QRSecurityService:
# Quitar cualquier carácter residual no alfanumérico si es número de DNI
clean_doc = re.sub(r'[^a-zA-Z0-9]', '', doc_num)
if clean_doc:
user = User.query.filter_by(document_number=clean_doc).first()
clean_stripped = clean_doc.lstrip("0") or clean_doc
user = User.query.filter(
or_(
User.document_number == clean_doc,
User.document_number == clean_stripped,
func.replace(User.document_number, ".", "") == clean_doc,
func.replace(User.document_number, ".", "") == clean_stripped,
User.email.ilike(f"{clean_doc}@%"),
User.email.ilike(f"{clean_stripped}@%")
)
).first()
if not user and clean_doc.isdigit():
# Si no coincide con documento, verificar si coincide con ID institucional directo
user = User.query.get(int(clean_doc))
+5 -2
View File
@@ -55,8 +55,11 @@ class UserService:
'theme_preference': user.theme_preference or 'auto',
'first_name': getattr(user, 'first_name', user.name.split()[0] if user.name else ''),
'last_name': getattr(user, 'last_name', ' '.join(user.name.split()[1:]) if user.name and len(user.name.split()) > 1 else ''),
'document_type': getattr(user, 'document_type', 'DNI'),
'document_number': getattr(user, 'document_number', ''),
'document_type': getattr(user, 'document_type', 'DNI') or 'DNI',
'document_number': getattr(user, 'document_number', '') or '',
'document_formatted': user.get_formatted_document() if hasattr(user, 'get_formatted_document') else (getattr(user, 'document_number', '') or ''),
'username': getattr(user, 'username', getattr(user, 'document_number', '') or (user.email.split('@')[0] if user.email else '')),
'auth_provider_label': getattr(user, 'auth_provider_label', 'Institucional'),
'personal_email': getattr(user, 'personal_email', '')
}
+1 -1
View File
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
setup(
name="edu-space-admin",
version="3.8.53",
version="3.8.54",
description="Administrative interface for Edu-Space Classroom Management System (FastAPI ASGI Core)",
author="Edu-Space Development Team",
author_email="admin@edu-space.com",
+57
View File
@@ -88,3 +88,60 @@ def test_parsear_dni_directo_o_invalido():
}
assert parsear_dni("") == {}
assert parsear_dni("TEXTO_CORTO") == {}
def test_parsear_dni_con_separadores_comilla_simple_o_barra():
raw_simple = "00749743816'TELLO'CARLOS FACUNDO'34247025'G'09-02-89"
parsed = parsear_dni(raw_simple)
assert parsed["documento"] == "34247025"
assert parsed["apellido"] == "TELLO"
raw_barra = "00749743816|TELLO|CARLOS FACUNDO|34247025|G|09-02-89"
parsed_b = parsear_dni(raw_barra)
assert parsed_b["documento"] == "34247025"
def test_user_model_username_and_auth_provider_properties(app):
from app.models.user import User
with app.app_context():
u1 = User(email="test.student@unicaba.edu.ar", name="Alumno Test", document_number="34247025", role="ALUMNO")
u1.set_password("pass123")
assert u1.username == "34247025"
assert u1.auth_provider_label == "Institucional UniCABA"
u2 = User(email="prof@unicaba.edu.ar", name="Docente Test", role="DOCENTE")
u2.password_hash = "GoogleSSO_prof@unicaba.edu.ar"
assert u2.username == "prof"
assert u2.auth_provider_label == "Google Workspace (@unicaba.edu.ar)"
u3 = User(email="34247025@unicaba.edu.ar", name="Docente Moodle", role="DOCENTE")
u3.password_hash = "MoodleLinked_34247025"
assert u3.username == "34247025"
assert u3.auth_provider_label == "Moodle Campus Virtual"
def test_qr_security_service_resolves_dni_with_dots_and_stripping(app, init_database):
from app import db
from app.models.user import User
from app.services.qr_security_service import QRSecurityService
with app.app_context():
# Crear un usuario cuyo DNI en la base tiene puntos
u = User.query.filter_by(email="dni_dots_test@unicaba.edu.ar").first()
if not u:
u = User(
email="dni_dots_test@unicaba.edu.ar",
name="Estudiante Puntos",
document_number="45.123.456",
role="ALUMNO",
is_active=True
)
u.set_password("pass123")
db.session.add(u)
db.session.commit()
# Escanear DNI sin puntos con formato Renaper o directo
resolved, st, det = QRSecurityService.decode_and_resolve_user('00225303383"PUNTOS"ESTUDIANTE"F"45123456"A"02-09-2005')
assert resolved is not None
assert resolved.id == u.id
assert st == "AUTORIZADO"