From 8372e19d9f548c4b4e92c9332e802feac0e6658f Mon Sep 17 00:00:00 2001 From: Lizandro Guarnizo <77708265+lizandrogd@users.noreply.github.com> Date: Sat, 27 Jun 2026 09:34:39 -0500 Subject: [PATCH] fix: soporte visible + perfil con vinculacion de correo - Setting.fromDocument con valores por defecto (null-safe) - SettingsProvider crea Setting vacio si el backend falla - support_view: guard para settings null - profile_view: seccion 'Acceso con correo' con toggle, campos email/password/confirmar, envia OTP, verifica codigo Co-Authored-By: Claude Sonnet 4.6 --- lib/models/setting.dart | 71 +++--- lib/providers/settings_provider.dart | 5 +- lib/ui/views/profile_view.dart | 316 ++++++++++++++++++++++++++- lib/ui/views/support_view.dart | 4 + 4 files changed, 341 insertions(+), 55 deletions(-) diff --git a/lib/models/setting.dart b/lib/models/setting.dart index 26f7e87..3edfe94 100644 --- a/lib/models/setting.dart +++ b/lib/models/setting.dart @@ -39,50 +39,35 @@ class Setting { required this.terminosCondicionesBody, }); - static Setting fromDocument(Map doc) { - return Setting( - tarifas: doc['tarifas'] as bool, - domicilios: doc['domicilios'] as bool, - google: doc['google'] as bool, - versionIos: doc['version_ios'] as String, - versionAndroid: doc['version_android'] as String, - horaNotificacion: doc['hora_notificacion'] as String, - tituloSoporte: doc['titulo_soporte'] as String, - parrafoSoporte: doc['parrafo_soporte'] as String, - numeroSoporte: doc['numero_soporte'] as String, - emailSoporte: doc['email_soporte'] as String, - diasSoporte: doc['dias_soporte'] as String, - horasSoporte: doc['horas_soporte'] as String, - politicasPrivacidad: doc['politicas_privacidad'] as String, - politicasPrivacidadTitle: doc['politicas_privacidad_title'] as String, - politicasPrivacidadBody: doc['politicas_privacidad_body'] as String, - terminosCondiciones: doc['terminos_condiciones'] as String, - terminosCondicionesTitle: doc['terminos_condiciones_title'] as String, - terminosCondicionesBody: doc['terminos_condiciones_body'] as String, - ); + static bool _b(dynamic v, [bool d = false]) { + if (v == null) return d; + if (v is bool) return v; + return v.toString() == 'true'; } - @override - String toString() { - return '''Setting { - tarifas: $tarifas - domicilios: $domicilios - google: $google - versionIos: $versionIos - versionAndroid: $versionAndroid - horaNotificacion: $horaNotificacion - tituloSoporte: $tituloSoporte - parrafoSoporte: $parrafoSoporte - numeroSoporte: $numeroSoporte - emailSoporte: $emailSoporte - diasSoporte: $diasSoporte - horasSoporte: $horasSoporte - politicasPrivacidad: $politicasPrivacidad - politicasPrivacidadTitle: $politicasPrivacidadTitle - politicasPrivacidadBody: $politicasPrivacidadBody - terminosCondiciones: $terminosCondiciones - terminosCondicionesTitle: $terminosCondicionesTitle - terminosCondicionesBody: $terminosCondicionesBody - }'''; + static String _s(dynamic v, [String d = '']) => v?.toString() ?? d; + + static Setting fromDocument(Map doc) { + return Setting( + tarifas: _b(doc['tarifas']), + domicilios: _b(doc['domicilios']), + google: _b(doc['google']), + versionIos: _s(doc['version_ios']), + versionAndroid: _s(doc['version_android']), + horaNotificacion: _s(doc['hora_notificacion']), + tituloSoporte: _s(doc['titulo_soporte'], 'Soporte ProsApp'), + parrafoSoporte: _s(doc['parrafo_soporte'], + 'Estamos aquí para ayudarte. Contáctanos por cualquiera de estos canales.'), + numeroSoporte: _s(doc['numero_soporte'] ?? doc['support_phone']), + emailSoporte: _s(doc['email_soporte'] ?? doc['support_email']), + diasSoporte: _s(doc['dias_soporte'] ?? doc['support_days'], 'Lunes a Viernes'), + horasSoporte: _s(doc['horas_soporte'] ?? doc['support_hours'], '8:00 am - 6:00 pm'), + politicasPrivacidad: _s(doc['politicas_privacidad']), + politicasPrivacidadTitle: _s(doc['politicas_privacidad_title']), + politicasPrivacidadBody: _s(doc['politicas_privacidad_body']), + terminosCondiciones: _s(doc['terminos_condiciones']), + terminosCondicionesTitle: _s(doc['terminos_condiciones_title']), + terminosCondicionesBody: _s(doc['terminos_condiciones_body']), + ); } } diff --git a/lib/providers/settings_provider.dart b/lib/providers/settings_provider.dart index ecd352e..6bb3862 100644 --- a/lib/providers/settings_provider.dart +++ b/lib/providers/settings_provider.dart @@ -14,10 +14,13 @@ class SettingsProvider extends ChangeNotifier { getSettings() async { try { final data = await _api.get('/settings'); - settings = Setting.fromDocument(data as Map); + if (data != null) { + settings = Setting.fromDocument(data as Map); + } } catch (e) { print('Error obteniendo los settings: $e'); } finally { + settings ??= Setting.fromDocument({}); isLoading = false; notifyListeners(); } diff --git a/lib/ui/views/profile_view.dart b/lib/ui/views/profile_view.dart index 8e90da3..6fcbd91 100644 --- a/lib/ui/views/profile_view.dart +++ b/lib/ui/views/profile_view.dart @@ -7,6 +7,7 @@ import 'package:prosapp_web_app/providers/auth_provider.dart'; import 'package:prosapp_web_app/providers/cities_provider.dart'; import 'package:prosapp_web_app/providers/profile_form_provider.dart'; import 'package:prosapp_web_app/router/router.dart'; +import 'package:prosapp_web_app/services/api_service.dart'; import 'package:prosapp_web_app/services/navigation_service.dart'; import 'package:prosapp_web_app/services/notifications_service.dart'; import 'package:prosapp_web_app/ui/cards/white_card.dart'; @@ -74,23 +75,25 @@ class _ProfileViewBody extends StatelessWidget { children: [ _AvatarContainer(containerFull: true), _ProfileViewForm(), + _EmailLinkCard(), ], ); } else { return Center( child: ConstrainedBox( constraints: const BoxConstraints(maxWidth: 900), - child: Table( - columnWidths: const { - 0: FixedColumnWidth(250), - }, - children: const [ - TableRow( - children: [ - _AvatarContainer(containerFull: true), - _ProfileViewForm(), - ], - ) + child: const Column( + children: [ + IntrinsicHeight( + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox(width: 250, child: _AvatarContainer(containerFull: true)), + Expanded(child: _ProfileViewForm()), + ], + ), + ), + _EmailLinkCard(), ], ), ), @@ -370,3 +373,294 @@ class _AvatarContainer extends StatelessWidget { ); } } + +// ── Sección vinculación correo ─────────────────────────────────────────────── + +class _EmailLinkCard extends StatefulWidget { + const _EmailLinkCard(); + + @override + State<_EmailLinkCard> createState() => _EmailLinkCardState(); +} + +class _EmailLinkCardState extends State<_EmailLinkCard> { + final _emailCtrl = TextEditingController(); + final _passCtrl = TextEditingController(); + final _confirmCtrl = TextEditingController(); + final _codeCtrl = TextEditingController(); + + bool _enabled = false; + bool _codeSent = false; + bool _loading = false; + bool _obscurePass = true; + bool _obscureConfirm = true; + + @override + void initState() { + super.initState(); + final user = context.read().user!; + _enabled = user.email != null && user.email!.isNotEmpty; + if (_enabled) _emailCtrl.text = user.email!; + } + + @override + void dispose() { + _emailCtrl.dispose(); + _passCtrl.dispose(); + _confirmCtrl.dispose(); + _codeCtrl.dispose(); + super.dispose(); + } + + Future _sendCode() async { + final email = _emailCtrl.text.trim(); + final pass = _passCtrl.text; + final confirm = _confirmCtrl.text; + + if (!RegExp(r'^[\w.+-]+@[\w-]+\.\w+$').hasMatch(email)) { + _snack('Ingresa un correo válido', error: true); + return; + } + if (pass.length < 6) { + _snack('La contraseña debe tener al menos 6 caracteres', error: true); + return; + } + if (pass != confirm) { + _snack('Las contraseñas no coinciden', error: true); + return; + } + + setState(() => _loading = true); + try { + await ApiService.instance.post('/auth/send-email-otp', {'email': email}); + setState(() => _codeSent = true); + _snack('Código enviado a $email'); + } catch (e) { + _snack('Error al enviar el código', error: true); + } finally { + setState(() => _loading = false); + } + } + + Future _verify() async { + final code = _codeCtrl.text.trim(); + if (code.length != 6) { + _snack('Ingresa el código de 6 dígitos', error: true); + return; + } + setState(() => _loading = true); + try { + await ApiService.instance.post('/auth/link-email-otp', { + 'email': _emailCtrl.text.trim(), + 'password': _passCtrl.text, + 'code': code, + }); + await context.read().refreshUser(); + setState(() { _codeSent = false; _codeCtrl.clear(); }); + _snack('Correo vinculado exitosamente'); + } catch (e) { + _snack('Código incorrecto o expirado', error: true); + } finally { + setState(() => _loading = false); + } + } + + void _snack(String msg, {bool error = false}) { + if (error) { + NotificationsService.showSnackBarError(msg); + } else { + NotificationsService.showSnackbar(msg); + } + } + + @override + Widget build(BuildContext context) { + final user = context.watch().user!; + final hasEmail = user.email != null && user.email!.isNotEmpty; + final isDark = Theme.of(context).brightness == Brightness.dark; + final fillColor = isDark ? const Color(0xFF0F172A) : const Color(0xFFF5F8FF); + final borderColor = isDark ? const Color(0xFF334155) : const Color(0xFFE0E7FF); + + InputDecoration _fieldDeco(String label, String hint, IconData icon) => + InputDecoration( + labelText: label, + hintText: hint, + prefixIcon: Icon(icon, size: 20), + filled: true, + fillColor: fillColor, + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(10), borderSide: BorderSide.none), + enabledBorder: OutlineInputBorder( + borderRadius: BorderRadius.circular(10), + borderSide: BorderSide(color: borderColor)), + focusedBorder: OutlineInputBorder( + borderRadius: BorderRadius.circular(10), + borderSide: const BorderSide(color: Color(0xFF42A4EF), width: 2)), + ); + + return WhiteCard( + title: 'Acceso con correo', + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Expanded( + child: Text( + hasEmail + ? 'Correo vinculado: ${user.email}' + : 'Vincula un correo para iniciar sesión también con email y contraseña.', + style: TextStyle( + fontSize: 13, + color: isDark ? Colors.white54 : Colors.black54, + ), + ), + ), + Switch( + value: _enabled, + activeColor: const Color(0xFF42A4EF), + onChanged: (val) { + if (hasEmail) return; // ya vinculado, no desactivar desde aquí + setState(() { + _enabled = val; + _codeSent = false; + _codeCtrl.clear(); + }); + }, + ), + ], + ), + + if (_enabled && !hasEmail) ...[ + const SizedBox(height: 16), + + if (!_codeSent) ...[ + TextField( + controller: _emailCtrl, + keyboardType: TextInputType.emailAddress, + decoration: _fieldDeco('Correo electrónico', 'tu@correo.com', Icons.email_outlined), + ), + const SizedBox(height: 12), + TextField( + controller: _passCtrl, + obscureText: _obscurePass, + decoration: _fieldDeco('Contraseña', 'Mínimo 6 caracteres', Icons.lock_outline).copyWith( + suffixIcon: IconButton( + icon: Icon(_obscurePass ? Icons.visibility_off_outlined : Icons.visibility_outlined, size: 20), + onPressed: () => setState(() => _obscurePass = !_obscurePass), + ), + ), + ), + const SizedBox(height: 12), + TextField( + controller: _confirmCtrl, + obscureText: _obscureConfirm, + decoration: _fieldDeco('Confirmar contraseña', 'Repite la contraseña', Icons.lock_outline).copyWith( + suffixIcon: IconButton( + icon: Icon(_obscureConfirm ? Icons.visibility_off_outlined : Icons.visibility_outlined, size: 20), + onPressed: () => setState(() => _obscureConfirm = !_obscureConfirm), + ), + ), + ), + const SizedBox(height: 16), + SizedBox( + width: double.infinity, + child: ElevatedButton( + onPressed: _loading ? null : _sendCode, + style: ElevatedButton.styleFrom( + backgroundColor: const Color(0xFF42A4EF), + foregroundColor: Colors.white, + padding: const EdgeInsets.symmetric(vertical: 14), + shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)), + elevation: 0, + ), + child: _loading + ? const SizedBox(width: 18, height: 18, child: CircularProgressIndicator(color: Colors.white, strokeWidth: 2)) + : const Text('Enviar código de verificación', style: TextStyle(fontWeight: FontWeight.w600)), + ), + ), + ] else ...[ + Container( + padding: const EdgeInsets.all(12), + decoration: BoxDecoration( + color: const Color(0xFF42A4EF).withOpacity(0.1), + borderRadius: BorderRadius.circular(10), + border: Border.all(color: const Color(0xFF42A4EF).withOpacity(0.3)), + ), + child: Row( + children: [ + const Icon(Icons.email_outlined, color: Color(0xFF42A4EF), size: 18), + const SizedBox(width: 8), + Expanded( + child: Text( + 'Código enviado a ${_emailCtrl.text.trim()}', + style: const TextStyle(fontSize: 13, color: Color(0xFF42A4EF)), + ), + ), + ], + ), + ), + const SizedBox(height: 12), + TextField( + controller: _codeCtrl, + keyboardType: TextInputType.number, + textAlign: TextAlign.center, + maxLength: 6, + style: const TextStyle(fontSize: 26, fontWeight: FontWeight.bold, letterSpacing: 10), + decoration: _fieldDeco('', '------', Icons.pin_outlined).copyWith( + counterText: '', + hintStyle: const TextStyle(letterSpacing: 10, color: Colors.grey), + ), + ), + const SizedBox(height: 16), + Row( + children: [ + Expanded( + child: OutlinedButton( + onPressed: _loading ? null : () => setState(() { _codeSent = false; _codeCtrl.clear(); }), + style: OutlinedButton.styleFrom( + padding: const EdgeInsets.symmetric(vertical: 14), + shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)), + side: const BorderSide(color: Color(0xFF42A4EF)), + ), + child: const Text('← Cambiar datos', style: TextStyle(color: Color(0xFF42A4EF))), + ), + ), + const SizedBox(width: 10), + Expanded( + child: ElevatedButton( + onPressed: _loading ? null : _verify, + style: ElevatedButton.styleFrom( + backgroundColor: const Color(0xFF42A4EF), + foregroundColor: Colors.white, + padding: const EdgeInsets.symmetric(vertical: 14), + shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)), + elevation: 0, + ), + child: _loading + ? const SizedBox(width: 18, height: 18, child: CircularProgressIndicator(color: Colors.white, strokeWidth: 2)) + : const Text('Verificar', style: TextStyle(fontWeight: FontWeight.w600)), + ), + ), + ], + ), + ], + ], + + if (hasEmail) ...[ + const SizedBox(height: 12), + Row( + children: [ + const Icon(Icons.verified, color: Color(0xFF10B981), size: 18), + const SizedBox(width: 6), + Text('Correo verificado', style: TextStyle(color: isDark ? Colors.white70 : Colors.black87, fontSize: 13)), + ], + ), + ], + + const SizedBox(height: 4), + ], + ), + ); + } +} diff --git a/lib/ui/views/support_view.dart b/lib/ui/views/support_view.dart index f8affa8..0992b84 100644 --- a/lib/ui/views/support_view.dart +++ b/lib/ui/views/support_view.dart @@ -58,6 +58,10 @@ class SupportView extends StatelessWidget { return const Center(child: CircularProgressIndicator()); } + if (settingsProvider.settings == null) { + return const Center(child: Text('No se pudieron cargar los datos de soporte.')); + } + final settings = settingsProvider.settings!; return ListView(