PR comments

Author: sam-gc

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

@@ -28,7 +28,8 @@ import { _ENDPOINT, requestStsToken } from './token';
 use(chaiAsPromised);
 
 describe('requestStsToken', () => {
-  const endpoint = `${_ENDPOINT}?key=${mockAuth.config.apiKey}`;
+  const {apiKey, tokenApiHost, apiScheme} = mockAuth.config;
+  const endpoint = `${apiScheme}://${tokenApiHost}/${_ENDPOINT}?key=${apiKey}`;
   beforeEach(fetch.setUp);
   afterEach(fetch.tearDown);
 

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

@@ -15,18 +15,21 @@
  * limitations under the License.
  */
 
+/* eslint-disable camelcase */
+
 import { querystring } from '@firebase/util';
 
-import { performFetchWithErrorHandling } from '../';
+import { HttpMethod, performFetchWithErrorHandling } from '../';
 import { Auth } from '../../model/auth';
 
-export const _ENDPOINT = 'https://securetoken.googleapis.com/v1/token';
+export const _ENDPOINT = 'v1/token';
 const GRANT_TYPE = 'refresh_token';
 
-enum ServerField {
-  ACCESS_TOKEN = 'access_token',
-  EXPIRES_IN = 'expires_in',
-  REFRESH_TOKEN = 'refresh_token'
+/** The server responses with snake_case; we convert to camelCase */
+interface RequestStsTokenServerResponse {
+  access_token?: string;
+  expires_in?: string;
+  refresh_token?: string;
 }
 
 export interface RequestStsTokenResponse {
@@ -39,18 +42,18 @@ export async function requestStsToken(
   auth: Auth,
   refreshToken: string
 ): Promise<RequestStsTokenResponse> {
-  const response = await performFetchWithErrorHandling<{
-    [key: string]: string;
-  }>(auth, {}, () => {
+  const response = await performFetchWithErrorHandling<RequestStsTokenServerResponse>(auth, {}, () => {
     const body = querystring({
       'grant_type': GRANT_TYPE,
       'refresh_token': refreshToken
     }).slice(1);
+    const {apiScheme, tokenApiHost, apiKey, sdkClientVersion} = auth.config;
+    const url = `${apiScheme}://${tokenApiHost}/${_ENDPOINT}`;
 
-    return fetch(`${_ENDPOINT}?key=${auth.config.apiKey}`, {
-      method: 'POST',
+    return fetch(`${url}?key=${apiKey}`, {
+      method: HttpMethod.POST,
       headers: {
-        'X-Client-Version': auth.config.sdkClientVersion,
+        'X-Client-Version': sdkClientVersion,
         'Content-Type': 'application/x-www-form-urlencoded'
       },
       body
@@ -59,8 +62,8 @@ export async function requestStsToken(
 
   // The response comes back in snake_case. Convert to camel:
   return {
-    accessToken: response[ServerField.ACCESS_TOKEN],
-    expiresIn: response[ServerField.EXPIRES_IN],
-    refreshToken: response[ServerField.REFRESH_TOKEN]
+    accessToken: response.access_token,
+    expiresIn: response.expires_in,
+    refreshToken: response.refresh_token
   };
 }

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

@@ -30,9 +30,7 @@ import { inMemoryPersistence } from '../persistence/in_memory';
 import { PersistenceUserManager } from '../persistence/persistence_user_manager';
 import { ClientPlatform, getClientVersion } from '../util/version';
 import {
-  DEFAULT_API_HOST,
-  DEFAULT_API_SCHEME,
-  initializeAuth
+    DEFAULT_API_HOST, DEFAULT_API_SCHEME, DEFAULT_TOKEN_API_HOST, initializeAuth
 } from './auth_impl';
 
 use(sinonChai);
@@ -184,6 +182,7 @@ describe('initializeAuth', () => {
         authDomain: FAKE_APP.options.authDomain,
         apiHost: DEFAULT_API_HOST,
         apiScheme: DEFAULT_API_SCHEME,
+        tokenApiHost: DEFAULT_TOKEN_API_HOST,
         sdkClientVersion: getClientVersion(ClientPlatform.BROWSER)
       });
     });

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

@@ -30,6 +30,7 @@ interface AsyncAction {
   (): Promise<void>;
 }
 
+export const DEFAULT_TOKEN_API_HOST = 'securetoken.googleapis.com';
 export const DEFAULT_API_HOST = 'identitytoolkit.googleapis.com';
 export const DEFAULT_API_SCHEME = 'https';
 
@@ -114,6 +115,7 @@ export function initializeAuth(
     apiKey: assert(apiKey, app.name, AuthErrorCode.INVALID_API_KEY),
     authDomain,
     apiHost: DEFAULT_API_HOST,
+    tokenApiHost: DEFAULT_TOKEN_API_HOST,
     apiScheme: DEFAULT_API_SCHEME,
     sdkClientVersion: getClientVersion(ClientPlatform.BROWSER)
   };

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

@@ -78,7 +78,9 @@ describe('core/user/token_manager', () => {
     context('with endpoint setup', () => {
       let mock: fetch.Route;
       beforeEach(() => {
-        const endpoint = `${_ENDPOINT}?key=${mockAuth.config.apiKey}`;
+        const {apiKey, tokenApiHost, apiScheme} = mockAuth.config;
+        const endpoint =
+            `${apiScheme}://${tokenApiHost}/${_ENDPOINT}?key=${apiKey}`;
         mock = fetch.mock(endpoint, {
           'access_token': 'new-access-token',
           'refresh_token': 'new-refresh-token',

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

@@ -94,16 +94,16 @@ export class StsTokenManager {
       auth,
       oldToken
     );
-    this.updateTokensAndExpiration(accessToken, refreshToken, expiresIn);
+    this.updateTokensAndExpiration(accessToken || null, refreshToken || null, expiresIn || null);
   }
 
   private updateTokensAndExpiration(
-    accessToken: string | undefined,
-    refreshToken: string | undefined,
-    expiresInSec: string | undefined
+    accessToken: string | null,
+    refreshToken: string | null,
+    expiresInSec: string | null
   ): void {
-    this.refreshToken = refreshToken || null;
-    this.accessToken = accessToken || null;
+    this.refreshToken = refreshToken;
+    this.accessToken = accessToken;
     this.expirationTime = expiresInSec
       ? Date.now() + Number(expiresInSec) * 1000
       : null;

packages-exp/auth-exp/src/model/auth.d.ts

@@ -26,6 +26,7 @@ export interface Config {
   apiKey: ApiKey;
   apiHost: string;
   apiScheme: string;
+  tokenApiHost: string;
   sdkClientVersion: string;
   authDomain?: AuthDomain;
 }

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

@@ -21,6 +21,7 @@ import { Auth } from '../src/model/auth';
 import { User } from '../src/model/user';
 
 export const TEST_HOST = 'localhost';
+export const TEST_TOKEN_HOST = 'localhost/token';
 export const TEST_SCHEME = 'mock';
 export const TEST_KEY = 'test-api-key';
 
@@ -30,6 +31,7 @@ export const mockAuth: Auth = {
     apiKey: TEST_KEY,
     apiHost: TEST_HOST,
     apiScheme: TEST_SCHEME,
+    tokenApiHost: TEST_TOKEN_HOST,
     sdkClientVersion: 'testSDK/0.0.0'
   },
   currentUser: null,