bLOQUE p1 BACKEND Y SEGURIDAD, AUTENTICACION CON SUPABASE. jwt. RBAC CRUD

recolecta_app/lib/app/app.dart

@@ -1,69 +1,61 @@
 import 'package:cached_network_image/cached_network_image.dart';
-import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:go_router/go_router.dart';
-import 'package:firebase_core/firebase_core.dart';
-import 'package:firebase_messaging/firebase_messaging.dart';
-import '../firebase_options.dart';
 
-final bootstrapProvider = FutureProvider<void>((ref) async {
-  await dotenv.load(fileName: 'assets/.env');
-
-  // Inicializar Firebase (si hay DefaultFirebaseOptions, úsalas; sino, intenta initializeApp() y espera que haya google-services/Info.plist)
-  final FirebaseOptions? options = DefaultFirebaseOptions.currentPlatform;
-  if (options != null) {
-    await Firebase.initializeApp(options: options);
-  } else {
-    await Firebase.initializeApp();
-  }
-
-  // Registrar handler para mensajes en background
-  FirebaseMessaging.onBackgroundMessage(_firebaseMessagingBackgroundHandler);
-});
-
-// Handler top-level requerido por FCM
-Future<void> _firebaseMessagingBackgroundHandler(RemoteMessage message) async {
-  // Asegurar Firebase inicializado en background isolate
-  try {
-    await Firebase.initializeApp();
-  } catch (_) {
-    // ignore if already initialized
-  }
-  // Aquí puedes procesar y guardar la notificación si hace falta
-  debugPrint(
-    'FCM background message received: ${message.messageId} | data: ${message.data}',
-  );
-}
-
-final apiClientProvider = Provider<Dio>((ref) {
-  final baseUrl = dotenv.env['API_BASE_URL'] ?? 'http://10.0.2.2:8000';
-
-  return Dio(
-    BaseOptions(
-      baseUrl: baseUrl,
-      connectTimeout: const Duration(seconds: 15),
-      receiveTimeout: const Duration(seconds: 15),
-      headers: const <String, dynamic>{'Content-Type': 'application/json'},
-    ),
-  );
-});
-
-final secureStorageProvider = Provider<FlutterSecureStorage>((ref) {
-  return const FlutterSecureStorage();
-});
+import '../core/network/api_client.dart';
+import '../core/services/auth_controller.dart';
+import '../core/storage/secure_storage.dart';
+import 'bootstrap.dart' as bootstrap;
+import '../features/auth/login_page.dart';
+import '../features/auth/register_page.dart';
+import '../features/addresses/new_address_page.dart';
 
 final routerProvider = Provider<GoRouter>((ref) {
+  final authSnapshot = ref.watch(authControllerProvider);
+  final isAuthenticated = authSnapshot.asData?.value.isAuthenticated ?? false;
+
   return GoRouter(
     initialLocation: '/home',
+    redirect: (context, state) {
+      final location = state.matchedLocation;
+      final isAuthRoute = location == '/login' || location == '/register';
+
+      if (authSnapshot.isLoading) {
+        return location == '/login' ? null : '/login';
+      }
+
+      if (!isAuthenticated) {
+        return isAuthRoute ? null : '/login';
+      }
+
+      if (isAuthenticated && isAuthRoute) {
+        return '/home';
+      }
+
+      return null;
+    },
     routes: <RouteBase>[
+      GoRoute(
+        path: '/login',
+        name: 'login',
+        builder: (context, state) => const LoginPage(),
+      ),
+      GoRoute(
+        path: '/register',
+        name: 'register',
+        builder: (context, state) => const RegisterPage(),
+      ),
       GoRoute(
         path: '/home',
         name: 'home',
         builder: (context, state) => const HomePage(),
       ),
+      GoRoute(
+        path: '/addresses/new',
+        name: 'addresses-new',
+        builder: (context, state) => const NewAddressPage(),
+      ),
       GoRoute(
         path: '/status',
         name: 'status',
@@ -78,9 +70,9 @@ class RecolectaApp extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final bootstrap = ref.watch(bootstrapProvider);
+    final bootstrapState = ref.watch(bootstrap.bootstrapProvider);
 
-    return bootstrap.when(
+    return bootstrapState.when(
       loading: () => const MaterialApp(
         debugShowCheckedModeBanner: false,
         home: BootstrapLoadingPage(),
@@ -154,11 +146,24 @@ class HomePage extends ConsumerWidget {
     final dio = ref.read(apiClientProvider);
     final storage = ref.read(secureStorageProvider);
     final baseUrl = dio.options.baseUrl;
+    final authState = ref.watch(authControllerProvider);
 
     return Scaffold(
       appBar: AppBar(
         title: const Text('Recolecta'),
         actions: [
+          IconButton(
+            onPressed: authState.isLoading
+                ? null
+                : () async {
+                    await ref.read(authControllerProvider.notifier).logout();
+                    if (context.mounted) {
+                      context.go('/login');
+                    }
+                  },
+            icon: const Icon(Icons.logout),
+            tooltip: 'Salir',
+          ),
           IconButton(
             onPressed: () => context.goNamed('status'),
             icon: const Icon(Icons.route),
@@ -179,6 +184,11 @@ class HomePage extends ConsumerWidget {
               'La app ya carga .env, Riverpod y GoRouter para la base del MVP.',
               style: Theme.of(context).textTheme.bodyLarge,
             ),
+            const SizedBox(height: 16),
+            TextButton(
+              onPressed: () => context.go('/addresses/new'),
+              child: const Text('Agregar domicilio'),
+            ),
             const SizedBox(height: 24),
             _InfoCard(title: 'API base URL', value: baseUrl, icon: Icons.cloud),
             const SizedBox(height: 16),

recolecta_app/lib/app/bootstrap.dart

@@ -0,0 +1,36 @@
+import 'package:firebase_core/firebase_core.dart';
+import 'package:firebase_messaging/firebase_messaging.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../firebase_options.dart';
+
+final bootstrapProvider = FutureProvider<void>((ref) async {
+  await dotenv.load(fileName: 'assets/.env');
+  await _initializeFirebase();
+  FirebaseMessaging.onBackgroundMessage(_firebaseMessagingBackgroundHandler);
+});
+
+Future<void> _initializeFirebase() async {
+  try {
+    await Firebase.initializeApp(
+      options: DefaultFirebaseOptions.currentPlatform,
+    );
+  } on UnsupportedError {
+    await Firebase.initializeApp();
+  }
+}
+
+@pragma('vm:entry-point')
+Future<void> _firebaseMessagingBackgroundHandler(RemoteMessage message) async {
+  try {
+    await _initializeFirebase();
+  } catch (_) {
+    // Ignore reinitialization errors in the background isolate.
+  }
+
+  debugPrint(
+    'FCM background message received: ${message.messageId} | data: ${message.data}',
+  );
+}

recolecta_app/lib/core/constants/auth_constants.dart

@@ -0,0 +1,3 @@
+const String authTokenStorageKey = 'auth_jwt';
+const String authUserRoleStorageKey = 'auth_user_role';
+const String authRouteIdStorageKey = 'auth_route_id';

recolecta_app/lib/core/models/address.dart

@@ -0,0 +1,22 @@
+import 'colonia.dart';
+
+class AddressModel {
+  const AddressModel({
+    required this.label,
+    required this.street,
+    required this.colonia,
+  });
+
+  final String label;
+  final String street;
+  final Colonia colonia;
+
+  Map<String, dynamic> toJson() {
+    return <String, dynamic>{
+      'label': label,
+      'calle': street,
+      'colonia': colonia.nombre,
+      'route_id': colonia.routeId,
+    };
+  }
+}

recolecta_app/lib/core/models/auth_session.dart

@@ -0,0 +1,11 @@
+class AuthSession {
+  const AuthSession({required this.token, this.userRole, this.routeId});
+
+  final String token;
+  final String? userRole;
+  final String? routeId;
+
+  bool get isCitizen => userRole == 'citizen';
+  bool get isDriver => userRole == 'driver';
+  bool get isAdmin => userRole == 'admin';
+}

recolecta_app/lib/core/models/auth_state.dart

@@ -0,0 +1,28 @@
+class AuthState {
+  const AuthState({
+    required this.isAuthenticated,
+    this.token,
+    this.userRole,
+    this.routeId,
+  });
+
+  const AuthState.unauthenticated()
+      : isAuthenticated = false,
+        token = null,
+        userRole = null,
+        routeId = null;
+
+  const AuthState.authenticated({
+    required String token,
+    String? userRole,
+    String? routeId,
+  })  : isAuthenticated = true,
+        token = token,
+        userRole = userRole,
+        routeId = routeId;
+
+  final bool isAuthenticated;
+  final String? token;
+  final String? userRole;
+  final String? routeId;
+}

recolecta_app/lib/core/models/colonia.dart

@@ -0,0 +1,37 @@
+class Colonia {
+  const Colonia({
+    required this.id,
+    required this.nombre,
+    this.routeId,
+    this.horarioEstimado,
+    this.turno,
+  });
+
+  final String id;
+  final String nombre;
+  final String? routeId;
+  final String? horarioEstimado;
+  final String? turno;
+
+  factory Colonia.fromJson(Map<String, dynamic> json) {
+    final rawId =
+        json['id'] ??
+        json['routeId'] ??
+        json['route_id'] ??
+        json['nombre'] ??
+        json['name'];
+    final rawNombre = json['nombre'] ?? json['name'] ?? rawId;
+
+    return Colonia(
+      id: rawId?.toString() ?? rawNombre?.toString() ?? '',
+      nombre: rawNombre?.toString() ?? '',
+      routeId: (json['routeId'] ?? json['route_id'])?.toString(),
+      horarioEstimado:
+          (json['horario_estimado'] ??
+                  json['horarioEstimado'] ??
+                  json['schedule'])
+              ?.toString(),
+      turno: (json['turno'] ?? json['shift'])?.toString(),
+    );
+  }
+}

recolecta_app/lib/core/network/api_client.dart

@@ -0,0 +1,34 @@
+import 'package:dio/dio.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../constants/auth_constants.dart';
+import '../storage/secure_storage.dart';
+
+final apiClientProvider = Provider<Dio>((ref) {
+  final baseUrl = dotenv.env['API_BASE_URL'] ?? 'http://10.0.2.2:8000';
+  final secureStorage = ref.read(secureStorageProvider);
+
+  final dio = Dio(
+    BaseOptions(
+      baseUrl: baseUrl,
+      connectTimeout: const Duration(seconds: 15),
+      receiveTimeout: const Duration(seconds: 15),
+      headers: const <String, dynamic>{'Content-Type': 'application/json'},
+    ),
+  );
+
+  dio.interceptors.add(
+    InterceptorsWrapper(
+      onRequest: (options, handler) async {
+        final token = await secureStorage.read(key: authTokenStorageKey);
+        if (token != null && token.isNotEmpty) {
+          options.headers['Authorization'] = 'Bearer $token';
+        }
+        handler.next(options);
+      },
+    ),
+  );
+
+  return dio;
+});

recolecta_app/lib/core/services/auth_controller.dart

@@ -0,0 +1,61 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../models/auth_state.dart';
+import 'auth_service.dart';
+
+final authControllerProvider = AsyncNotifierProvider<AuthController, AuthState>(
+  AuthController.new,
+);
+
+class AuthController extends AsyncNotifier<AuthState> {
+  @override
+  Future<AuthState> build() async {
+    final session = await ref.read(authServiceProvider).restoreSession();
+    if (session == null) {
+      return const AuthState.unauthenticated();
+    }
+
+    return AuthState.authenticated(
+      token: session.token,
+      userRole: session.userRole,
+      routeId: session.routeId,
+    );
+  }
+
+  Future<void> login({required String email, required String password}) async {
+    state = const AsyncLoading<AuthState>();
+    final session = await ref
+        .read(authServiceProvider)
+        .login(email: email, password: password);
+    state = AsyncData(
+      AuthState.authenticated(
+        token: session.token,
+        userRole: session.userRole,
+        routeId: session.routeId,
+      ),
+    );
+  }
+
+  Future<void> register({
+    required String email,
+    required String phone,
+    required String password,
+  }) async {
+    state = const AsyncLoading<AuthState>();
+    final session = await ref
+        .read(authServiceProvider)
+        .register(email: email, phone: phone, password: password);
+    state = AsyncData(
+      AuthState.authenticated(
+        token: session.token,
+        userRole: session.userRole,
+        routeId: session.routeId,
+      ),
+    );
+  }
+
+  Future<void> logout() async {
+    await ref.read(authServiceProvider).logout();
+    state = const AsyncData(AuthState.unauthenticated());
+  }
+}

recolecta_app/lib/core/services/auth_service.dart

@@ -0,0 +1,149 @@
+import 'package:dio/dio.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../constants/auth_constants.dart';
+import '../models/auth_session.dart';
+import '../network/api_client.dart';
+import '../storage/secure_storage.dart';
+
+final authServiceProvider = Provider<AuthService>((ref) {
+  return AuthService(
+    apiClient: ref.read(apiClientProvider),
+    secureStorage: ref.read(secureStorageProvider),
+  );
+});
+
+class AuthService {
+  AuthService({
+    required Dio apiClient,
+    required FlutterSecureStorage secureStorage,
+  }) : _apiClient = apiClient,
+       _secureStorage = secureStorage;
+
+  final Dio _apiClient;
+  final FlutterSecureStorage _secureStorage;
+
+  Future<AuthSession?> restoreSession() async {
+    final token = await _secureStorage.read(key: authTokenStorageKey);
+    if (token == null || token.isEmpty) {
+      return null;
+    }
+
+    return AuthSession(
+      token: token,
+      userRole: await _secureStorage.read(key: authUserRoleStorageKey),
+      routeId: await _secureStorage.read(key: authRouteIdStorageKey),
+    );
+  }
+
+  Future<AuthSession> register({
+    required String email,
+    required String phone,
+    required String password,
+  }) {
+    return _authenticate(
+      path: '/auth/register',
+      payload: <String, dynamic>{
+        'email': email,
+        'phone': phone,
+        'password': password,
+      },
+    );
+  }
+
+  Future<AuthSession> login({required String email, required String password}) {
+    return _authenticate(
+      path: '/auth/login',
+      payload: <String, dynamic>{'email': email, 'password': password},
+    );
+  }
+
+  Future<void> logout() {
+    return Future.wait(<Future<void>>[
+      _secureStorage.delete(key: authTokenStorageKey),
+      _secureStorage.delete(key: authUserRoleStorageKey),
+      _secureStorage.delete(key: authRouteIdStorageKey),
+    ]).then((_) {});
+  }
+
+  Future<AuthSession> _authenticate({
+    required String path,
+    required Map<String, dynamic> payload,
+  }) async {
+    final response = await _apiClient.post<Map<String, dynamic>>(
+      path,
+      data: payload,
+    );
+
+    final session = _extractSession(response.data);
+    if (session == null || session.token.isEmpty) {
+      throw StateError('El backend no devolvió un JWT.');
+    }
+
+    await _secureStorage.write(key: authTokenStorageKey, value: session.token);
+    await _writeOptionalString(authUserRoleStorageKey, session.userRole);
+    await _writeOptionalString(authRouteIdStorageKey, session.routeId);
+    return session;
+  }
+
+  Future<void> _writeOptionalString(String key, String? value) async {
+    if (value == null || value.isEmpty) {
+      await _secureStorage.delete(key: key);
+      return;
+    }
+
+    await _secureStorage.write(key: key, value: value);
+  }
+
+  AuthSession? _extractSession(Map<String, dynamic>? data) {
+    if (data == null) {
+      return null;
+    }
+
+    final dataMap = data['data'] is Map<String, dynamic>
+        ? data['data'] as Map<String, dynamic>
+        : data;
+
+    final token = _pickString(<dynamic>[
+      dataMap['access_token'],
+      dataMap['token'],
+      dataMap['jwt'],
+      data['access_token'],
+      data['token'],
+      data['jwt'],
+    ]);
+
+    if (token == null || token.isEmpty) {
+      return null;
+    }
+
+    return AuthSession(
+      token: token,
+      userRole: _pickString(<dynamic>[
+        dataMap['userRole'],
+        dataMap['user_role'],
+        dataMap['role'],
+        data['userRole'],
+        data['user_role'],
+        data['role'],
+      ]),
+      routeId: _pickString(<dynamic>[
+        dataMap['routeId'],
+        dataMap['route_id'],
+        data['routeId'],
+        data['route_id'],
+      ]),
+    );
+  }
+
+  String? _pickString(Iterable<dynamic> candidates) {
+    for (final candidate in candidates) {
+      if (candidate is String && candidate.isNotEmpty) {
+        return candidate;
+      }
+    }
+
+    return null;
+  }
+}

recolecta_app/lib/core/services/colonias_service.dart

@@ -0,0 +1,39 @@
+import 'package:dio/dio.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../models/colonia.dart';
+import '../network/api_client.dart';
+
+final coloniasServiceProvider = Provider<ColoniasService>((ref) {
+  return ColoniasService(ref.read(apiClientProvider));
+});
+
+class ColoniasService {
+  ColoniasService(this._apiClient);
+
+  final Dio _apiClient;
+
+  Future<List<Colonia>> getColonias() async {
+    final response = await _apiClient.get<dynamic>('/colonias');
+    final data = response.data;
+
+    if (data == null) {
+      return const <Colonia>[];
+    }
+
+    final rawList = switch (data) {
+      List<dynamic> value => value,
+      Map<String, dynamic> value when value['data'] is List<dynamic> =>
+        value['data'] as List<dynamic>,
+      Map<String, dynamic> value when value['colonias'] is List<dynamic> =>
+        value['colonias'] as List<dynamic>,
+      _ => const <dynamic>[],
+    };
+
+    return rawList
+        .whereType<Map<String, dynamic>>()
+        .map(Colonia.fromJson)
+        .where((colonia) => colonia.id.isNotEmpty && colonia.nombre.isNotEmpty)
+        .toList(growable: false);
+  }
+}

recolecta_app/lib/core/storage/secure_storage.dart

@@ -0,0 +1,6 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+
+final secureStorageProvider = Provider<FlutterSecureStorage>((ref) {
+  return const FlutterSecureStorage();
+});

recolecta_app/lib/features/addresses/colonias_provider.dart

@@ -0,0 +1,8 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../../core/models/colonia.dart';
+import '../../core/services/colonias_service.dart';
+
+final coloniasProvider = FutureProvider<List<Colonia>>((ref) async {
+  return ref.read(coloniasServiceProvider).getColonias();
+});

recolecta_app/lib/features/addresses/colonias_selector.dart

@@ -0,0 +1,120 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../../core/models/colonia.dart';
+import 'colonias_provider.dart';
+
+class ColoniasSelector extends ConsumerWidget {
+  const ColoniasSelector({
+    super.key,
+    required this.onChanged,
+    this.initialValue,
+    this.labelText = 'Colonia',
+  });
+
+  final ValueChanged<Colonia> onChanged;
+  final Colonia? initialValue;
+  final String labelText;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final coloniasAsync = ref.watch(coloniasProvider);
+
+    return coloniasAsync.when(
+      loading: () => const Card(
+        child: Padding(
+          padding: EdgeInsets.all(16),
+          child: Row(
+            children: [
+              SizedBox(
+                width: 18,
+                height: 18,
+                child: CircularProgressIndicator(strokeWidth: 2),
+              ),
+              SizedBox(width: 12),
+              Text('Cargando colonias...'),
+            ],
+          ),
+        ),
+      ),
+      error: (error, stackTrace) => _StateCard(
+        icon: Icons.error_outline,
+        title: 'No se pudieron cargar las colonias',
+        message: error.toString(),
+        actionLabel: 'Reintentar',
+        onAction: () => ref.invalidate(coloniasProvider),
+      ),
+      data: (colonias) {
+        if (colonias.isEmpty) {
+          return const _StateCard(
+            icon: Icons.inbox_outlined,
+            title: 'Sin colonias disponibles',
+            message: 'El backend no devolvió colonias todavía.',
+          );
+        }
+
+        return DropdownButtonFormField<Colonia>(
+          value: initialValue,
+          decoration: InputDecoration(labelText: labelText),
+          items: colonias
+              .map(
+                (colonia) => DropdownMenuItem<Colonia>(
+                  value: colonia,
+                  child: Text(
+                    colonia.horarioEstimado == null ||
+                            colonia.horarioEstimado!.isEmpty
+                        ? colonia.nombre
+                        : '${colonia.nombre} · ${colonia.horarioEstimado}',
+                  ),
+                ),
+              )
+              .toList(growable: false),
+          onChanged: (value) {
+            if (value != null) {
+              onChanged(value);
+            }
+          },
+        );
+      },
+    );
+  }
+}
+
+class _StateCard extends StatelessWidget {
+  const _StateCard({
+    required this.icon,
+    required this.title,
+    required this.message,
+    this.actionLabel,
+    this.onAction,
+  });
+
+  final IconData icon;
+  final String title;
+  final String message;
+  final String? actionLabel;
+  final VoidCallback? onAction;
+
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      child: Padding(
+        padding: const EdgeInsets.all(16),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Icon(icon),
+            const SizedBox(height: 12),
+            Text(title, style: Theme.of(context).textTheme.titleMedium),
+            const SizedBox(height: 6),
+            Text(message),
+            if (actionLabel != null && onAction != null) ...[
+              const SizedBox(height: 12),
+              TextButton(onPressed: onAction, child: Text(actionLabel!)),
+            ],
+          ],
+        ),
+      ),
+    );
+  }
+}

recolecta_app/lib/features/addresses/new_address_page.dart

@@ -0,0 +1,110 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../../core/models/address.dart';
+import '../../core/models/colonia.dart';
+import 'colonias_selector.dart';
+
+class NewAddressPage extends ConsumerStatefulWidget {
+  const NewAddressPage({super.key});
+
+  @override
+  ConsumerState<NewAddressPage> createState() => _NewAddressPageState();
+}
+
+class _NewAddressPageState extends ConsumerState<NewAddressPage> {
+  final _formKey = GlobalKey<FormState>();
+  final _labelController = TextEditingController();
+  final _streetController = TextEditingController();
+  Colonia? _selectedColonia;
+
+  @override
+  void dispose() {
+    _labelController.dispose();
+    _streetController.dispose();
+    super.dispose();
+  }
+
+  void _saveAddress() {
+    if (!(_formKey.currentState?.validate() ?? false)) {
+      return;
+    }
+    if (_selectedColonia == null) {
+      ScaffoldMessenger.of(
+        context,
+      ).showSnackBar(const SnackBar(content: Text('Selecciona una colonia')));
+      return;
+    }
+
+    final address = AddressModel(
+      label: _labelController.text.trim(),
+      street: _streetController.text.trim(),
+      colonia: _selectedColonia!,
+    );
+
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(content: Text('Domicilio listo: ${address.toJson()}')),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(title: const Text('Nuevo domicilio')),
+      body: SafeArea(
+        child: ListView(
+          padding: const EdgeInsets.all(24),
+          children: [
+            Form(
+              key: _formKey,
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.stretch,
+                children: [
+                  TextFormField(
+                    controller: _labelController,
+                    decoration: const InputDecoration(
+                      labelText: 'Etiqueta',
+                      hintText: 'Casa, trabajo, etc.',
+                    ),
+                    validator: (value) =>
+                        (value == null || value.trim().isEmpty)
+                        ? 'Ingresa una etiqueta'
+                        : null,
+                  ),
+                  const SizedBox(height: 16),
+                  TextFormField(
+                    controller: _streetController,
+                    decoration: const InputDecoration(
+                      labelText: 'Calle',
+                      hintText: 'Av. Principal 123',
+                    ),
+                    validator: (value) =>
+                        (value == null || value.trim().isEmpty)
+                        ? 'Ingresa la calle'
+                        : null,
+                  ),
+                  const SizedBox(height: 16),
+                  ColoniasSelector(
+                    labelText: 'Colonia',
+                    initialValue: _selectedColonia,
+                    onChanged: (colonia) {
+                      setState(() => _selectedColonia = colonia);
+                    },
+                  ),
+                  const SizedBox(height: 24),
+                  SizedBox(
+                    height: 52,
+                    child: FilledButton(
+                      onPressed: _saveAddress,
+                      child: const Text('Guardar domicilio'),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

recolecta_app/lib/features/auth/login_page.dart

@@ -0,0 +1,164 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:go_router/go_router.dart';
+
+import '../../core/services/auth_controller.dart';
+
+class LoginPage extends ConsumerStatefulWidget {
+  const LoginPage({super.key});
+
+  @override
+  ConsumerState<LoginPage> createState() => _LoginPageState();
+}
+
+class _LoginPageState extends ConsumerState<LoginPage> {
+  final _formKey = GlobalKey<FormState>();
+  final _emailController = TextEditingController();
+  final _passwordController = TextEditingController();
+  bool _obscurePassword = true;
+
+  @override
+  void dispose() {
+    _emailController.dispose();
+    _passwordController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _submit() async {
+    if (!(_formKey.currentState?.validate() ?? false)) {
+      return;
+    }
+
+    try {
+      await ref
+          .read(authControllerProvider.notifier)
+          .login(
+            email: _emailController.text.trim(),
+            password: _passwordController.text,
+          );
+      if (!mounted) {
+        return;
+      }
+      final authState = ref.read(authControllerProvider).asData?.value;
+      if (authState?.userRole == 'admin') {
+        context.go('/admin');
+        return;
+      }
+      if (authState?.userRole == 'driver') {
+        context.go('/driver');
+        return;
+      }
+      final routeId = authState?.routeId;
+      if (routeId != null && routeId.isNotEmpty) {
+        context.go('/home?routeId=$routeId');
+        return;
+      }
+      context.go('/home');
+    } catch (error) {
+      if (!mounted) {
+        return;
+      }
+      ScaffoldMessenger.of(
+        context,
+      ).showSnackBar(SnackBar(content: Text(error.toString())));
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final authState = ref.watch(authControllerProvider);
+    final loading = authState.isLoading;
+
+    return Scaffold(
+      body: SafeArea(
+        child: Center(
+          child: SingleChildScrollView(
+            padding: const EdgeInsets.all(24),
+            child: ConstrainedBox(
+              constraints: const BoxConstraints(maxWidth: 420),
+              child: Form(
+                key: _formKey,
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  children: [
+                    const SizedBox(height: 12),
+                    const Icon(Icons.delete_outline_rounded, size: 54),
+                    const SizedBox(height: 16),
+                    Text(
+                      'Recolecta',
+                      textAlign: TextAlign.center,
+                      style: Theme.of(context).textTheme.headlineMedium
+                          ?.copyWith(fontWeight: FontWeight.w700),
+                    ),
+                    const SizedBox(height: 8),
+                    Text(
+                      'Accede para ver solo tu ruta asignada.',
+                      textAlign: TextAlign.center,
+                      style: Theme.of(context).textTheme.bodyMedium,
+                    ),
+                    const SizedBox(height: 28),
+                    TextFormField(
+                      controller: _emailController,
+                      keyboardType: TextInputType.emailAddress,
+                      decoration: const InputDecoration(
+                        labelText: 'Correo electrónico',
+                        hintText: 'tu@correo.com',
+                      ),
+                      validator: (value) =>
+                          (value == null || value.trim().isEmpty)
+                          ? 'Ingresa tu correo'
+                          : null,
+                    ),
+                    const SizedBox(height: 16),
+                    TextFormField(
+                      controller: _passwordController,
+                      obscureText: _obscurePassword,
+                      decoration: InputDecoration(
+                        labelText: 'Contraseña',
+                        hintText: '••••••••',
+                        suffixIcon: IconButton(
+                          onPressed: () => setState(
+                            () => _obscurePassword = !_obscurePassword,
+                          ),
+                          icon: Icon(
+                            _obscurePassword
+                                ? Icons.visibility_outlined
+                                : Icons.visibility_off_outlined,
+                          ),
+                        ),
+                      ),
+                      validator: (value) => (value == null || value.length < 6)
+                          ? 'La contraseña debe tener al menos 6 caracteres'
+                          : null,
+                    ),
+                    const SizedBox(height: 24),
+                    SizedBox(
+                      height: 52,
+                      child: FilledButton(
+                        onPressed: loading ? null : _submit,
+                        child: loading
+                            ? const SizedBox(
+                                width: 20,
+                                height: 20,
+                                child: CircularProgressIndicator(
+                                  strokeWidth: 2,
+                                ),
+                              )
+                            : const Text('Entrar'),
+                      ),
+                    ),
+                    const SizedBox(height: 16),
+                    TextButton(
+                      onPressed: () => context.go('/register'),
+                      child: const Text('Crear cuenta'),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

recolecta_app/lib/features/auth/register_page.dart

@@ -0,0 +1,200 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:go_router/go_router.dart';
+
+import '../../core/services/auth_controller.dart';
+
+class RegisterPage extends ConsumerStatefulWidget {
+  const RegisterPage({super.key});
+
+  @override
+  ConsumerState<RegisterPage> createState() => _RegisterPageState();
+}
+
+class _RegisterPageState extends ConsumerState<RegisterPage> {
+  final _formKey = GlobalKey<FormState>();
+  final _emailController = TextEditingController();
+  final _phoneController = TextEditingController();
+  final _passwordController = TextEditingController();
+  final _confirmPasswordController = TextEditingController();
+  bool _obscurePassword = true;
+
+  @override
+  void dispose() {
+    _emailController.dispose();
+    _phoneController.dispose();
+    _passwordController.dispose();
+    _confirmPasswordController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _submit() async {
+    if (!(_formKey.currentState?.validate() ?? false)) {
+      return;
+    }
+
+    try {
+      await ref
+          .read(authControllerProvider.notifier)
+          .register(
+            email: _emailController.text.trim(),
+            phone: _phoneController.text.trim(),
+            password: _passwordController.text,
+          );
+      if (!mounted) {
+        return;
+      }
+      final authState = ref.read(authControllerProvider).asData?.value;
+      if (authState?.userRole == 'admin') {
+        context.go('/admin');
+        return;
+      }
+      if (authState?.userRole == 'driver') {
+        context.go('/driver');
+        return;
+      }
+      final routeId = authState?.routeId;
+      if (routeId != null && routeId.isNotEmpty) {
+        context.go('/home?routeId=$routeId');
+        return;
+      }
+      context.go('/home');
+    } catch (error) {
+      if (!mounted) {
+        return;
+      }
+      ScaffoldMessenger.of(
+        context,
+      ).showSnackBar(SnackBar(content: Text(error.toString())));
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final authState = ref.watch(authControllerProvider);
+    final loading = authState.isLoading;
+
+    return Scaffold(
+      body: SafeArea(
+        child: Center(
+          child: SingleChildScrollView(
+            padding: const EdgeInsets.all(24),
+            child: ConstrainedBox(
+              constraints: const BoxConstraints(maxWidth: 420),
+              child: Form(
+                key: _formKey,
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  children: [
+                    const SizedBox(height: 12),
+                    const Icon(Icons.person_add_alt_1_outlined, size: 54),
+                    const SizedBox(height: 16),
+                    Text(
+                      'Crear cuenta',
+                      textAlign: TextAlign.center,
+                      style: Theme.of(context).textTheme.headlineMedium
+                          ?.copyWith(fontWeight: FontWeight.w700),
+                    ),
+                    const SizedBox(height: 8),
+                    Text(
+                      'Registra tu correo, teléfono y contraseña para continuar.',
+                      textAlign: TextAlign.center,
+                      style: Theme.of(context).textTheme.bodyMedium,
+                    ),
+                    const SizedBox(height: 28),
+                    TextFormField(
+                      controller: _emailController,
+                      keyboardType: TextInputType.emailAddress,
+                      decoration: const InputDecoration(
+                        labelText: 'Correo electrónico',
+                        hintText: 'tu@correo.com',
+                      ),
+                      validator: (value) =>
+                          (value == null || value.trim().isEmpty)
+                          ? 'Ingresa tu correo'
+                          : null,
+                    ),
+                    const SizedBox(height: 16),
+                    TextFormField(
+                      controller: _phoneController,
+                      keyboardType: TextInputType.phone,
+                      decoration: const InputDecoration(
+                        labelText: 'Teléfono',
+                        hintText: '+52 461 123 4567',
+                      ),
+                      validator: (value) =>
+                          (value == null || value.trim().isEmpty)
+                          ? 'Ingresa tu teléfono'
+                          : null,
+                    ),
+                    const SizedBox(height: 16),
+                    TextFormField(
+                      controller: _passwordController,
+                      obscureText: _obscurePassword,
+                      decoration: InputDecoration(
+                        labelText: 'Contraseña',
+                        hintText: '••••••••',
+                        suffixIcon: IconButton(
+                          onPressed: () => setState(
+                            () => _obscurePassword = !_obscurePassword,
+                          ),
+                          icon: Icon(
+                            _obscurePassword
+                                ? Icons.visibility_outlined
+                                : Icons.visibility_off_outlined,
+                          ),
+                        ),
+                      ),
+                      validator: (value) => (value == null || value.length < 6)
+                          ? 'La contraseña debe tener al menos 6 caracteres'
+                          : null,
+                    ),
+                    const SizedBox(height: 16),
+                    TextFormField(
+                      controller: _confirmPasswordController,
+                      obscureText: _obscurePassword,
+                      decoration: const InputDecoration(
+                        labelText: 'Confirmar contraseña',
+                        hintText: '••••••••',
+                      ),
+                      validator: (value) {
+                        if (value == null || value.isEmpty) {
+                          return 'Confirma tu contraseña';
+                        }
+                        if (value != _passwordController.text) {
+                          return 'Las contraseñas no coinciden';
+                        }
+                        return null;
+                      },
+                    ),
+                    const SizedBox(height: 24),
+                    SizedBox(
+                      height: 52,
+                      child: FilledButton(
+                        onPressed: loading ? null : _submit,
+                        child: loading
+                            ? const SizedBox(
+                                width: 20,
+                                height: 20,
+                                child: CircularProgressIndicator(
+                                  strokeWidth: 2,
+                                ),
+                              )
+                            : const Text('Registrarme'),
+                      ),
+                    ),
+                    const SizedBox(height: 16),
+                    TextButton(
+                      onPressed: () => context.go('/login'),
+                      child: const Text('Ya tengo cuenta'),
+                    ),
+                  ],
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}