Add more tests

Author: avolkovi

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

@@ -38,7 +38,7 @@ export const DEFAULT_TOKEN_API_HOST = 'securetoken.googleapis.com';
 export const DEFAULT_API_HOST = 'identitytoolkit.googleapis.com';
 export const DEFAULT_API_SCHEME = 'https';
 
-class AuthImpl implements Auth {
+export class AuthImpl implements Auth {
   currentUser: User | null = null;
   private operations = Promise.resolve();
   private persistenceManager?: PersistenceUserManager;

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

@@ -15,3 +15,65 @@
  * limitations under the License.
  */
 
+import { expect, use } from 'chai';
+import * as chaiAsPromised from 'chai-as-promised';
+import { mockAuth } from '../../../test/mock_auth';
+import { MockAuthCredential } from '../../../test/mock_auth_credential';
+import * as mockFetch from '../../../test/mock_fetch';
+import { APIUserInfo } from '../../api/account_management/account';
+import { IdTokenResponse } from '../../model/id_token';
+import { ProviderId, SignInMethod } from '../providers';
+import { signInWithCredential } from './credential';
+import { mockEndpoint } from '../../../test/api/helper';
+import { Endpoint } from '../../api';
+import { OperationType } from '../../model/user_credential';
+
+use(chaiAsPromised);
+
+describe('core/strategies/signInWithCredential', () => {
+  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
+  };
+  
+  const idTokenResponse: IdTokenResponse = {
+    idToken: 'my-id-token',
+    refreshToken: 'my-refresh-token',
+    expiresIn: '1234',
+    localId: serverUser.localId!,
+    kind: 'my-kind'
+  };
+
+  const authCredential = new MockAuthCredential(ProviderId.FIREBASE, SignInMethod.EMAIL_LINK);
+
+  beforeEach(() => {
+    mockFetch.setUp();
+    authCredential._setIdTokenResponse(idTokenResponse);
+    mockEndpoint(Endpoint.GET_ACCOUNT_INFO, {
+      users: [serverUser]
+    });
+  });
+  afterEach(mockFetch.tearDown);
+
+  it('should return a valid user credential', async () => {
+    const {credential, user, operationType } = await signInWithCredential(mockAuth, authCredential);
+    expect(credential!.providerId).to.eq(ProviderId.FIREBASE);
+    expect(credential!.signInMethod).to.eq(SignInMethod.EMAIL_LINK);
+    expect(user.uid).to.eq('local-id');
+    expect(user.tenantId).to.eq('tenant-id');
+    expect(user.displayName).to.eq('display-name');
+    expect(operationType).to.eq(OperationType.SIGN_IN);
+  });
+  
+  it('should update the current user', async () => {
+    const { user } = await signInWithCredential(mockAuth, authCredential);
+    expect(mockAuth.currentUser).to.eq(user);
+  });
+});

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

@@ -25,7 +25,7 @@ import { FirebaseError } from '@firebase/util';
 
 import { mockEndpoint } from '../../../test/api/helper';
 import { testUser } from '../../../test/mock_auth';
-import * as fetch from '../../../test/mock_fetch';
+import * as mockFetch from '../../../test/mock_fetch';
 import { Endpoint } from '../../api';
 import {
   APIUserInfo,
@@ -56,8 +56,8 @@ const BASIC_PROVIDER_USER_INFO: ProviderUserInfo = {
 };
 
 describe('core/user/reload', () => {
-  beforeEach(fetch.setUp);
-  afterEach(fetch.tearDown);
+  beforeEach(mockFetch.setUp);
+  afterEach(mockFetch.tearDown);
 
   it('sets all the new properties', async () => {
     const serverUser: APIUserInfo = {

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

@@ -17,48 +17,54 @@
 
 import { expect, use } from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
+import * as sinon from 'sinon';
+import * as sinonChai from 'sinon-chai';
+import { mockEndpoint } from '../../../test/api/helper';
 import { mockAuth } from '../../../test/mock_auth';
+import { MockAuthCredential } from '../../../test/mock_auth_credential';
+import * as mockFetch from '../../../test/mock_fetch';
+import { Endpoint } from '../../api';
+import { APIUserInfo } from '../../api/account_management/account';
 import { AuthCredential } from '../../model/auth_credential';
 import { IdTokenResponse } from '../../model/id_token';
 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);
+use(sinonChai);
 
 describe('core/user/user_credential_impl', () => {
   const serverUser: APIUserInfo = {
-    localId: 'localId',
-    displayName: 'displayName',
-    photoUrl: 'photoURL',
+    localId: 'local-id',
+    displayName: 'display-name',
+    photoUrl: 'photo-url',
     email: 'email',
     emailVerified: true,
-    phoneNumber: 'phoneNumber',
-    tenantId: 'tenantId',
+    phoneNumber: 'phone-number',
+    tenantId: 'tenant-id',
     createdAt: 123,
     lastLoginAt: 456
   };
 
   beforeEach(() => {
+    mockFetch.setUp();
     mockEndpoint(Endpoint.GET_ACCOUNT_INFO, {
       users: [serverUser]
     });
   });
+  afterEach(mockFetch.tearDown);
 
   describe('fromIdTokenResponse', () => {
     const idTokenResponse: IdTokenResponse = {
       idToken: 'my-id-token',
       refreshToken: 'my-refresh-token',
       expiresIn: '1234',
-      localId: 'my-uid',
+      localId: serverUser.localId!,
       kind: 'my-kind'
     };
 
-    const credential: AuthCredential = new AuthCredentialImpl(
+    const credential: AuthCredential = new MockAuthCredential(
       ProviderId.FIREBASE,
       SignInMethod.EMAIL_PASSWORD
     );
@@ -72,9 +78,22 @@ describe('core/user/user_credential_impl', () => {
       );
       expect(userCredential.credential).to.eq(credential);
       expect(userCredential.operationType).to.eq(OperationType.SIGN_IN);
-      expect(userCredential.user.uid).to.eq('my-uid');
+      expect(userCredential.user.uid).to.eq('local-id');
     });
 
-    it('should not trigger callbacks', () => {});
+    it('should not trigger callbacks', async () => {
+      const cb = sinon.spy();
+      mockAuth.onAuthStateChanged(cb);
+      await mockAuth.updateCurrentUser(null);
+      cb.resetHistory();
+
+      await UserCredentialImpl._fromIdTokenResponse(
+        mockAuth,
+        credential,
+        OperationType.SIGN_IN,
+        idTokenResponse
+      );
+      expect(cb).not.to.have.been.called;
+    });
   });
 });

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

@@ -30,9 +30,6 @@ 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);
@@ -195,7 +192,7 @@ describe('core/user/user_impl', () => {
       idToken: 'my-id-token',
       refreshToken: 'my-refresh-token',
       expiresIn: '1234',
-      localId: 'my-uid',
+      localId: 'local-id',
       kind: 'my-kind'
     };
 
@@ -212,19 +209,21 @@ describe('core/user/user_impl', () => {
     };
 
     beforeEach(() => {
+      mockFetch.setUp();
       mockEndpoint(Endpoint.GET_ACCOUNT_INFO, {
         users: [serverUser]
       });
     });
+    afterEach(mockFetch.tearDown);
 
     it('should initialize a user', async () => {
       const user = await UserImpl._fromIdTokenResponse(
         mockAuth,
         idTokenResponse
       );
       expect(user.uid).to.eq(idTokenResponse.localId);
-      expect(user.refreshToken).to.eq('my-refresh-token');
       expect(await user.getIdToken()).to.eq('my-id-token');
+      expect(user.refreshToken).to.eq('my-refresh-token');
     });
 
     it('should pull additional user info on the user', async () => {
@@ -239,6 +238,9 @@ describe('core/user/user_impl', () => {
     it('should not trigger additional callbacks', async () => {
       const cb = sinon.spy();
       auth.onAuthStateChanged(cb);
+      await auth.updateCurrentUser(null);
+      cb.resetHistory();
+      
       await UserImpl._fromIdTokenResponse(mockAuth, idTokenResponse);
       expect(cb).not.to.have.been.called;
     });

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

@@ -169,9 +169,9 @@ export class UserImpl implements User {
 
     // Initialize the Firebase Auth user.
     const user = new UserImpl({
+      uid: idTokenResponse.localId,
       auth,
-      stsTokenManager,
-      uid: idTokenResponse.localId
+      stsTokenManager
     });
 
     // Updates the user info and data and resolves with a user instance.

packages-exp/auth-exp/test/mock_auth.ts

@@ -16,6 +16,7 @@
  */
 
 import { StsTokenManager } from '../src/core/user/token_manager';
+import { AuthImpl } from '../src/core/auth/auth_impl';
 import { UserImpl } from '../src/core/user/user_impl';
 import { Auth } from '../src/model/auth';
 import { User } from '../src/model/user';

packages-exp/auth-exp/src/core/providers/auth_credential_impl.ts renamed to packages-exp/auth-exp/test/mock_auth_credential.ts

@@ -15,24 +15,34 @@
  * limitations under the License.
  */
 
-import { AuthCredential } from '../../model/auth_credential';
-import { ProviderId, SignInMethod } from '.';
-import { IdTokenResponse } from '../../model/id_token';
-import { PhoneOrOauthTokenResponse } from '../../api/authentication/mfa';
-import { Auth } from '../../model/auth';
+import { PhoneOrOauthTokenResponse } from '../src/api/authentication/mfa';
+import { ProviderId, SignInMethod } from "../src/core/providers";
+import { Auth } from '../src/model/auth';
+import { AuthCredential } from '../src/model/auth_credential';
+import { IdTokenResponse } from '../src/model/id_token';
+
+export class MockAuthCredential implements AuthCredential {
+  response?: PhoneOrOauthTokenResponse;
 
-export class AuthCredentialImpl implements AuthCredential {
   constructor(
     readonly providerId: ProviderId,
     readonly signInMethod: SignInMethod
-  ) {}
+  ) { }
 
   toJSON(): object {
     throw new Error('Method not implemented.');
   }
 
-  _getIdTokenResponse(_auth: Auth): Promise<PhoneOrOauthTokenResponse> {
-    throw new Error('Method not implemented.');
+  /**
+   * For testing purposes only
+   * @param response 
+   */
+  _setIdTokenResponse(response: PhoneOrOauthTokenResponse): void {
+    this.response = response;
+  }
+
+  async _getIdTokenResponse(_auth: Auth): Promise<PhoneOrOauthTokenResponse> {
+    return this.response!;
   }
 
   _linkToIdToken(_auth: Auth, _idToken: string): Promise<IdTokenResponse> {
@@ -42,4 +52,4 @@ export class AuthCredentialImpl implements AuthCredential {
   _matchIdTokenWithUid(_auth: Auth, _uid: string): Promise<IdTokenResponse> {
     throw new Error('Method not implemented.');
   }
-}
+}