fix(auth, web): fix support for hot reload with multiple named instan…

…ces when using an emulator on Web (#10766) * fix(auth, web): fix support for hot relod with multiple named instance when using an emulator on Web * fix(auth, web): fix support for hot relod with multiple named instance when using an emulator on Web * fix(auth, web): fix support for hot relod with multiple named instance when using an emulator on Web
firebase · Apr 13, 2023 · b5de275 · b5de275
1 parent cc6d1c2
commit b5de275
Showing 1 changed file with 24 additions and 8 deletions.
diff --git a/packages/firebase_auth/firebase_auth_web/lib/firebase_auth_web.dart b/packages/firebase_auth/firebase_auth_web/lib/firebase_auth_web.dart
@@ -96,14 +96,26 @@ class FirebaseAuthWeb extends FirebaseAuthPlatform {
       // if localhost, and emulator was previously set in localStorage, use it
       if (window.location.hostname == 'localhost' && kDebugMode) {
         final String? emulatorOrigin =
-            window.sessionStorage['firebaseEmulatorOrigin'];
+            window.sessionStorage[getOriginName(firebaseApp.name)];
 
         if (emulatorOrigin != null) {
-          authDelegate.useAuthEmulator(emulatorOrigin);
-          // ignore: avoid_print
-          print(
-            'Using previously configured Auth emulator at $emulatorOrigin \nTo switch back to production, restart your app with the emulator turned off.',
-          );
+          try {
+            authDelegate.useAuthEmulator(emulatorOrigin);
+            // ignore: avoid_print
+            print(
+              'Using previously configured Auth emulator at $emulatorOrigin for ${firebaseApp.name} \nTo switch back to production, restart your app with the emulator turned off.',
+            );
+          } catch (e) {
+            if (e.toString().contains('sooner')) {
+              // Happens during hot reload when the emulator is already configured
+              // ignore: avoid_print
+              print(
+                'Auth emulator is already configured at $emulatorOrigin for ${firebaseApp.name} and kept across hot reload.\nTo switch back to production, restart your app with the emulator turned off.',
+              );
+            } else {
+              rethrow;
+            }
+          }
         }
       }
       await authDelegate.onWaitInitState();
@@ -452,7 +464,7 @@ class FirebaseAuthWeb extends FirebaseAuthPlatform {
     try {
       // Get current session storage value
       final String? emulatorOrigin =
-          window.sessionStorage['firebaseEmulatorOrigin'];
+          window.sessionStorage[getOriginName(delegate.app.name)];
 
       // The generic platform interface is with host and port split to
       // centralize logic between android/ios native, but web takes the
@@ -469,7 +481,7 @@ class FirebaseAuthWeb extends FirebaseAuthPlatform {
       // Save to session storage so that the emulator is used on refresh
       // only in debug mode
       if (kDebugMode) {
-        window.sessionStorage['firebaseEmulatorOrigin'] = origin;
+        window.sessionStorage[getOriginName(delegate.app.name)] = origin;
       }
     } catch (e) {
       final String code = (e as auth_interop.AuthError).code;
@@ -537,3 +549,7 @@ class FirebaseAuthWeb extends FirebaseAuthPlatform {
     }
   }
 }
+
+String getOriginName(String appName) {
+  return '$appName-firebaseEmulatorOrigin';
+}