PR feedback

Author: sam-gc

packages-exp/auth-exp/src/core/credentials/inferred.test.ts renamed to packages-exp/auth-exp/src/core/credentials/from_token_response.test.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2019 Google Inc.
+ * Copyright 2020 Google LLC.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import { expect } from 'chai';
 import { ProviderId } from '@firebase/auth-types-exp';
 
 import { TEST_ID_TOKEN_RESPONSE } from '../../../test/id_token_response';
-import { _authCredentialFromTokenResponse } from './inferred';
+import { _authCredentialFromTokenResponse } from './from_token_response';
 
  describe('src/core/credentials/inferred', () => {
   it('returns a phone credential if response conains correct fields', () => {

packages-exp/auth-exp/src/core/credentials/inferred.ts renamed to packages-exp/auth-exp/src/core/credentials/from_token_response.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2020 Google LLC
+ * Copyright 2020 Google LLC.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -17,10 +17,12 @@
 
 import { OperationType } from '@firebase/auth-types-exp';
 
-import { signInWithIdp, SignInWithIdpRequest } from '../../api/authentication/idp';
+import {
+    signInWithIdp, SignInWithIdpRequest, SignInWithIdpResponse
+} from '../../api/authentication/idp';
 import { Auth } from '../../model/auth';
 import { User, UserCredential } from '../../model/user';
-import { _authCredentialFromTokenResponse } from '../credentials/inferred';
+import { _authCredentialFromTokenResponse } from '../credentials/from_token_response';
 import { _link as _linkUser } from '../user/link_unlink';
 import { _reauthenticate } from '../user/reauthenticate';
 import { UserCredentialImpl } from '../user/user_credential_impl';
@@ -38,28 +40,35 @@ export interface IdpTaskParams {
 
 export type IdpTask = (params: IdpTaskParams) => Promise<UserCredential>;
 
-function paramsToRequest({
+function callIdpSignIn(
+  {
+  auth,
   requestUri,
   sessionId,
   tenantId,
   pendingToken,
   postBody
-}: IdpTaskParams): SignInWithIdpRequest {
-  return {
+}: IdpTaskParams, idToken?: string): Promise<SignInWithIdpResponse> {
+  const request: SignInWithIdpRequest = {
     requestUri,
     sessionId,
     postBody: postBody || null,
     tenantId,
     pendingToken,
     returnSecureToken: true
   };
+
+  if (idToken) {
+    request.idToken = idToken;
+  }
+
+  return signInWithIdp(auth, request);
 }
 
 export async function _signIn(params: IdpTaskParams): Promise<UserCredential> {
-  const request = paramsToRequest(params);
   const auth = params.auth;
 
-  const response = await signInWithIdp(auth, request);
+  const response = await callIdpSignIn(params);
 
   const credential = _authCredentialFromTokenResponse(response);
   const userCredential = await UserCredentialImpl._fromIdTokenResponse(
@@ -75,16 +84,14 @@ export async function _signIn(params: IdpTaskParams): Promise<UserCredential> {
 export async function _reauth(params: IdpTaskParams): Promise<UserCredential> {
   const { auth, user } = params;
   assert(user, auth.name);
-  const requestPromise = signInWithIdp(auth, paramsToRequest(params));
+  const requestPromise = callIdpSignIn(params);
   return _reauthenticate(user, requestPromise);
 }
 
 export async function _link(params: IdpTaskParams): Promise<UserCredential> {
   const { auth, user } = params;
   assert(user, auth.name);
-  
-  const request = paramsToRequest(params);
-  request.idToken = await user.getIdToken();
+  const idToken = await user.getIdToken();
 
-  return _linkUser(user, signInWithIdp(auth, request));
+  return _linkUser(user, callIdpSignIn(params, idToken));
 }

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

@@ -22,7 +22,7 @@ import { Auth } from '../../model/auth';
 import { IdTokenResponse } from '../../model/id_token';
 import { User, UserCredential } from '../../model/user';
 import { AuthCredential } from '../credentials';
-import { _authCredentialFromTokenResponse } from '../credentials/inferred';
+import { _authCredentialFromTokenResponse } from '../credentials/from_token_response';
 import { UserImpl } from './user_impl';
 
 export class UserCredentialImpl implements UserCredential {