PR feedback

Author: sam-gc

packages/app-check/src/api.test.ts

@@ -291,7 +291,7 @@ describe('api', () => {
       const appCheck = getFakeAppCheck(app);
       const internalgetLimitedUseToken = stub(
         internalApi,
-        'getLimitedUseToken'
+        'getToken'
       ).resolves({
         token: 'a-token-string'
       });
@@ -303,7 +303,7 @@ describe('api', () => {
       const appCheck = getFakeAppCheck(app);
       // If getLimitedUseToken() errors, it returns a dummy token with an error field
       // instead of throwing.
-      stub(internalApi, 'getLimitedUseToken').resolves({
+      stub(internalApi, 'getToken').resolves({
         token: 'a-dummy-token',
         error: Error('there was an error')
       });

packages/app-check/src/api.ts

@@ -35,7 +35,6 @@ import { AppCheckService } from './factory';
 import { AppCheckProvider, ListenerType } from './types';
 import {
   getToken as getTokenInternal,
-  getLimitedUseToken as getLimitedUseTokenInternal,
   addTokenListener,
   removeTokenListener,
   isValid,
@@ -227,8 +226,10 @@ export async function getToken(
 export async function getLimitedUseToken(
   appCheckInstance: AppCheck
 ): Promise<AppCheckTokenResult> {
-  const result = await getLimitedUseTokenInternal(
-    appCheckInstance as AppCheckService
+  const result = await getTokenInternal(
+    appCheckInstance as AppCheckService,
+    /* forceRefresh */ true,
+    /* isLimitedUse */ true
   );
   if (result.error) {
     throw result.error;

packages/app-check/src/internal-api.test.ts

@@ -33,7 +33,6 @@ import {
   removeTokenListener,
   formatDummyToken,
   defaultTokenErrorData,
-  getLimitedUseToken
 } from './internal-api';
 import * as reCAPTCHA from './recaptcha';
 import * as client from './client';
@@ -46,11 +45,11 @@ import {
   setInitialState,
   getDebugState
 } from './state';
-import { AppCheckTokenListener } from './public-types';
+import { AppCheck, AppCheckTokenListener } from './public-types';
 import { Deferred } from '@firebase/util';
 import { ReCaptchaEnterpriseProvider, ReCaptchaV3Provider } from './providers';
 import { AppCheckService } from './factory';
-import { ListenerType } from './types';
+import { AppCheckTokenResult, ListenerType } from './types';
 import { AppCheckError, ERROR_FACTORY } from './errors';
 
 const fakeRecaptchaToken = 'fake-recaptcha-token';
@@ -638,15 +637,22 @@ describe('internal api', () => {
     });
   });
 
-  describe('getLimitedUseToken()', () => {
+  describe('getToken() for limited use', () => {
+    function getLimitedUseToken(appCheck: AppCheck): Promise<AppCheckTokenResult> {
+      return getToken(
+        appCheck as AppCheckService,
+        /*forceRefresh*/ true,
+        /* isLimitedUse */ true);
+    }
+
     it('uses customTokenProvider to get an AppCheck token', async () => {
       const customTokenProvider = getFakeCustomTokenProvider();
       const customProviderSpy = spy(customTokenProvider, 'getToken');
 
       const appCheck = initializeAppCheck(app, {
         provider: customTokenProvider
       });
-      const token = await getLimitedUseToken(appCheck as AppCheckService);
+      const token = await getLimitedUseToken(appCheck);
 
       expect(customProviderSpy).to.be.called;
       expect(token).to.deep.equal({
@@ -661,7 +667,7 @@ describe('internal api', () => {
       const appCheck = initializeAppCheck(app, {
         provider: customTokenProvider
       });
-      await getLimitedUseToken(appCheck as AppCheckService);
+      await getLimitedUseToken(appCheck);
 
       expect(getStateReference(app).token).to.be.undefined;
       expect(getStateReference(app).isTokenAutoRefreshEnabled).to.be.false;
@@ -680,7 +686,7 @@ describe('internal api', () => {
         'exchangeToken'
       ).returns(Promise.resolve(fakeRecaptchaAppCheckToken));
 
-      const token = await getLimitedUseToken(appCheck as AppCheckService);
+      const token = await getLimitedUseToken(appCheck);
 
       expect(reCAPTCHASpy).to.be.called;
 
@@ -703,7 +709,7 @@ describe('internal api', () => {
         'exchangeToken'
       ).returns(Promise.resolve(fakeRecaptchaAppCheckToken));
 
-      const token = await getLimitedUseToken(appCheck as AppCheckService);
+      const token = await getLimitedUseToken(appCheck);
 
       expect(reCAPTCHASpy).to.be.called;
 
@@ -726,7 +732,7 @@ describe('internal api', () => {
       const error = new Error('oops, something went wrong');
       stub(client, 'exchangeToken').returns(Promise.reject(error));
 
-      const token = await getLimitedUseToken(appCheck as AppCheckService);
+      const token = await getLimitedUseToken(appCheck);
 
       expect(reCAPTCHASpy).to.be.called;
       expect(token).to.deep.equal({
@@ -752,7 +758,7 @@ describe('internal api', () => {
         provider: new ReCaptchaV3Provider(FAKE_SITE_KEY)
       });
 
-      const token = await getLimitedUseToken(appCheck as AppCheckService);
+      const token = await getLimitedUseToken(appCheck);
       expect(exchangeTokenStub.args[0][0].body['debug_token']).to.equal(
         'my-debug-token'
       );
@@ -773,7 +779,7 @@ describe('internal api', () => {
         )
       );
 
-      const token = await getLimitedUseToken(appCheck as AppCheckService);
+      const token = await getLimitedUseToken(appCheck);
 
       // ReCaptchaV3Provider's _throttleData is private so checking
       // the resulting error message to be sure it has roughly the
@@ -799,7 +805,7 @@ describe('internal api', () => {
         )
       );
 
-      const token = await getLimitedUseToken(appCheck as AppCheckService);
+      const token = await getLimitedUseToken(appCheck);
 
       // ReCaptchaV3Provider's _throttleData is private so checking
       // the resulting error message to be sure it has roughly the