fix(fresh): wait for initial storage read before returning token (#96)

Co-authored-by: Felix Angelov <[email protected]>
felangel · Jul 20, 2024 · 2157185 · 2157185
1 parent 8f11c4b
commit 2157185
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/packages/fresh/lib/src/fresh.dart b/packages/fresh/lib/src/fresh.dart
@@ -107,7 +107,9 @@ mixin FreshMixin<T> {
   /// Returns the current token.
   Future<T?> get token async {
     if (_authenticationStatus != AuthenticationStatus.initial) return _token;
-    await authenticationStatus.first;
+    await authenticationStatus.firstWhere(
+      (status) => status != AuthenticationStatus.initial,
+    );
     return _token;
   }
 

diff --git a/packages/fresh/test/fresh_test.dart b/packages/fresh/test/fresh_test.dart
@@ -67,6 +67,17 @@ void main() {
         final token = await freshController.token;
         expect(token, mockToken);
       });
+
+      test('waits for storage read to complete', () async {
+        final mockToken = MockToken();
+        when(() => tokenStorage.read()).thenAnswer((_) async {
+          await Future<void>.delayed(Duration.zero);
+          return mockToken;
+        });
+        final freshController = FreshController<OAuth2Token>(tokenStorage);
+        final token = await freshController.token;
+        expect(token, mockToken);
+      });
     });
 
     group('revokeToken', () {