Error fix : handle logout process in HomePage
This commit is contained in:
@@ -19,6 +19,7 @@ class TripBloc extends Bloc<TripEvent, TripState> {
|
|||||||
on<TripDeleteRequested>(_onDeleteRequested);
|
on<TripDeleteRequested>(_onDeleteRequested);
|
||||||
on<TripParticipantAddRequested>(_onParticipantAddRequested);
|
on<TripParticipantAddRequested>(_onParticipantAddRequested);
|
||||||
on<TripParticipantRemoveRequested>(_onParticipantRemoveRequested);
|
on<TripParticipantRemoveRequested>(_onParticipantRemoveRequested);
|
||||||
|
on<ResetTrips>(_onResetTrips); // NOUVEAU
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _onLoadRequested(
|
Future<void> _onLoadRequested(
|
||||||
@@ -108,6 +109,16 @@ class TripBloc extends Bloc<TripEvent, TripState> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Future<void> _onResetTrips(
|
||||||
|
ResetTrips event,
|
||||||
|
Emitter<TripState> emit,
|
||||||
|
) async {
|
||||||
|
await _tripsSubscription?.cancel();
|
||||||
|
_tripsSubscription = null;
|
||||||
|
emit(TripInitial());
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<void> close() {
|
Future<void> close() {
|
||||||
_tripsSubscription?.cancel();
|
_tripsSubscription?.cancel();
|
||||||
@@ -115,7 +126,6 @@ class TripBloc extends Bloc<TripEvent, TripState> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Événement interne pour les mises à jour du stream
|
|
||||||
class _TripUpdated extends TripEvent {
|
class _TripUpdated extends TripEvent {
|
||||||
final List<Trip> trips;
|
final List<Trip> trips;
|
||||||
|
|
||||||
|
|||||||
@@ -68,4 +68,12 @@ class TripParticipantRemoveRequested extends TripEvent {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
List<Object?> get props => [tripId, participantEmail];
|
List<Object?> get props => [tripId, participantEmail];
|
||||||
|
}
|
||||||
|
|
||||||
|
// NOUVEAU : Événement pour réinitialiser les trips
|
||||||
|
class ResetTrips extends TripEvent {
|
||||||
|
const ResetTrips();
|
||||||
|
|
||||||
|
@override
|
||||||
|
List<Object?> get props => [];
|
||||||
}
|
}
|
||||||
@@ -14,7 +14,9 @@ class UserUpdated extends UserEvent {
|
|||||||
UserUpdated(this.userData);
|
UserUpdated(this.userData);
|
||||||
}
|
}
|
||||||
|
|
||||||
class UserLoggedOut extends UserEvent {}
|
class UserLoggedOut extends UserEvent {
|
||||||
|
UserLoggedOut();
|
||||||
|
}
|
||||||
class LoadUser extends UserEvent {
|
class LoadUser extends UserEvent {
|
||||||
final String userId;
|
final String userId;
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ import '../blocs/user/user_bloc.dart';
|
|||||||
import '../blocs/user/user_event.dart';
|
import '../blocs/user/user_event.dart';
|
||||||
import '../blocs/auth/auth_bloc.dart';
|
import '../blocs/auth/auth_bloc.dart';
|
||||||
import '../blocs/auth/auth_event.dart';
|
import '../blocs/auth/auth_event.dart';
|
||||||
|
import '../blocs/trip/trip_bloc.dart';
|
||||||
|
import '../blocs/trip/trip_event.dart';
|
||||||
|
|
||||||
class HomePage extends StatefulWidget {
|
class HomePage extends StatefulWidget {
|
||||||
const HomePage({super.key});
|
const HomePage({super.key});
|
||||||
@@ -73,6 +75,61 @@ class _HomePageState extends State<HomePage> {
|
|||||||
Navigator.pop(context);
|
Navigator.pop(context);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Nouvelle méthode pour gérer la déconnexion proprement
|
||||||
|
Future<void> _handleLogout() async {
|
||||||
|
// Fermer le drawer
|
||||||
|
Navigator.pop(context);
|
||||||
|
|
||||||
|
// Afficher un dialog de confirmation
|
||||||
|
final shouldLogout = await showDialog<bool>(
|
||||||
|
context: context,
|
||||||
|
builder: (BuildContext dialogContext) {
|
||||||
|
return AlertDialog(
|
||||||
|
title: const Text('Déconnexion'),
|
||||||
|
content: const Text('Êtes-vous sûr de vouloir vous déconnecter ?'),
|
||||||
|
actions: [
|
||||||
|
TextButton(
|
||||||
|
onPressed: () => Navigator.pop(dialogContext, false),
|
||||||
|
child: const Text('Annuler'),
|
||||||
|
),
|
||||||
|
ElevatedButton(
|
||||||
|
onPressed: () => Navigator.pop(dialogContext, true),
|
||||||
|
style: ElevatedButton.styleFrom(
|
||||||
|
backgroundColor: Colors.red,
|
||||||
|
foregroundColor: Colors.white,
|
||||||
|
),
|
||||||
|
child: const Text('Déconnexion'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
if (shouldLogout != true || !mounted) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
context.read<TripBloc>().add(ResetTrips());
|
||||||
|
context.read<UserBloc>().add(UserLoggedOut());
|
||||||
|
_pageCache.clear();
|
||||||
|
context.read<AuthBloc>().add(AuthSignOutRequested());
|
||||||
|
await Future.delayed(const Duration(milliseconds: 150));
|
||||||
|
if (!mounted) return;
|
||||||
|
Navigator.of(context).pushNamedAndRemoveUntil(
|
||||||
|
'/login',
|
||||||
|
(Route<dynamic> route) => false, // Supprime TOUTES les routes
|
||||||
|
);
|
||||||
|
} catch (e) {
|
||||||
|
if (mounted) {
|
||||||
|
ScaffoldMessenger.of(context).showSnackBar(
|
||||||
|
SnackBar(
|
||||||
|
content: Text('Erreur lors de la déconnexion: $e'),
|
||||||
|
backgroundColor: Colors.red,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
@@ -103,11 +160,7 @@ class _HomePageState extends State<HomePage> {
|
|||||||
ListTile(
|
ListTile(
|
||||||
leading: const Icon(Icons.logout, color: Colors.red),
|
leading: const Icon(Icons.logout, color: Colors.red),
|
||||||
title: const Text("Déconnexion", style: TextStyle(color: Colors.red)),
|
title: const Text("Déconnexion", style: TextStyle(color: Colors.red)),
|
||||||
onTap: () {
|
onTap: _handleLogout, // Utiliser la nouvelle méthode
|
||||||
Navigator.pop(context);
|
|
||||||
context.read<AuthBloc>().add(AuthSignOutRequested());
|
|
||||||
Navigator.pushNamedAndRemoveUntil(context, '/login', (route) => false);
|
|
||||||
},
|
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
|||||||
Reference in New Issue
Block a user