Removed change to check every request

Author: maneesht

packages/auth/src/api/index.ts

@@ -200,7 +200,6 @@ export async function _performFetchWithErrorHandling<V>(
   fetchFn: () => Promise<Response>
 ): Promise<V> {
   const authInternal = auth as AuthInternal;
-  updateEmulatorBanner('Auth', authInternal.emulatorConfig !== null);
   authInternal._canInitEmulator = false;
   const errorMap = { ...SERVER_ERROR_MAP, ...customErrorMap };
   try {

packages/auth/src/platform_browser/index.ts

@@ -30,7 +30,11 @@ import { browserSessionPersistence } from './persistence/session_storage';
 import { indexedDBLocalPersistence } from './persistence/indexed_db';
 import { browserPopupRedirectResolver } from './popup_redirect';
 import { Auth, User } from '../model/public_types';
-import { getDefaultEmulatorHost, getExperimentalSetting } from '@firebase/util';
+import {
+  getDefaultEmulatorHost,
+  getExperimentalSetting,
+  updateEmulatorBanner
+} from '@firebase/util';
 import { _setExternalJSProvider } from './load_js';
 import { _createError } from '../core/util/assert';
 import { AuthErrorCode } from '../core/errors';
@@ -107,6 +111,8 @@ export function getAuth(app: FirebaseApp = getApp()): Auth {
     }
   }
 
+  updateEmulatorBanner('Auth', false);
+
   const authEmulatorHost = getDefaultEmulatorHost('auth');
   if (authEmulatorHost) {
     connectAuthEmulator(auth, `http://${authEmulatorHost}`);

packages/database/src/api/Database.ts

@@ -258,6 +258,10 @@ export class Database implements _FirebaseService {
         this.app.options['databaseAuthVariableOverride']
       );
       this._instanceStarted = true;
+      updateEmulatorBanner(
+        'Database',
+        this._repo.repoInfo_.emulatorOptions !== null
+      );
     }
     return this._repoInternal;
   }
@@ -329,6 +333,7 @@ export function getDatabase(
     identifier: url
   }) as Database;
   if (!db._instanceStarted) {
+    updateEmulatorBanner('Database', false);
     const emulator = getDefaultEmulatorHostnameAndPort('database');
     if (emulator) {
       connectDatabaseEmulator(db, ...emulator);

packages/database/src/core/Repo.ts

@@ -329,7 +329,6 @@ export function repoStart(
       repo.server_.unlisten(query, tag);
     }
   });
