Move ENDPOINT.TOKEN to /api/index.ts

Author: NhienLam

packages/auth/demo/src/index.js

@@ -1734,7 +1734,6 @@ function onDelete() {
   var isAppleProviderLinked = false;
 
   for (const provider of activeUser().providerData) {
-    console.log('provider.providerId: ' + provider.providerId);
     if (provider.providerId == 'apple.com') {
       isAppleProviderLinked = true;
       break;
@@ -1761,7 +1760,6 @@ function revokeAppleTokenAndDeleteUser() {
   provider.addScope('name');
 
   const auth = getAuth();
-  // TODO: Make this pop up or redirect. Can't use signInWithPopupRedirect because we need `then`.
   signInWithPopup(auth, provider).then(result => {
     // The signed-in user info.
     const user = result.user;

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

@@ -21,11 +21,11 @@ import chaiAsPromised from 'chai-as-promised';
 
 import { FirebaseError, getUA, querystringDecode } from '@firebase/util';
 
-import { HttpHeader } from '../';
+import { Endpoint, HttpHeader } from '../';
 import { testAuth, TestAuth } from '../../../test/helpers/mock_auth';
 import * as fetch from '../../../test/helpers/mock_fetch';
 import { ServerError } from '../errors';
-import { Path, requestStsToken } from './token';
+import { requestStsToken } from './token';
 import { SDK_VERSION } from '@firebase/app';
 import { _getBrowserName } from '../../core/util/browser';
 
@@ -38,7 +38,7 @@ describe('requestStsToken', () => {
   beforeEach(async () => {
     auth = await testAuth();
     const { apiKey, tokenApiHost, apiScheme } = auth.config;
-    endpoint = `${apiScheme}://${tokenApiHost}${Path.TOKEN}?key=${apiKey}`;
+    endpoint = `${apiScheme}://${tokenApiHost}${Endpoint.TOKEN}?key=${apiKey}`;
     fetch.setUp();
   });
 

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

@@ -32,10 +32,6 @@ import { FetchProvider } from '../../core/util/fetch_provider';
 import { Auth } from '../../model/public_types';
 import { AuthInternal } from '../../model/auth';
 
-export const enum Path {
-  TOKEN = '/v1/token'
-}
-
 export const enum TokenType {
   UNSPECIFIED = 'TOKEN_TYPE_UNSPECIFIED',
   REFRESH_TOKEN = 'REFRESH_TOKEN',
@@ -83,7 +79,7 @@ export async function requestStsToken(
         const url = _getFinalTarget(
           auth,
           tokenApiHost,
-          Path.TOKEN,
+          Endpoint.TOKEN,
           `key=${apiKey}`
         );
 

packages/auth/src/api/index.ts

@@ -69,6 +69,7 @@ export const enum Endpoint {
   GET_PROJECT_CONFIG = '/v1/projects',
   GET_RECAPTCHA_CONFIG = '/v2/recaptchaConfig',
   GET_PASSWORD_POLICY = '/v2/passwordPolicy',
+  TOKEN = '/v1/token',
   REVOKE_TOKEN = '/v2/accounts:revokeToken'
 }
 

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

@@ -23,11 +23,11 @@ import { FirebaseError } from '@firebase/util';
 
 import { testAuth, TestAuth } from '../../../test/helpers/mock_auth';
 import * as fetch from '../../../test/helpers/mock_fetch';
-import { Path } from '../../api/authentication/token';
 import { IdTokenResponse } from '../../model/id_token';
 import { StsTokenManager, Buffer } from './token_manager';
 import { FinalizeMfaResponse } from '../../api/authentication/mfa';
 import { makeJWT } from '../../../test/helpers/jwt';
+import { Endpoint } from '../../api';
 
 use(chaiAsPromised);
 
@@ -103,7 +103,7 @@ describe('core/user/token_manager', () => {
       let mock: fetch.Route;
       beforeEach(() => {
         const { apiKey, tokenApiHost, apiScheme } = auth.config;
-        const endpoint = `${apiScheme}://${tokenApiHost}${Path.TOKEN}?key=${apiKey}`;
+        const endpoint = `${apiScheme}://${tokenApiHost}${Endpoint.TOKEN}?key=${apiKey}`;
         mock = fetch.mock(endpoint, {
           'access_token': 'new-access-token',
           'refresh_token': 'new-refresh-token',