Rebase and fix tests

Author: hsubox76

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

@@ -16,7 +16,7 @@
  */
 import '../test/setup';
 import { expect } from 'chai';
-import { stub, spy } from 'sinon';
+import { stub, spy, SinonStub } from 'sinon';
 import {
   activate,
   setTokenAutoRefreshEnabled,
@@ -126,25 +126,35 @@ describe('api', () => {
     });
   });
   describe('onTokenChanged()', () => {
+    let storageReadStub: SinonStub;
+    let storageWriteStub: SinonStub;
+    const fakePlatformLoggingProvider = getFakePlatformLoggingProvider();
+    const fakeRecaptchaToken = 'fake-recaptcha-token';
+    const fakeRecaptchaAppCheckToken = {
+      token: 'fake-recaptcha-app-check-token',
+      expireTimeMillis: Date.now() + 60000,
+      issuedAtTimeMillis: 0
+    };
+
+    beforeEach(() => {
+      storageReadStub = stub(storage, 'readTokenFromStorage').resolves(
+        undefined
+      );
+      storageWriteStub = stub(storage, 'writeTokenToStorage');
+    });
     afterEach(() => {
+      storageReadStub.restore();
+      storageWriteStub.restore();
       clearState();
       removegreCAPTCHAScriptsOnPage();
     });
     it('Listeners work when using top-level parameters pattern', async () => {
-      const app = getFakeApp({ automaticDataCollectionEnabled: true });
-      activate(app, FAKE_SITE_KEY, true);
-      const fakePlatformLoggingProvider = getFakePlatformLoggingProvider();
-      const fakeRecaptchaToken = 'fake-recaptcha-token';
-      const fakeRecaptchaAppCheckToken = {
-        token: 'fake-recaptcha-app-check-token',
-        expireTimeMillis: 123,
-        issuedAtTimeMillis: 0
-      };
+      const app = getFakeApp();
+      activate(app, FAKE_SITE_KEY, false);
       stub(reCAPTCHA, 'getToken').returns(Promise.resolve(fakeRecaptchaToken));
       stub(client, 'exchangeToken').returns(
         Promise.resolve(fakeRecaptchaAppCheckToken)
       );
-      stub(storage, 'writeTokenToStorage').returns(Promise.resolve(undefined));
 
       const listener1 = (): void => {
         throw new Error();
@@ -183,20 +193,12 @@ describe('api', () => {
     });
 
     it('Listeners work when using Observer pattern', async () => {
-      const app = getFakeApp({ automaticDataCollectionEnabled: true });
-      activate(app, FAKE_SITE_KEY, true);
-      const fakePlatformLoggingProvider = getFakePlatformLoggingProvider();
-      const fakeRecaptchaToken = 'fake-recaptcha-token';
-      const fakeRecaptchaAppCheckToken = {
-        token: 'fake-recaptcha-app-check-token',
-        expireTimeMillis: 123,
-        issuedAtTimeMillis: 0
-      };
+      const app = getFakeApp();
+      activate(app, FAKE_SITE_KEY, false);
       stub(reCAPTCHA, 'getToken').returns(Promise.resolve(fakeRecaptchaToken));
       stub(client, 'exchangeToken').returns(
         Promise.resolve(fakeRecaptchaAppCheckToken)
       );
-      stub(storage, 'writeTokenToStorage').returns(Promise.resolve(undefined));
 
       const listener1 = (): void => {
         throw new Error();
@@ -238,11 +240,8 @@ describe('api', () => {
       stub(logger.logger, 'error');
       const app = getFakeApp();
       activate(app, FAKE_SITE_KEY, false);
-      const fakePlatformLoggingProvider = getFakePlatformLoggingProvider();
-      const fakeRecaptchaToken = 'fake-recaptcha-token';
       stub(reCAPTCHA, 'getToken').returns(Promise.resolve(fakeRecaptchaToken));
       stub(client, 'exchangeToken').rejects('exchange error');
-      stub(storage, 'writeTokenToStorage').returns(Promise.resolve(undefined));
 
       const listener1 = spy();
 

packages/app-check/src/factory.ts

@@ -39,8 +39,10 @@ import { PartialObserver } from '@firebase/util';
 import { FirebaseService } from '@firebase/app-types/private';
 import { getState } from './state';
 
-export function factory(app: FirebaseApp,
-  platformLoggerProvider: Provider<'platform-logger'>): FirebaseAppCheck & FirebaseService {
+export function factory(
+  app: FirebaseApp,
+  platformLoggerProvider: Provider<'platform-logger'>
+): FirebaseAppCheck & FirebaseService {
   return {
     app,
     activate: (

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

@@ -39,8 +39,8 @@ import * as logger from './logger';
 import * as client from './client';
 import * as storage from './storage';
 import { getState, clearState, setState, getDebugState } from './state';
-import { AppCheckTokenResult } from '@firebase/app-check-interop-types';
 import { Deferred } from '@firebase/util';
+import { AppCheckTokenResult } from '../../app-check-interop-types';
 
 const fakePlatformLoggingProvider = getFakePlatformLoggingProvider();
 
@@ -179,7 +179,7 @@ describe('internal api', () => {
     it('calls optional error handler if there is an error getting a token', async () => {
       stub(logger.logger, 'error');
       activate(app, FAKE_SITE_KEY, false);
-      stub(reCAPTCHA, 'getToken').returns(Promise.resolve(fakeRecaptchaToken));
+      stub(reCAPTCHA, 'getToken').resolves(fakeRecaptchaToken);
       stub(client, 'exchangeToken').rejects('exchange error');
       const listener1 = spy();
 
@@ -392,24 +392,23 @@ describe('internal api', () => {
     });
 
     it('notifies the listener with the valid token in storage', done => {
-      const clock = useFakeTimers();
       activate(app, FAKE_SITE_KEY);
       storageReadStub.resolves({
         token: `fake-cached-app-check-token`,
-        expireTimeMillis: 123,
+        expireTimeMillis: Date.now() + 60000,
         issuedAtTimeMillis: 0
       });
 
+      // Need to use done() if the callback will be called by the
+      // refresher.
       const fakeListener = (token: AppCheckTokenResult): void => {
         expect(token).to.deep.equal({
           token: `fake-cached-app-check-token`
         });
-        clock.restore();
         done();
       };
 
       addTokenListener(app, fakePlatformLoggingProvider, fakeListener);
-      clock.tick(1);
     });
 
     it('notifies the listener with the debug token immediately', async () => {