-  updateEmulatorBanner('Database', repo.repoInfo_.isUsingEmulator);
 }
 
 /**

packages/firestore/src/lite-api/database.ts

@@ -143,9 +143,7 @@ export class Firestore implements FirestoreService {
 
   _freezeSettings(): FirestoreSettingsImpl {
     this._settingsFrozen = true;
-    if (isCloudWorkstation(this._settings.host)) {
-      updateEmulatorBanner('Firestore', this._settings.isUsingEmulator);
-    }
+    updateEmulatorBanner('Firestore', this._settings.isUsingEmulator);
     return this._settings;
   }
 

packages/functions/src/api.ts

@@ -29,7 +29,8 @@ import {
 } from './service';
 import {
   getModularInstance,
-  getDefaultEmulatorHostnameAndPort
+  getDefaultEmulatorHostnameAndPort,
+  updateEmulatorBanner
 } from '@firebase/util';
 
 export { FunctionsError } from './error';
@@ -47,6 +48,7 @@ export function getFunctions(
   app: FirebaseApp = getApp(),
   regionOrCustomDomain: string = DEFAULT_REGION
 ): Functions {
+  updateEmulatorBanner('Functions', false);
   // Dependencies
   const functionsProvider: Provider<'functions'> = _getProvider(
     getModularInstance(app),

packages/storage/src/api.ts

@@ -53,7 +53,8 @@ import { STORAGE_TYPE } from './constants';
 import {
   EmulatorMockTokenOptions,
   getModularInstance,
-  getDefaultEmulatorHostnameAndPort
+  getDefaultEmulatorHostnameAndPort,
+  updateEmulatorBanner
 } from '@firebase/util';
 import { StringFormat } from './implementation/string';
 
@@ -332,6 +333,7 @@ export function getStorage(
   bucketUrl?: string
 ): FirebaseStorage {
   app = getModularInstance(app);
+  updateEmulatorBanner('Storage', false);
   const storageProvider: Provider<'storage'> = _getProvider(app, STORAGE_TYPE);
   const storageInstance = storageProvider.getImmediate({
     identifier: bucketUrl

packages/util/src/emulator.ts

@@ -193,8 +193,9 @@ export function updateEmulatorBanner(
   if (
     typeof window === 'undefined' ||
     typeof document === 'undefined' ||
-    !isCloudWorkstation(window.location.host) ||
+    // !isCloudWorkstation(window.location.host) ||
     emulatorStatus[name] === isRunningEmulator ||
+    emulatorStatus[name] || // If already set to use emulator, can't go back to prod.
     previouslyDismissed
   ) {
     return;
@@ -216,6 +217,38 @@ export function updateEmulatorBanner(
     }
   }
 
+  function setupBannerStyles(bannerEl: HTMLElement) {
+    bannerEl.style.display = 'flex';
+    bannerEl.style.background = '#7faaf0';
+    bannerEl.style.position = 'absolute';
+    bannerEl.style.bottom = '5px';
+    bannerEl.style.left = '5px';
+    bannerEl.style.padding = '.5em';
+    bannerEl.style.borderRadius = '5px';
+    bannerEl.style.alignContent = 'center';
+  }
+
+  function setupIconStyles(prependIcon: SVGElement, iconId: string) {
+    prependIcon.setAttribute('width', '24');
+    prependIcon.setAttribute('id', iconId);
+    prependIcon.setAttribute('height', '24');
+    prependIcon.setAttribute('viewBox', '0 0 24 24');
+    prependIcon.setAttribute('fill', 'none');
+    prependIcon.style.marginLeft = '-6px';
+  }
+
+  function setupCloseBtn() {
+    const closeBtn = document.createElement('span');
+    closeBtn.style.cursor = 'pointer';
+    closeBtn.style.paddingLeft = '5px';
+    closeBtn.innerHTML = ' ×';
+    closeBtn.onclick = () => {
+      previouslyDismissed = true;
+      tearDown();
+    };
+    return closeBtn;
+  }
+
   function setupDom(): void {
     const banner = getOrCreateEl(bannerId);
     const firebaseTextId = prefixedId('text');
@@ -226,40 +259,21 @@ export function updateEmulatorBanner(
       (document.getElementById(learnMoreId) as HTMLAnchorElement) ||
       document.createElement('a');
     const prependIconId = prefixedId('preprendIcon');
-    const prependIcon =
-      document.getElementById(prependIconId) ||
+    const prependIcon: SVGElement =
+      (document.getElementById(
+        prependIconId
+      ) as HTMLOrSVGElement as SVGElement) ||
       document.createElementNS('http://www.w3.org/2000/svg', 'svg');
     if (banner.created) {
       // update styles
       const bannerEl = banner.element;
-      bannerEl.style.display = 'flex';
-      bannerEl.style.background = '#7faaf0';
-      bannerEl.style.position = 'absolute';
-      bannerEl.style.bottom = '5px';
-      bannerEl.style.left = '5px';
-      bannerEl.style.padding = '.5em';
-      bannerEl.style.borderRadius = '5px';
-      bannerEl.style.alignContent = 'center';
-      const closeBtn = document.createElement('span');
-      closeBtn.style.cursor = 'pointer';
-      closeBtn.style.paddingLeft = '5px';
-      closeBtn.innerHTML = ' ×';
-      closeBtn.onclick = () => {
-        previouslyDismissed = true;
-        tearDown();
-      };
+      setupBannerStyles(bannerEl);
+      const closeBtn = setupCloseBtn();
       learnMoreLink.setAttribute('id', learnMoreId);
       learnMoreLink.href =
         'http://firebase.google.com/docs/studio/deploy-app#emulator ';
-      bannerEl.appendChild(prependIcon);
-      bannerEl.appendChild(firebaseText);
-      bannerEl.appendChild(learnMoreLink);
-      bannerEl.appendChild(closeBtn);
-      prependIcon.setAttribute('width', '24');
-      prependIcon.setAttribute('id', prependIconId);
-      prependIcon.setAttribute('height', '24');
-      prependIcon.setAttribute('viewBox', '0 0 24 24');
-      prependIcon.setAttribute('fill', 'none');
+      setupIconStyles(prependIcon, prependIconId);
+      bannerEl.append(prependIcon, firebaseText, learnMoreLink, closeBtn);
       document.body.appendChild(bannerEl);
     }
 
@@ -283,8 +297,6 @@ export function updateEmulatorBanner(
 </clipPath>
 </defs>`;
       firebaseText.innerText = 'Using emulated backend';
-      learnMoreLink.href =
-        'https://firebase.google.com/docs/studio/solution-build-with-ai';
     }
     firebaseText.setAttribute('id', firebaseTextId);
   }