Cleanup & PR Feedback

Author: avolkovi

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

@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import { FirebaseApp } from '@firebase/app-types-exp';
+import { FirebaseError } from '@firebase/util';
 import { expect, use } from 'chai';
 import * as sinon from 'sinon';
 import * as sinonChai from 'sinon-chai';

packages-exp/auth-exp/src/core/strategies/credential.test.ts

@@ -26,10 +26,12 @@ export async function signInWithCredential(
 ): Promise<UserCredential> {
   // TODO: handle mfa by wrapping with callApiWithMfaContext
   const response = await credential._getIdTokenResponse(auth);
-  return UserCredentialImpl._fromIdTokenResponse(
+  const userCredential = await UserCredentialImpl._fromIdTokenResponse(
     auth,
     credential,
     OperationType.SIGN_IN,
     response
   );
+  await auth.updateCurrentUser(userCredential.user);
+  return userCredential;
 }

packages-exp/auth-exp/src/core/strategies/credential.ts

@@ -24,10 +24,31 @@ import { OperationType } from '../../model/user_credential';
 import { ProviderId, SignInMethod } from '../providers';
 import { AuthCredentialImpl } from '../providers/auth_credential_impl';
 import { UserCredentialImpl } from './user_credential_impl';
+import { APIUserInfo } from '../../api/account_management/account';
+import { mockEndpoint } from '../../../test/api/helper';
+import { Endpoint } from '../../api';
 
 use(chaiAsPromised);
 
 describe('core/user/user_credential_impl', () => {
+  const serverUser: APIUserInfo = {
+    localId: 'localId',
+    displayName: 'displayName',
+    photoUrl: 'photoURL',
+    email: 'email',
+    emailVerified: true,
+    phoneNumber: 'phoneNumber',
+    tenantId: 'tenantId',
+    createdAt: 123,
+    lastLoginAt: 456
+  };
+
+  beforeEach(() => {
+    mockEndpoint(Endpoint.GET_ACCOUNT_INFO, {
+      users: [serverUser]
+    });
+  });
+  
   describe('fromIdTokenResponse', () => {
     const idTokenResponse: IdTokenResponse = {
       idToken: 'my-id-token',
@@ -53,5 +74,9 @@ describe('core/user/user_credential_impl', () => {
       expect(userCredential.operationType).to.eq(OperationType.SIGN_IN);
       expect(userCredential.user.uid).to.eq('my-uid');
     });
+
+    it('should not trigger callbacks', () => {
+
+    });
   });
 });

packages-exp/auth-exp/src/core/user/user_credential_impl.test.ts

@@ -36,8 +36,6 @@ export class UserCredentialImpl implements UserCredential {
     idTokenResponse: IdTokenResponse
   ): Promise<UserCredential> {
     const user = await UserImpl._fromIdTokenResponse(auth, idTokenResponse);
-    // TODO: Rebase and uncomment
-    // await auth.updateCurrentUser(user);
     const userCred = new UserCredentialImpl(user, credential, operationType);
     // TODO: handle additional user info
     // updateAdditionalUserInfoFromIdTokenResponse(userCred, idTokenResponse);

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

@@ -30,9 +30,13 @@ import { Endpoint } from '../../api';
 import { IdTokenResponse } from '../../model/id_token';
 import { StsTokenManager } from './token_manager';
 import { UserImpl } from './user_impl';
+import { mockEndpoint } from '../../../test/api/helper';
+import { Endpoint } from '../../api';
+import { APIUserInfo } from '../../api/account_management/account';
 
 use(sinonChai);
 use(chaiAsPromised);
+use(sinonChai);
 
 describe('core/user/user_impl', () => {
   const auth = mockAuth;
@@ -195,6 +199,24 @@ describe('core/user/user_impl', () => {
       kind: 'my-kind'
     };
 
+    const serverUser: APIUserInfo = {
+      localId: 'local-id',
+      displayName: 'display-name',
+      photoUrl: 'photo-url',
+      email: 'email',
+      emailVerified: true,
+      phoneNumber: 'phone-number',
+      tenantId: 'tenant-id',
+      createdAt: 123,
+      lastLoginAt: 456
+    };
+
+    beforeEach(() => {
+      mockEndpoint(Endpoint.GET_ACCOUNT_INFO, {
+        users: [serverUser]
+      });
+    });
+
     it('should initialize a user', async () => {
       const user = await UserImpl._fromIdTokenResponse(
         mockAuth,
@@ -205,8 +227,23 @@ describe('core/user/user_impl', () => {
       expect(await user.getIdToken()).to.eq('my-id-token');
     });
 
-    it('should reload the user', () => {
-      // TODO: need to wait for https://github.com/firebase/firebase-js-sdk/pull/2961
+    it('should pull additional user info on the user', async () => {
+      const user = await UserImpl._fromIdTokenResponse(
+        mockAuth,
+        idTokenResponse
+      );
+      expect(user.displayName).to.eq('display-name');
+      expect(user.phoneNumber).to.eq('phone-number');
+    });
+
+    it('should not trigger additional callbacks', async () => {
+      const cb = sinon.spy();
+      auth.onAuthStateChanged(cb);
+      await UserImpl._fromIdTokenResponse(
+        mockAuth,
+        idTokenResponse
+      );
+      expect(cb).not.to.have.been.called;
     });
   });
 });

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

@@ -175,7 +175,7 @@ export class UserImpl implements User {
     });
 
     // Updates the user info and data and resolves with a user instance.
-    await user.reload();
+    await _reloadWithoutSaving(user);
     return user;
   }
 }