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:
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user