diff --git a/CHANGELOG.md b/CHANGELOG.md index 82e0fe1..39b9490 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,23 @@ El formato está basado en [Keep a Changelog](https://keepachangelog.com/es-ES/1 - **Sincronización Continua Moodle (Fase 6):** Automatización de workers persistentes en background para el procesamiento continuo de la cola de Web Services Moodle 4.1. - **Pruebas de Carga y Hardening (Fase 6):** Pruebas de estrés de concurrencia y validación final de producción. +## [3.8.54] - 2026-10-28 +### Fixed & Enhanced (Desacople Total de Modal QR vs Carnet Completo, Normalización de DNI y Visibilidad de Usuario/Acceso) +- **Desacople y Eliminación de Bloqueo/Solapamiento entre `/credential/my-card` y Modal Global**: + - Se desacoplaron los disparadores del modal `#userQrCredentialModal` en la vista de carnet completo (`/credential/my-card`): al hacer clic en los botones de barra o menú mientras se está en la página del carnet, se genera un scroll suave y destello visual sobre la credencial activa en pantalla en lugar de abrir un modal redundante que tape la vista. + - Empaquetado local e independiente de la librería `qrcode.min.js` en `frontend/public/js/qrcode.min.js`, eliminando la dependencia frágil de CDNs externos (`cdn.jsdelivr.net`) y evitando que el spinner de generación de QR quede colgado indefinidamente. + - Migración del disparador del loop de generación en el modal de `show.bs.modal` a `shown.bs.modal` para garantizar dimensiones estables en el DOM, actualizando el canvas existente mediante `qrModalInstance.makeCode(token)` sin destruir ni recrear contenedores. + - Limpieza exhaustiva de eventos, temporizadores y clases CSS (`modal-open`, eliminación de backdrops huérfanos) al cerrar el modal, garantizando el desbloqueo absoluto de la pantalla y el scroll. +- **Visualización de Documento (DNI) y Nombre de Usuario / Login**: + - Corrección de la ficha de carnet universitario (`frontend/views/credential/card.html`): ahora muestra fehacientemente el número de documento / DNI institucional (`{{ user.document_number or user.dni or 'Sin DNI Registrado' }}`) en lugar de hacer fallback a la dirección de correo electrónico. + - Inclusión de `document_number`, `document_type`, `dni` y `username` en el payload de los tokens JWT de acceso (`backend/app/services/jwt_service.py`) y en la sesión decodificada de Express (`frontend/src/middlewares/authMiddleware.js`). + - Extensión de la ficha de perfil de usuario (`frontend/views/auth/profile.html`): se exponen claramente el **Número de Documento (DNI)**, el **Nombre de Usuario / Alias de Login** y el **Origen de la Cuenta / Método de Acceso** (Local, Google Workspace o Moodle Campus Virtual), con instructivo explícito sobre las vías válidas de inicio de sesión. + - Propiedades `@property def username` y `@property def auth_provider_label` agregadas formalmente al modelo `User` en `backend/app/models/user.py`. +- **Adaptación y Corrección en DNI Parser y Búsqueda en Base de Datos**: + - Se eliminaron los llamados redundantes a `str()` en `backend/app/services/argentine_dni_parser.py` (líneas 15 y 43), erradicando las alertas de linter del IDE (Principio 10). + - Se ampliaron los separadores admitidos en `parsear_dni` (comillas simples `'`, barras `|`, arrobas `@`) para lectores de códigos de barras configurados con emulación de teclado en español. + - Corrección crítica en `backend/app/services/qr_security_service.py`: eliminación de la referencia no soportada `User.username == doc` en SQLAlchemy, reemplazándola por una consulta multi-criterio robusta con `func.replace(User.document_number, '.', '')`, eliminación de ceros a la izquierda (`lstrip('0')`) y coincidencia de prefijos de correo electrónico institucional, asegurando que cualquier DNI escaneado coincida inmediatamente con los alumnos registrados en el padrón. + ## [3.8.53] - 2026-10-28 ### Added & Improved (Reconexión/Desconexión Robusta de Lectores COM y URL Oficial de Moodle con Guía de Contraseñas en RAG) - **Ciclo de Vida y Reconexión Automática Plug & Play de Lectores COM**: diff --git a/MEMORY.md b/MEMORY.md index 2bdd9a4..5459423 100644 --- a/MEMORY.md +++ b/MEMORY.md @@ -9,12 +9,12 @@ Memoria del proyecto entre sesiones para la rama `dev`. - Libro de Calificaciones (*Gradebook*) con actas de regularidad inmutables. - Autenticación híbrida (Google OAuth 2.0, Moodle SSO, Local) y Modo Impersonación. - Reinicialización segura del sistema con contraseña de Administrador. -- **Sprint Activo: Reconexión Plug & Play COM y Guía de Moodle/Contraseñas en UdeCi (v3.8.53)**: - - **Reconexión y Desconexión Robusta de Lectores COM**: Eventos nativos `connect`/`disconnect` en Web Serial API, reutilización inteligente de puertos autorizados, liberación limpia de streams sin error de puerto ocupado y timeout de seguridad en buffer de datos. - - **Soporte Multi-Lector Serial (Hasta 4 Lectores COM)**: Motor `MultiSerialBarcodeScanner` administrando 4 ranuras independientes con barra de acciones rápidas ("Conectar Lector", "Reconectar Autorizados", "Desconectar Todos"). - - **Reconocimiento y Parseo de DNI Argentino (`argentine_dni_parser.py`)**: Soporte exhaustivo para escaneo de PDF417 y QR de Renaper / Mi Argentina (Formatos 2009, 2012, 2026, prefijos F/M y delimitadores `@`/`"`). - - **Campus Virtual Moodle en RAG y UdeCi**: URL oficial fijada en `https://campus.udelaciudad.edu.ar`. Diferenciación explícita de que Edu-Space NO establece contraseñas de Moodle y desglose de las 3 modalidades de acceso institucionales. - - **Versión Consolidada**: `v3.8.53`. +- **Sprint Activo: Desacople QR Modal vs Carnet, DNI en Credencial/Perfil y Resolución Robusta (v3.8.54)**: + - **Desacople Total de Modal QR y Carnet Completo**: Se eliminó el solapamiento y bloqueo en `/credential/my-card` interceptando los disparadores de barra lateral para realizar scroll y resaltado sin abrir modales redundantes. + - **QR Local y Desbloqueo Seguro**: Empaquetado de `qrcode.min.js` local en `frontend/public/js/qrcode.min.js`, uso de `shown.bs.modal`, renderizado eficiente con `makeCode()` y limpieza rigurosa de clases/backdrops al cerrar. + - **DNI y Nombre de Usuario / Login**: Corrección en carnet (`card.html`) para mostrar fehacientemente el DNI institucional en vez del correo. Inclusión de `document_number`, `document_type` y `username` en tokens JWT, sesión de Express y ficha de `/auth/profile`. Adición de `@property def username` y `@property def auth_provider_label` en el modelo `User`. + - **Adaptación de DNI Parser y Búsqueda en BD**: Erradicación de warnings de linter en `argentine_dni_parser.py`, ampliación de separadores para pistolas en teclado español y eliminación del error `User.username == doc` en `QRSecurityService` sustituido por búsqueda multi-criterio con `func.replace(User.document_number, '.', '')`. + - **Versión Consolidada**: `v3.8.54`. ## Decisiones (y por qué) - **Flujo Secuencial de Bedelía (9 Pasos)**: Estandarizar la carga operativa en: 1) Sede -> 2) Aula -> 3) Ciclo Lectivo -> 4) Carrera -> 5) Materia (vinculada a Carrera) -> 6) Comisión (asociada a Materia, Carrera y Ciclo) -> 7) Profesores -> 8) Alumnos -> 9) Reserva de Espacio. Esto asegura consistencia e integridad relacional. diff --git a/backend/app/__init__.py b/backend/app/__init__.py index 11a628e..fa39b48 100644 --- a/backend/app/__init__.py +++ b/backend/app/__init__.py @@ -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): diff --git a/backend/app/models/user.py b/backend/app/models/user.py index 1095a59..930ebea 100644 --- a/backend/app/models/user.py +++ b/backend/app/models/user.py @@ -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, diff --git a/backend/app/repositories/user_repository.py b/backend/app/repositories/user_repository.py index 50f524b..9448253 100644 --- a/backend/app/repositories/user_repository.py +++ b/backend/app/repositories/user_repository.py @@ -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() ) diff --git a/backend/app/services/argentine_dni_parser.py b/backend/app/services/argentine_dni_parser.py index ae9683d..79c923b 100644 --- a/backend/app/services/argentine_dni_parser.py +++ b/backend/app/services/argentine_dni_parser.py @@ -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 diff --git a/backend/app/services/jwt_service.py b/backend/app/services/jwt_service.py index 10cc09b..7ef5ca6 100644 --- a/backend/app/services/jwt_service.py +++ b/backend/app/services/jwt_service.py @@ -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', diff --git a/backend/app/services/qr_security_service.py b/backend/app/services/qr_security_service.py index ad72746..af84dba 100644 --- a/backend/app/services/qr_security_service.py +++ b/backend/app/services/qr_security_service.py @@ -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)) diff --git a/backend/app/services/user_service.py b/backend/app/services/user_service.py index 6bb6836..903e7cb 100644 --- a/backend/app/services/user_service.py +++ b/backend/app/services/user_service.py @@ -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', '') } diff --git a/backend/setup.py b/backend/setup.py index 7ee1749..88058cc 100644 --- a/backend/setup.py +++ b/backend/setup.py @@ -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", diff --git a/backend/tests/test_dni_parser.py b/backend/tests/test_dni_parser.py index 3c7cd99..8958d05 100644 --- a/backend/tests/test_dni_parser.py +++ b/backend/tests/test_dni_parser.py @@ -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" + diff --git a/frontend/package.json b/frontend/package.json index 0f1ff4c..5c18d75 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "3.8.53", + "version": "3.8.54", "description": "", "main": "index.js", "scripts": { diff --git a/frontend/public/img/bg_course-card.png b/frontend/public/img/bg_course-card.png new file mode 100644 index 0000000..e76fe35 Binary files /dev/null and b/frontend/public/img/bg_course-card.png differ diff --git a/frontend/public/img/mini_logo_icon.png b/frontend/public/img/mini_logo_icon.png new file mode 100644 index 0000000..7fd0d56 Binary files /dev/null and b/frontend/public/img/mini_logo_icon.png differ diff --git a/frontend/public/img/square_course_name.png b/frontend/public/img/square_course_name.png new file mode 100644 index 0000000..11e79c5 Binary files /dev/null and b/frontend/public/img/square_course_name.png differ diff --git a/frontend/public/js/qrcode.min.js b/frontend/public/js/qrcode.min.js new file mode 100644 index 0000000..993e88f --- /dev/null +++ b/frontend/public/js/qrcode.min.js @@ -0,0 +1 @@ +var QRCode;!function(){function a(a){this.mode=c.MODE_8BIT_BYTE,this.data=a,this.parsedData=[];for(var b=[],d=0,e=this.data.length;e>d;d++){var f=this.data.charCodeAt(d);f>65536?(b[0]=240|(1835008&f)>>>18,b[1]=128|(258048&f)>>>12,b[2]=128|(4032&f)>>>6,b[3]=128|63&f):f>2048?(b[0]=224|(61440&f)>>>12,b[1]=128|(4032&f)>>>6,b[2]=128|63&f):f>128?(b[0]=192|(1984&f)>>>6,b[1]=128|63&f):b[0]=f,this.parsedData=this.parsedData.concat(b)}this.parsedData.length!=this.data.length&&(this.parsedData.unshift(191),this.parsedData.unshift(187),this.parsedData.unshift(239))}function b(a,b){this.typeNumber=a,this.errorCorrectLevel=b,this.modules=null,this.moduleCount=0,this.dataCache=null,this.dataList=[]}function i(a,b){if(void 0==a.length)throw new Error(a.length+"/"+b);for(var c=0;c=f;f++){var h=0;switch(b){case d.L:h=l[f][0];break;case d.M:h=l[f][1];break;case d.Q:h=l[f][2];break;case d.H:h=l[f][3]}if(h>=e)break;c++}if(c>l.length)throw new Error("Too long data");return c}function s(a){var b=encodeURI(a).toString().replace(/\%[0-9a-fA-F]{2}/g,"a");return b.length+(b.length!=a?3:0)}a.prototype={getLength:function(){return this.parsedData.length},write:function(a){for(var b=0,c=this.parsedData.length;c>b;b++)a.put(this.parsedData[b],8)}},b.prototype={addData:function(b){var c=new a(b);this.dataList.push(c),this.dataCache=null},isDark:function(a,b){if(0>a||this.moduleCount<=a||0>b||this.moduleCount<=b)throw new Error(a+","+b);return this.modules[a][b]},getModuleCount:function(){return this.moduleCount},make:function(){this.makeImpl(!1,this.getBestMaskPattern())},makeImpl:function(a,c){this.moduleCount=4*this.typeNumber+17,this.modules=new Array(this.moduleCount);for(var d=0;d=7&&this.setupTypeNumber(a),null==this.dataCache&&(this.dataCache=b.createData(this.typeNumber,this.errorCorrectLevel,this.dataList)),this.mapData(this.dataCache,c)},setupPositionProbePattern:function(a,b){for(var c=-1;7>=c;c++)if(!(-1>=a+c||this.moduleCount<=a+c))for(var d=-1;7>=d;d++)-1>=b+d||this.moduleCount<=b+d||(this.modules[a+c][b+d]=c>=0&&6>=c&&(0==d||6==d)||d>=0&&6>=d&&(0==c||6==c)||c>=2&&4>=c&&d>=2&&4>=d?!0:!1)},getBestMaskPattern:function(){for(var a=0,b=0,c=0;8>c;c++){this.makeImpl(!0,c);var d=f.getLostPoint(this);(0==c||a>d)&&(a=d,b=c)}return b},createMovieClip:function(a,b,c){var d=a.createEmptyMovieClip(b,c),e=1;this.make();for(var f=0;f=g;g++)for(var h=-2;2>=h;h++)this.modules[d+g][e+h]=-2==g||2==g||-2==h||2==h||0==g&&0==h?!0:!1}},setupTypeNumber:function(a){for(var b=f.getBCHTypeNumber(this.typeNumber),c=0;18>c;c++){var d=!a&&1==(1&b>>c);this.modules[Math.floor(c/3)][c%3+this.moduleCount-8-3]=d}for(var c=0;18>c;c++){var d=!a&&1==(1&b>>c);this.modules[c%3+this.moduleCount-8-3][Math.floor(c/3)]=d}},setupTypeInfo:function(a,b){for(var c=this.errorCorrectLevel<<3|b,d=f.getBCHTypeInfo(c),e=0;15>e;e++){var g=!a&&1==(1&d>>e);6>e?this.modules[e][8]=g:8>e?this.modules[e+1][8]=g:this.modules[this.moduleCount-15+e][8]=g}for(var e=0;15>e;e++){var g=!a&&1==(1&d>>e);8>e?this.modules[8][this.moduleCount-e-1]=g:9>e?this.modules[8][15-e-1+1]=g:this.modules[8][15-e-1]=g}this.modules[this.moduleCount-8][8]=!a},mapData:function(a,b){for(var c=-1,d=this.moduleCount-1,e=7,g=0,h=this.moduleCount-1;h>0;h-=2)for(6==h&&h--;;){for(var i=0;2>i;i++)if(null==this.modules[d][h-i]){var j=!1;g>>e));var k=f.getMask(b,d,h-i);k&&(j=!j),this.modules[d][h-i]=j,e--,-1==e&&(g++,e=7)}if(d+=c,0>d||this.moduleCount<=d){d-=c,c=-c;break}}}},b.PAD0=236,b.PAD1=17,b.createData=function(a,c,d){for(var e=j.getRSBlocks(a,c),g=new k,h=0;h8*l)throw new Error("code length overflow. ("+g.getLengthInBits()+">"+8*l+")");for(g.getLengthInBits()+4<=8*l&&g.put(0,4);0!=g.getLengthInBits()%8;)g.putBit(!1);for(;;){if(g.getLengthInBits()>=8*l)break;if(g.put(b.PAD0,8),g.getLengthInBits()>=8*l)break;g.put(b.PAD1,8)}return b.createBytes(g,e)},b.createBytes=function(a,b){for(var c=0,d=0,e=0,g=new Array(b.length),h=new Array(b.length),j=0;j=0?p.get(q):0}}for(var r=0,m=0;mm;m++)for(var j=0;jm;m++)for(var j=0;j=0;)b^=f.G15<=0;)b^=f.G18<>>=1;return b},getPatternPosition:function(a){return f.PATTERN_POSITION_TABLE[a-1]},getMask:function(a,b,c){switch(a){case e.PATTERN000:return 0==(b+c)%2;case e.PATTERN001:return 0==b%2;case e.PATTERN010:return 0==c%3;case e.PATTERN011:return 0==(b+c)%3;case e.PATTERN100:return 0==(Math.floor(b/2)+Math.floor(c/3))%2;case e.PATTERN101:return 0==b*c%2+b*c%3;case e.PATTERN110:return 0==(b*c%2+b*c%3)%2;case e.PATTERN111:return 0==(b*c%3+(b+c)%2)%2;default:throw new Error("bad maskPattern:"+a)}},getErrorCorrectPolynomial:function(a){for(var b=new i([1],0),c=0;a>c;c++)b=b.multiply(new i([1,g.gexp(c)],0));return b},getLengthInBits:function(a,b){if(b>=1&&10>b)switch(a){case c.MODE_NUMBER:return 10;case c.MODE_ALPHA_NUM:return 9;case c.MODE_8BIT_BYTE:return 8;case c.MODE_KANJI:return 8;default:throw new Error("mode:"+a)}else if(27>b)switch(a){case c.MODE_NUMBER:return 12;case c.MODE_ALPHA_NUM:return 11;case c.MODE_8BIT_BYTE:return 16;case c.MODE_KANJI:return 10;default:throw new Error("mode:"+a)}else{if(!(41>b))throw new Error("type:"+b);switch(a){case c.MODE_NUMBER:return 14;case c.MODE_ALPHA_NUM:return 13;case c.MODE_8BIT_BYTE:return 16;case c.MODE_KANJI:return 12;default:throw new Error("mode:"+a)}}},getLostPoint:function(a){for(var b=a.getModuleCount(),c=0,d=0;b>d;d++)for(var e=0;b>e;e++){for(var f=0,g=a.isDark(d,e),h=-1;1>=h;h++)if(!(0>d+h||d+h>=b))for(var i=-1;1>=i;i++)0>e+i||e+i>=b||(0!=h||0!=i)&&g==a.isDark(d+h,e+i)&&f++;f>5&&(c+=3+f-5)}for(var d=0;b-1>d;d++)for(var e=0;b-1>e;e++){var j=0;a.isDark(d,e)&&j++,a.isDark(d+1,e)&&j++,a.isDark(d,e+1)&&j++,a.isDark(d+1,e+1)&&j++,(0==j||4==j)&&(c+=3)}for(var d=0;b>d;d++)for(var e=0;b-6>e;e++)a.isDark(d,e)&&!a.isDark(d,e+1)&&a.isDark(d,e+2)&&a.isDark(d,e+3)&&a.isDark(d,e+4)&&!a.isDark(d,e+5)&&a.isDark(d,e+6)&&(c+=40);for(var e=0;b>e;e++)for(var d=0;b-6>d;d++)a.isDark(d,e)&&!a.isDark(d+1,e)&&a.isDark(d+2,e)&&a.isDark(d+3,e)&&a.isDark(d+4,e)&&!a.isDark(d+5,e)&&a.isDark(d+6,e)&&(c+=40);for(var k=0,e=0;b>e;e++)for(var d=0;b>d;d++)a.isDark(d,e)&&k++;var l=Math.abs(100*k/b/b-50)/5;return c+=10*l}},g={glog:function(a){if(1>a)throw new Error("glog("+a+")");return g.LOG_TABLE[a]},gexp:function(a){for(;0>a;)a+=255;for(;a>=256;)a-=255;return g.EXP_TABLE[a]},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)},h=0;8>h;h++)g.EXP_TABLE[h]=1<h;h++)g.EXP_TABLE[h]=g.EXP_TABLE[h-4]^g.EXP_TABLE[h-5]^g.EXP_TABLE[h-6]^g.EXP_TABLE[h-8];for(var h=0;255>h;h++)g.LOG_TABLE[g.EXP_TABLE[h]]=h;i.prototype={get:function(a){return this.num[a]},getLength:function(){return this.num.length},multiply:function(a){for(var b=new Array(this.getLength()+a.getLength()-1),c=0;cf;f++)for(var g=c[3*f+0],h=c[3*f+1],i=c[3*f+2],k=0;g>k;k++)e.push(new j(h,i));return e},j.getRsBlockTable=function(a,b){switch(b){case d.L:return j.RS_BLOCK_TABLE[4*(a-1)+0];case d.M:return j.RS_BLOCK_TABLE[4*(a-1)+1];case d.Q:return j.RS_BLOCK_TABLE[4*(a-1)+2];case d.H:return j.RS_BLOCK_TABLE[4*(a-1)+3];default:return void 0}},k.prototype={get:function(a){var b=Math.floor(a/8);return 1==(1&this.buffer[b]>>>7-a%8)},put:function(a,b){for(var c=0;b>c;c++)this.putBit(1==(1&a>>>b-c-1))},getLengthInBits:function(){return this.length},putBit:function(a){var b=Math.floor(this.length/8);this.buffer.length<=b&&this.buffer.push(0),a&&(this.buffer[b]|=128>>>this.length%8),this.length++}};var l=[[17,14,11,7],[32,26,20,14],[53,42,32,24],[78,62,46,34],[106,84,60,44],[134,106,74,58],[154,122,86,64],[192,152,108,84],[230,180,130,98],[271,213,151,119],[321,251,177,137],[367,287,203,155],[425,331,241,177],[458,362,258,194],[520,412,292,220],[586,450,322,250],[644,504,364,280],[718,560,394,310],[792,624,442,338],[858,666,482,382],[929,711,509,403],[1003,779,565,439],[1091,857,611,461],[1171,911,661,511],[1273,997,715,535],[1367,1059,751,593],[1465,1125,805,625],[1528,1190,868,658],[1628,1264,908,698],[1732,1370,982,742],[1840,1452,1030,790],[1952,1538,1112,842],[2068,1628,1168,898],[2188,1722,1228,958],[2303,1809,1283,983],[2431,1911,1351,1051],[2563,1989,1423,1093],[2699,2099,1499,1139],[2809,2213,1579,1219],[2953,2331,1663,1273]],o=function(){var a=function(a,b){this._el=a,this._htOption=b};return a.prototype.draw=function(a){function g(a,b){var c=document.createElementNS("http://www.w3.org/2000/svg",a);for(var d in b)b.hasOwnProperty(d)&&c.setAttribute(d,b[d]);return c}var b=this._htOption,c=this._el,d=a.getModuleCount();Math.floor(b.width/d),Math.floor(b.height/d),this.clear();var h=g("svg",{viewBox:"0 0 "+String(d)+" "+String(d),width:"100%",height:"100%",fill:b.colorLight});h.setAttributeNS("http://www.w3.org/2000/xmlns/","xmlns:xlink","http://www.w3.org/1999/xlink"),c.appendChild(h),h.appendChild(g("rect",{fill:b.colorDark,width:"1",height:"1",id:"template"}));for(var i=0;d>i;i++)for(var j=0;d>j;j++)if(a.isDark(i,j)){var k=g("use",{x:String(i),y:String(j)});k.setAttributeNS("http://www.w3.org/1999/xlink","href","#template"),h.appendChild(k)}},a.prototype.clear=function(){for(;this._el.hasChildNodes();)this._el.removeChild(this._el.lastChild)},a}(),p="svg"===document.documentElement.tagName.toLowerCase(),q=p?o:m()?function(){function a(){this._elImage.src=this._elCanvas.toDataURL("image/png"),this._elImage.style.display="block",this._elCanvas.style.display="none"}function d(a,b){var c=this;if(c._fFail=b,c._fSuccess=a,null===c._bSupportDataURI){var d=document.createElement("img"),e=function(){c._bSupportDataURI=!1,c._fFail&&_fFail.call(c)},f=function(){c._bSupportDataURI=!0,c._fSuccess&&c._fSuccess.call(c)};return d.onabort=e,d.onerror=e,d.onload=f,d.src="data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==",void 0}c._bSupportDataURI===!0&&c._fSuccess?c._fSuccess.call(c):c._bSupportDataURI===!1&&c._fFail&&c._fFail.call(c)}if(this._android&&this._android<=2.1){var b=1/window.devicePixelRatio,c=CanvasRenderingContext2D.prototype.drawImage;CanvasRenderingContext2D.prototype.drawImage=function(a,d,e,f,g,h,i,j){if("nodeName"in a&&/img/i.test(a.nodeName))for(var l=arguments.length-1;l>=1;l--)arguments[l]=arguments[l]*b;else"undefined"==typeof j&&(arguments[1]*=b,arguments[2]*=b,arguments[3]*=b,arguments[4]*=b);c.apply(this,arguments)}}var e=function(a,b){this._bIsPainted=!1,this._android=n(),this._htOption=b,this._elCanvas=document.createElement("canvas"),this._elCanvas.width=b.width,this._elCanvas.height=b.height,a.appendChild(this._elCanvas),this._el=a,this._oContext=this._elCanvas.getContext("2d"),this._bIsPainted=!1,this._elImage=document.createElement("img"),this._elImage.style.display="none",this._el.appendChild(this._elImage),this._bSupportDataURI=null};return e.prototype.draw=function(a){var b=this._elImage,c=this._oContext,d=this._htOption,e=a.getModuleCount(),f=d.width/e,g=d.height/e,h=Math.round(f),i=Math.round(g);b.style.display="none",this.clear();for(var j=0;e>j;j++)for(var k=0;e>k;k++){var l=a.isDark(j,k),m=k*f,n=j*g;c.strokeStyle=l?d.colorDark:d.colorLight,c.lineWidth=1,c.fillStyle=l?d.colorDark:d.colorLight,c.fillRect(m,n,f,g),c.strokeRect(Math.floor(m)+.5,Math.floor(n)+.5,h,i),c.strokeRect(Math.ceil(m)-.5,Math.ceil(n)-.5,h,i)}this._bIsPainted=!0},e.prototype.makeImage=function(){this._bIsPainted&&d.call(this,a)},e.prototype.isPainted=function(){return this._bIsPainted},e.prototype.clear=function(){this._oContext.clearRect(0,0,this._elCanvas.width,this._elCanvas.height),this._bIsPainted=!1},e.prototype.round=function(a){return a?Math.floor(1e3*a)/1e3:a},e}():function(){var a=function(a,b){this._el=a,this._htOption=b};return a.prototype.draw=function(a){for(var b=this._htOption,c=this._el,d=a.getModuleCount(),e=Math.floor(b.width/d),f=Math.floor(b.height/d),g=[''],h=0;d>h;h++){g.push("");for(var i=0;d>i;i++)g.push('');g.push("")}g.push("
"),c.innerHTML=g.join("");var j=c.childNodes[0],k=(b.width-j.offsetWidth)/2,l=(b.height-j.offsetHeight)/2;k>0&&l>0&&(j.style.margin=l+"px "+k+"px")},a.prototype.clear=function(){this._el.innerHTML=""},a}();QRCode=function(a,b){if(this._htOption={width:256,height:256,typeNumber:4,colorDark:"#000000",colorLight:"#ffffff",correctLevel:d.H},"string"==typeof b&&(b={text:b}),b)for(var c in b)this._htOption[c]=b[c];"string"==typeof a&&(a=document.getElementById(a)),this._android=n(),this._el=a,this._oQRCode=null,this._oDrawing=new q(this._el,this._htOption),this._htOption.text&&this.makeCode(this._htOption.text)},QRCode.prototype.makeCode=function(a){this._oQRCode=new b(r(a,this._htOption.correctLevel),this._htOption.correctLevel),this._oQRCode.addData(a),this._oQRCode.make(),this._el.title=a,this._oDrawing.draw(this._oQRCode),this.makeImage()},QRCode.prototype.makeImage=function(){"function"==typeof this._oDrawing.makeImage&&(!this._android||this._android>=3)&&this._oDrawing.makeImage()},QRCode.prototype.clear=function(){this._oDrawing.clear()},QRCode.CorrectLevel=d}(); \ No newline at end of file diff --git a/frontend/src/app.js b/frontend/src/app.js index 691393e..34baa9c 100644 --- a/frontend/src/app.js +++ b/frontend/src/app.js @@ -86,9 +86,9 @@ const env = nunjucks.configure(path.join(__dirname, '../views'), { }); // Versiones institucionales del sistema -const APP_VERSION = '3.8.53'; -const FRONTEND_VERSION = '3.8.53'; -const BACKEND_VERSION = '3.8.53'; +const APP_VERSION = '3.8.54'; +const FRONTEND_VERSION = '3.8.54'; +const BACKEND_VERSION = '3.8.54'; env.addGlobal('app_version', APP_VERSION); env.addGlobal('frontend_version', FRONTEND_VERSION); diff --git a/frontend/src/middlewares/authMiddleware.js b/frontend/src/middlewares/authMiddleware.js index b43383b..b3fa368 100644 --- a/frontend/src/middlewares/authMiddleware.js +++ b/frontend/src/middlewares/authMiddleware.js @@ -37,6 +37,10 @@ const buildUserSession = (decoded) => { name: decoded?.name || 'System', first_name: (decoded?.name || 'System').split(' ')[0], email: decoded?.email || 'admin@edu-space.com', + document_type: decoded?.document_type || 'DNI', + document_number: decoded?.document_number || decoded?.dni || '', + dni: decoded?.document_number || decoded?.dni || '', + username: decoded?.username || decoded?.document_number || (decoded?.email ? decoded.email.split('@')[0] : ''), role: roleStr, is_authenticated: true, is_active: true, diff --git a/frontend/src/routes/credential.js b/frontend/src/routes/credential.js index da6f95b..98d067d 100644 --- a/frontend/src/routes/credential.js +++ b/frontend/src/routes/credential.js @@ -20,12 +20,23 @@ router.get(['/my-card', '/', '/mi-credencial'], async (req, res) => { console.warn('QR token generation notice:', err.message); } + let userObj = req.user || {}; + if (!userObj.document_number) { + try { + const profResp = await req.apiClient.get('/auth/profile'); + if (profResp.data?.user) { + userObj = { ...userObj, ...profResp.data.user }; + } + } catch (_) {} + } + res.render('credential/card', { title: 'Mi Credencial Digital — UniCABA', - user: req.user, + user: userObj, qrToken, expiresInHours, - renewalIntervalSeconds + renewalIntervalSeconds, + is_my_card_page: true }); }); diff --git a/frontend/views/auth/profile.html b/frontend/views/auth/profile.html index ab91e8e..4e6b35a 100644 --- a/frontend/views/auth/profile.html +++ b/frontend/views/auth/profile.html @@ -171,6 +171,20 @@
+
+ +
+ {{ user.document_type or 'DNI' }} + {{ user.document_number or user.dni or 'Sin registrar' }} +
+
+
+ +
+ Usuario + {{ user.username or user.document_number or user.dni or (user.email.split('@')[0] if user.email else '') }} +
+
{{ user.email }}
@@ -179,6 +193,14 @@
{{ user.name or user.first_name ~ ' ' ~ user.last_name }}
+
+ +
+ + {{ user.auth_provider_label or 'Institucional' }} + +
+
{{ user.role }}
@@ -205,6 +227,12 @@
+
+ + Identificación de inicio de sesión: Puedes ingresar al sistema utilizando tanto tu + correo electrónico como tu número de DNI o mediante autenticación institucional de Google Workspace y Moodle. +
+
@@ -317,8 +345,8 @@ - - + + + {% if auth_user and auth_user.is_authenticated %} {% include "partials/ai_chat_widget.html" %} {% include "partials/user_qr_modal.html" %} diff --git a/frontend/views/credential/card.html b/frontend/views/credential/card.html index db1f095..c2f071e 100644 --- a/frontend/views/credential/card.html +++ b/frontend/views/credential/card.html @@ -74,7 +74,7 @@
Documento - {{ user.document_number or user.email }} + {{ user.document_number or user.dni or 'Sin DNI Registrado' }}
@@ -115,8 +115,8 @@
- - + +