fix: allow removing session on broadcast and add bool to AuthState

supabase · Sep 10, 2024 · 8cb8735 · 8cb8735
1 parent 40c29e1
commit 8cb8735
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/packages/gotrue/lib/src/gotrue_client.dart b/packages/gotrue/lib/src/gotrue_client.dart
@@ -1173,9 +1173,12 @@ class GoTrueClient {
             session = Session.fromJson(messageEvent['session']);
           } catch (e) {
             // ignore
+            return;
           }
           if (session != null) {
             _saveSession(session);
+          } else {
+            _removeSession();
           }
           notifyAllSubscribers(event, session: session, broadcast: false);
         }
@@ -1244,19 +1247,23 @@ class GoTrueClient {
   }
 
   /// For internal use only.
+  ///
+  /// [broadcast] is used to determine if the event should be broadcasted to
+  /// other tabs.
   @internal
   void notifyAllSubscribers(
     AuthChangeEvent event, {
     Session? session,
     bool broadcast = true,
   }) {
+    session ??= currentSession;
     if (broadcast && event != AuthChangeEvent.initialSession) {
       _broadcastChannel?.postMessage({
         'event': event.jsName,
         'session': session?.toJson(),
       });
     }
-    final state = AuthState(event, session ?? currentSession);
+    final state = AuthState(event, session, fromBroadcast: !broadcast);
     _onAuthStateChangeController.add(state);
     _onAuthStateChangeControllerSync.add(state);
   }

diff --git a/packages/gotrue/lib/src/types/auth_state.dart b/packages/gotrue/lib/src/types/auth_state.dart
@@ -4,6 +4,12 @@ import 'package:gotrue/src/types/session.dart';
 class AuthState {
   final AuthChangeEvent event;
   final Session? session;
+  final bool fromBroadcast;
 
-  AuthState(this.event, this.session);
+  AuthState(this.event, this.session, {this.fromBroadcast = false});
+
+  @override
+  String toString() {
+    return 'AuthState{event: $event, session: $session, fromBroadcast: $fromBroadcast}';
+  }
 }