Fix meteor user after logout (#41)

* Set user to null after meteor.logout * Correct the test case
tanutapi · Oct 8, 2021 · 1176285 · 1176285
1 parent bcb7eca
commit 1176285
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/lib/src/meteor_client.dart b/lib/src/meteor_client.dart
@@ -75,8 +75,8 @@ class MeteorClient {
   final BehaviorSubject<String?> _userIdSubject = BehaviorSubject();
   late Stream<String?> _userIdStream;
 
-  final BehaviorSubject<Map<String, dynamic>> _userSubject = BehaviorSubject();
-  late Stream<Map<String, dynamic>> _userStream;
+  final BehaviorSubject<Map<String, dynamic>?> _userSubject = BehaviorSubject();
+  late Stream<Map<String, dynamic>?> _userStream;
 
   String? _userId;
   String? _token;
@@ -91,7 +91,10 @@ class MeteorClient {
       {};
   final Map<String, Stream<Map<String, dynamic>>> _collectionsStreams = {};
 
-  MeteorClient.connect({required String url, bool debug = false, userAgent = 'Dart Meteor / 2.0.3'}) {
+  MeteorClient.connect(
+      {required String url,
+      bool debug = false,
+      userAgent = 'DartMeteor/2.0.4'}) {
     url = url.replaceFirst(RegExp(r'^http'), 'ws');
     if (!url.endsWith('websocket')) {
       url = url.replaceFirst(RegExp(r'/$'), '') + '/websocket';
@@ -190,6 +193,8 @@ class MeteorClient {
       if (_collections['users'] != null &&
           _collections['users']![userId] != null) {
         _userSubject.add(_collections['users']![userId]);
+      } else {
+        _userSubject.add(null);
       }
     });
   }
@@ -344,11 +349,11 @@ class MeteorClient {
   // Accounts
 
   /// Get the current user record, or null if no user is logged in. A reactive data source.
-  Stream<Map<String, dynamic>> user() {
+  Stream<Map<String, dynamic>?> user() {
     return _userStream;
   }
 
-  Map<String, dynamic> userCurrentValue() {
+  Map<String, dynamic>? userCurrentValue() {
     return _userSubject.value;
   }
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: dart_meteor
 description: This library make connection between meteor backend and flutter app easily. Design to work seamlessly with StreamBuilder and FutureBuilder.
-version: 2.0.3
+version: 2.0.4
 homepage: https://github.com/tanutapi/dart_meteor
 
 environment:

diff --git a/test/dart_meteor_test.dart b/test/dart_meteor_test.dart
@@ -199,17 +199,21 @@ void main() {
       print('MeteorClientLoginResult: ' + result.toString());
       print('UserID: ${meteor.userIdCurrentValue()}');
       expect(meteor.userIdCurrentValue(), isNotNull);
+      expect(meteor.userCurrentValue(), isNotNull);
       await meteor.logout();
       expect(meteor.userIdCurrentValue(), isNull);
+      expect(meteor.userCurrentValue(), isNull);
     });
 
     test('meteor.logoutOtherClients', () async {
       var result = await meteor.loginWithPassword('user1', 'password1');
       print('MeteorClientLoginResult: ' + result.toString());
       print('UserID: ${meteor.userIdCurrentValue()}');
       expect(meteor.userIdCurrentValue(), isNotNull);
+      expect(meteor.userCurrentValue(), isNotNull);
       await meteor.logoutOtherClients();
       expect(meteor.userIdCurrentValue(), isNotNull);
+      expect(meteor.userCurrentValue(), isNotNull);
     });
   });