Address PR comments

Author: hsubox76

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

@@ -18,12 +18,7 @@ import '../test/setup';
 import { expect } from 'chai';
 import { stub } from 'sinon';
 import { setTokenAutoRefreshEnabled, initializeAppCheck } from './api';
-import {
-  FAKE_SITE_KEY,
-  getFullApp,
-  getFakeApp,
-  getFakeCustomTokenProvider
-} from '../test/util';
+import { FAKE_SITE_KEY, getFullApp, getFakeApp } from '../test/util';
 import { getState } from './state';
 import * as reCAPTCHA from './recaptcha';
 import { deleteApp, FirebaseApp } from '@firebase/app-exp';
@@ -52,7 +47,7 @@ describe('api', () => {
       ).to.throw(/appCheck\/already-initialized/);
     });
 
-    it('initialize reCAPTCHA when a sitekey is provided', () => {
+    it('initialize reCAPTCHA when a ReCaptchaV3Provider is provided', () => {
       const initReCAPTCHAStub = stub(reCAPTCHA, 'initialize').returns(
         Promise.resolve({} as any)
       );
@@ -65,16 +60,6 @@ describe('api', () => {
       );
     });
 
-    it('does NOT initialize reCAPTCHA when a custom token provider is provided', () => {
-      const fakeCustomTokenProvider = getFakeCustomTokenProvider();
-      const initReCAPTCHAStub = stub(reCAPTCHA, 'initialize');
-      initializeAppCheck(app, {
-        provider: fakeCustomTokenProvider
-      });
-      expect(getState(app).provider).to.equal(fakeCustomTokenProvider);
-      expect(initReCAPTCHAStub).to.have.not.been.called;
-    });
-
     it('sets activated to true', () => {
       expect(getState(app).activated).to.equal(false);
       initializeAppCheck(app, {

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

@@ -65,8 +65,6 @@ export function initializeAppCheck(
  * refreshes App Check tokens as needed. If undefined, defaults to the
  * value of `app.automaticDataCollectionEnabled`, which defaults to
  * false and can be set in the app config.
- *
- * @internal
  */
 function _activate(
   app: FirebaseApp,

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

@@ -87,7 +87,7 @@ describe('internal api', () => {
       clock.restore();
     });
 
-    it('uses reCAPTCHA token to exchange for AppCheck token if no customTokenProvider is provided', async () => {
+    it('uses reCAPTCHA token to exchange for AppCheck token', async () => {
       initializeAppCheck(app, {
         provider: new ReCaptchaV3Provider(FAKE_SITE_KEY)
       });
@@ -282,7 +282,11 @@ describe('internal api', () => {
 
       stub(reCAPTCHA, 'getToken').returns(Promise.resolve(fakeRecaptchaToken));
       stub(client, 'exchangeToken').returns(
-        Promise.resolve(fakeRecaptchaAppCheckToken)
+        Promise.resolve({
+          token: 'new-recaptcha-app-check-token',
+          expireTimeMillis: 345,
+          issuedAtTimeMillis: 0
+        })
       );
 
       expect(

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

@@ -104,9 +104,10 @@ export async function getToken(
    * request a new token
    */
   try {
-    if (state.provider) {
-      token = await state.provider.getToken();
-    }
+    // state.provider is populated in initializeAppCheck()
+    // ensureActivated() at the top of this function checks that
+    // initializeAppCheck() has been called.
+    token = await state.provider!.getToken();
   } catch (e) {
     // `getToken()` should never throw, but logging error text to console will aid debugging.
     logger.error(e);