PR feedback

Author: sam-gc

packages-exp/auth-exp/src/api/authentication/token.ts

@@ -19,11 +19,7 @@
 
 import { querystring } from '@firebase/util';
 
-import {
-  _getFinalTarget,
-  _performFetchWithErrorHandling,
-  HttpMethod
-} from '../';
+import { _getFinalTarget, _performFetchWithErrorHandling, HttpMethod } from '../';
 import { FetchProvider } from '../../core/util/fetch_provider';
 import { AuthCore } from '../../model/auth';
 
@@ -54,10 +50,12 @@ export async function requestStsToken(
       'grant_type': GRANT_TYPE,
       'refresh_token': refreshToken
     }).slice(1);
-    const { apiScheme, tokenApiHost, apiKey, sdkClientVersion } = auth.config;
+    const { tokenApiHost, apiKey, sdkClientVersion } = auth.config;
     const url = _getFinalTarget(
       auth,
-      `${apiScheme}://${tokenApiHost}/${_ENDPOINT}`
+      tokenApiHost,
+      _ENDPOINT,
+      `key=${apiKey}`,
     );
 
     return FetchProvider.fetch()(`${url}?key=${apiKey}`, {

packages-exp/auth-exp/src/api/index.ts

@@ -97,8 +97,9 @@ export async function _performApiRequest<T, V>(
     return FetchProvider.fetch()(
       _getFinalTarget(
         auth,
-        `${auth.config.apiScheme}://${auth.config.apiHost}${path}?${query}`
-      ),
+        auth.config.apiHost,
+        path,
+        query),
       {
         method,
         headers,
@@ -183,14 +184,15 @@ export async function _performSignInRequest<T, V extends IdTokenResponse>(
   return serverResponse;
 }
 
-export function _getFinalTarget(auth: AuthCore, url: string): string {
+export function _getFinalTarget(auth: AuthCore, host: string, path: string, query: string): string {
   const { emulator } = auth.config;
+  const base = `${host}${path}?${query}`;
+
   if (!emulator) {
-    return url;
+    return `${auth.config.apiScheme}://${base}`;
   }
 
-  const urlWithoutScheme = url.replace(/^.*:\/\//, '');
-  return `http://${emulator.hostname}:${emulator.port}/${urlWithoutScheme}`;
+  return `http://${emulator.hostname}:${emulator.port}/${base}`;
 }
 
 function makeNetworkTimeout<T>(appName: string): Promise<T> {