Co-authored-by: MENDOZA BALLARDO GAEL RICARDO <gael-meb123@users.noreply.github.com>

Co-authored-by: Azareth-Tr <Azareth-Tr@users.noreply.github.com>
Co-authored-by: eddgranados12 <eddgranados12@users.noreply.github.com>

vistas de mockup

recolecta_app/lib/app/app.dart

@@ -4,6 +4,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 
 import '../core/network/api_client.dart';
+import '../core/models/auth_state.dart';
 import '../core/services/auth_controller.dart';
 import '../core/storage/secure_storage.dart';
 import 'bootstrap.dart' as bootstrap;
@@ -12,27 +13,28 @@ 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;
+  // ValueNotifier used as refreshListenable so GoRouter re-evaluates redirect
+  // without recreating the router (which would unmount widgets mid-request).
+  final notifier = ValueNotifier<int>(0);
+  ref.listen<AsyncValue<AuthState>>(authControllerProvider, (prev, next) {
+    notifier.value++;
+  });
+  ref.onDispose(notifier.dispose);
 
   return GoRouter(
-    initialLocation: '/home',
+    initialLocation: '/login',
+    refreshListenable: notifier,
     redirect: (context, state) {
+      final authSnapshot = ref.read(authControllerProvider);
+      final isAuthenticated =
+          authSnapshot.asData?.value.isAuthenticated ?? false;
       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';
-      }
+      final isAuthRoute =
+          location == '/login' || location == '/register';
 
+      if (authSnapshot.isLoading) return null;
+      if (!isAuthenticated && !isAuthRoute) return '/login';
+      if (isAuthenticated && isAuthRoute) return '/home';
       return null;
     },
     routes: <RouteBase>[

recolecta_app/lib/core/network/api_client.dart

@@ -1,4 +1,5 @@
 import 'package:dio/dio.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
@@ -6,7 +7,10 @@ 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 defaultBaseUrl = kIsWeb
+      ? 'http://localhost:8000'
+      : 'http://10.0.2.2:8000';
+  final baseUrl = dotenv.env['API_BASE_URL'] ?? defaultBaseUrl;
   final secureStorage = ref.read(secureStorageProvider);
 
   final dio = Dio(

recolecta_app/lib/core/services/auth_controller.dart

@@ -24,16 +24,22 @@ class AuthController extends AsyncNotifier<AuthState> {
 
   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,
-      ),
-    );
+
+    try {
+      final session = await ref
+          .read(authServiceProvider)
+          .login(email: email, password: password);
+      state = AsyncData(
+        AuthState.authenticated(
+          token: session.token,
+          userRole: session.userRole,
+          routeId: session.routeId,
+        ),
+      );
+    } catch (error, stackTrace) {
+      state = AsyncError<AuthState>(error, stackTrace);
+      rethrow;
+    }
   }
 
   Future<void> register({
@@ -42,16 +48,22 @@ class AuthController extends AsyncNotifier<AuthState> {
     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,
-      ),
-    );
+
+    try {
+      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,
+        ),
+      );
+    } catch (error, stackTrace) {
+      state = AsyncError<AuthState>(error, stackTrace);
+      rethrow;
+    }
   }
 
   Future<void> logout() async {