PR Feedback + typings

firebase · Oct 13, 2020 · 6193868 · 6193868
1 parent df41ee3
commit 6193868
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 20 deletions.
diff --git a/packages/auth/src/auth.js b/packages/auth/src/auth.js
@@ -321,22 +321,24 @@ fireauth.Auth.prototype.emitEmulatorWarning_ = function() {
   fireauth.util.consoleWarn('WARNING: You are using the Auth Emulator,' +
     ' which is intended for local testing only.  Do not use with' +
     ' production credentials.');
-  if (goog.global.document && goog.global.document.body) {
-    const ele = goog.global.document.createElement('p');
-    ele.innerText = 'Running in emulator mode. Do not use with production' +
-      ' credentials.';
-    ele.style.position = 'fixed';
-    ele.style.width = '100%';
-    ele.style.backgroundColor = '#ffffff';
-    ele.style.border = '.1em solid #000000';
-    ele.style.color = '#ff0000';
-    ele.style.bottom = '0px';
-    ele.style.left = '0px';
-    ele.style.margin = '0px';
-    ele.style.zIndex = 10000;
-    ele.style.textAlign = 'center';
-    ele.classList.add('firebase-emulator-warning');
-    goog.global.document.body.appendChild(ele);
+  if (goog.global.document) {
+    fireauth.util.onDomReady().then(() => {
+      const ele = goog.global.document.createElement('div');
+      ele.innerText = 'Running in emulator mode. Do not use with production' +
+        ' credentials.';
+      ele.style.position = 'fixed';
+      ele.style.width = '100%';
+      ele.style.backgroundColor = '#ffffff';
+      ele.style.border = '.1em solid #000000';
+      ele.style.color = '#ff0000';
+      ele.style.bottom = '0px';
+      ele.style.left = '0px';
+      ele.style.margin = '0px';
+      ele.style.zIndex = 10000;
+      ele.style.textAlign = 'center';
+      ele.classList.add('firebase-emulator-warning');
+      goog.global.document.body.appendChild(ele);
+    };
   }
 }
 

diff --git a/packages/auth/test/auth_test.js b/packages/auth/test/auth_test.js
@@ -450,10 +450,12 @@ function tearDown() {
   currentUserStorageManager = null;
   redirectUserStorageManager = null;
   if (goog.global.document) {
-    var el = goog.global.document.querySelector('.firebase-emulator-warning');
-    if (el) {
-      el.parentNode.removeChild(el);
-    }
+    fireauth.util.onDomReady().then(function () {
+      var el = goog.global.document.querySelector('.firebase-emulator-warning');
+      if (el) {
+        el.parentNode.removeChild(el);
+      }
+    };
   }
 }
 

diff --git a/packages/firebase/index.d.ts b/packages/firebase/index.d.ts
@@ -3119,6 +3119,14 @@ declare namespace firebase.auth {
      * Sets the current language to the default device/browser preference.
      */
     useDeviceLanguage(): void;
+    /**
+     * Modify this Auth instance to communicate with the Firebase Auth emulator.  This must be 
+     * called synchronously immediately following the first call to `firebase.auth()`.  Do not use
+     * with production credentials as emulator traffic is not encrypted.
+     * 
+     * @param url - The URL at which the emulator is running (eg, 'http://localhost:9099')
+     */
+    useEmulator(url: string): void;
     /**
      * Checks a password reset code sent to the user by email or other out-of-band
      * mechanism.