fix: reset user when loading game (#555)

* fix: reset user when loading game * feat: avoid sign out if user unauthenticated
VGVentures · Jun 6, 2024 · f6b88cf · f6b88cf
1 parent 7133427
commit f6b88cf
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/lib/main_development.dart b/lib/main_development.dart
@@ -43,8 +43,14 @@ void main() async {
           firebaseAuth: firebaseAuth,
         );
 
+        // Signing out first to refresh the auth token when reloading the page.
+        final previousUser = await authenticationRepository.user.first;
+        if (previousUser != User.unauthenticated) {
+          await authenticationRepository.signOut();
+        }
         await authenticationRepository.signInAnonymously();
         await authenticationRepository.idToken.first;
+        final newUser = await authenticationRepository.user.first;
 
         final apiClient = ApiClient(
           baseUrl: 'https://io-crossword-dev-api-sea6y22h5q-uc.a.run.app',
@@ -63,7 +69,7 @@ void main() async {
           leaderboardRepository: leaderboardRepository,
           crosswordRepository: CrosswordRepository(db: firestore),
           boardInfoRepository: BoardInfoRepository(firestore: firestore),
-          user: await authenticationRepository.user.first,
+          user: newUser,
         );
       },
     ),

diff --git a/lib/main_production.dart b/lib/main_production.dart
@@ -37,8 +37,14 @@ void main() async {
           firestore: firestore,
         );
 
+        // Signing out first to refresh the auth token when reloading the page.
+        final previousUser = await authenticationRepository.user.first;
+        if (previousUser != User.unauthenticated) {
+          await authenticationRepository.signOut();
+        }
         await authenticationRepository.signInAnonymously();
         await authenticationRepository.idToken.first;
+        final newUser = await authenticationRepository.user.first;
 
         final apiClient = ApiClient(
           baseUrl: 'https://io-crossword-api-u3emptgwka-uc.a.run.app',
@@ -53,7 +59,7 @@ void main() async {
           leaderboardRepository: leaderboardRepository,
           crosswordRepository: CrosswordRepository(db: firestore),
           boardInfoRepository: BoardInfoRepository(firestore: firestore),
-          user: await authenticationRepository.user.first,
+          user: newUser,
         );
       },
     ),

diff --git a/lib/main_staging.dart b/lib/main_staging.dart
@@ -47,8 +47,14 @@ void main() async {
           firestore: firestore,
         );
 
+        // Signing out first to refresh the auth token when reloading the page.
+        final previousUser = await authenticationRepository.user.first;
+        if (previousUser != User.unauthenticated) {
+          await authenticationRepository.signOut();
+        }
         await authenticationRepository.signInAnonymously();
         await authenticationRepository.idToken.first;
+        final newUser = await authenticationRepository.user.first;
 
         final apiClient = ApiClient(
           baseUrl: 'https://io-crossword-staging-api-sea6y22h5q-uc.a.run.app',
@@ -63,7 +69,7 @@ void main() async {
           leaderboardRepository: leaderboardRepository,
           crosswordRepository: CrosswordRepository(db: firestore),
           boardInfoRepository: BoardInfoRepository(firestore: firestore),
-          user: await authenticationRepository.user.first,
+          user: newUser,
         );
       },
     ),

diff --git a/packages/authentication_repository/lib/src/authentication_repository.dart b/packages/authentication_repository/lib/src/authentication_repository.dart
@@ -62,9 +62,7 @@ class AuthenticationRepository {
     }
   }
 
-  /// Sign in the user anonymously.
-  ///
-  /// If the sign in fails, an [AuthenticationException] is thrown.
+  /// Sign out the user.
   Future<void> signOut() async {
     await _firebaseAuth.signOut();