Fix a couple of parity issues for auth-exp (#3878)

* Fix two parity bugs

* Formatting

Author: sam-gc

packages-exp/auth-exp/src/core/auth/auth_impl.test.ts

@@ -150,6 +150,16 @@ describe('core/auth/auth_impl', () => {
       });
     });
 
+    it('waits for initialization for authStateChange', done => {
+      const user = testUser(auth, 'uid');
+      auth.currentUser = user;
+      auth._isInitialized = false;
+      auth._onAuthStateChanged(user => {
+        expect(user).to.eq(user);
+        done();
+      });
+    });
+
     it('immediately calls idTokenChange if initialization finished', done => {
       const user = testUser(auth, 'uid');
       auth.currentUser = user;
@@ -160,6 +170,16 @@ describe('core/auth/auth_impl', () => {
       });
     });
 
+    it('waits for initialization for idTokenChanged', done => {
+      const user = testUser(auth, 'uid');
+      auth.currentUser = user;
+      auth._isInitialized = false;
+      auth._onIdTokenChanged(user => {
+        expect(user).to.eq(user);
+        done();
+      });
+    });
+
     it('immediate callback is done async', () => {
       auth._isInitialized = true;
       let callbackCalled = false;

packages-exp/auth-exp/src/core/auth/auth_impl.ts

@@ -357,15 +357,18 @@ export class AuthImplCompat<T extends User> implements Auth, _FirebaseService {
     error?: ErrorFn,
     completed?: CompleteFn
   ): Unsubscribe {
-    if (this._isInitialized) {
-      const cb =
-        typeof nextOrObserver === 'function'
-          ? nextOrObserver
-          : nextOrObserver.next;
-      // The callback needs to be called asynchronously per the spec.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      Promise.resolve().then(() => cb(this.currentUser));
-    }
+    const cb =
+      typeof nextOrObserver === 'function'
+        ? nextOrObserver
+        : nextOrObserver.next;
+
+    const promise = this._isInitialized
+      ? Promise.resolve()
+      : this._initializationPromise;
+    assert(promise, AuthErrorCode.INTERNAL_ERROR, { appName: this.name });
+    // The callback needs to be called asynchronously per the spec.
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    promise.then(() => cb(this.currentUser));
 
     if (typeof nextOrObserver === 'function') {
       return subscription.addObserver(nextOrObserver, error, completed);

packages-exp/auth-exp/src/core/user/user_impl.ts

@@ -219,20 +219,20 @@ export class UserImpl implements User {
   }
 
   static _fromJSON(auth: Auth, object: PersistedBlob): User {
+    const displayName = object.displayName ?? undefined;
+    const email = object.email ?? undefined;
+    const phoneNumber = object.phoneNumber ?? undefined;
+    const photoURL = object.photoURL ?? undefined;
+    const tenantId = object.tenantId ?? undefined;
+    const _redirectEventId = object._redirectEventId ?? undefined;
+    const createdAt = object.createdAt ?? undefined;
+    const lastLoginAt = object.lastLoginAt ?? undefined;
     const {
       uid,
-      email,
       emailVerified,
-      displayName,
       isAnonymous,
-      photoURL,
-      phoneNumber,
-      tenantId,
       providerData,
-      stsTokenManager: plainObjectTokenManager,
-      _redirectEventId,
-      createdAt,
-      lastLoginAt
+      stsTokenManager: plainObjectTokenManager
     } = object;
 
     assert(uid && plainObjectTokenManager, AuthErrorCode.INTERNAL_ERROR, {