Test fixes

Author: hsubox76

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

@@ -52,7 +52,8 @@ describe('client', () => {
   });
 
   it('returns a AppCheck token', async () => {
-    useFakeTimers();
+    // To get a consistent expireTime/issuedAtTime.
+    const clock = useFakeTimers();
     fetchStub.returns(
       Promise.resolve({
         status: 200,
@@ -77,6 +78,7 @@ describe('client', () => {
       expireTimeMillis: 3600,
       issuedAtTimeMillis: 0
     });
+    clock.restore();
   });
 
   it('throws when there is a network error', async () => {

packages/app-check/src/factory.ts

@@ -36,18 +36,19 @@ import {
 import { Provider } from '@firebase/component';
 import { PartialObserver } from '@firebase/util';
 
-export function factory(
-  app: FirebaseApp,
-  platformLoggerProvider: Provider<'platform-logger'>
-): FirebaseAppCheck {
+import { FirebaseService } from '@firebase/app-types/private';
+import { getState } from './state';
+
+export function factory(app: FirebaseApp,
+  platformLoggerProvider: Provider<'platform-logger'>): FirebaseAppCheck & FirebaseService {
   return {
+    app,
     activate: (
       siteKeyOrProvider: string | AppCheckProvider,
       isTokenAutoRefreshEnabled?: boolean
     ) => activate(app, siteKeyOrProvider, isTokenAutoRefreshEnabled),
     setTokenAutoRefreshEnabled: (isTokenAutoRefreshEnabled: boolean) =>
       setTokenAutoRefreshEnabled(app, isTokenAutoRefreshEnabled),
-
     getToken: forceRefresh =>
       getToken(app, platformLoggerProvider, forceRefresh),
     onTokenChanged: (
@@ -68,7 +69,16 @@ export function factory(
         onNextOrObserver as (tokenResult: AppCheckTokenResult) => void,
         onError,
         onCompletion
-      )
+      ),
+    INTERNAL: {
+      delete: () => {
+        const { tokenObservers } = getState(app);
+        for (const tokenObserver of tokenObservers) {
+          removeTokenListener(app, tokenObserver.next);
+        }
+        return Promise.resolve();
+      }
+    }
   };
 }
 

packages/app-check/src/indexeddb.ts

@@ -73,20 +73,16 @@ function getDBPromise(): Promise<IDBDatabase> {
 }
 
 export function readTokenFromIndexedDB(
-  app: FirebaseApp,
-  keySuffix?: string
+  app: FirebaseApp
 ): Promise<AppCheckTokenInternal | undefined> {
-  return read(computeKey(app, keySuffix)) as Promise<
-    AppCheckTokenInternal | undefined
-  >;
+  return read(computeKey(app)) as Promise<AppCheckTokenInternal | undefined>;
 }
 
 export function writeTokenToIndexedDB(
   app: FirebaseApp,
-  token: AppCheckTokenInternal,
-  keySuffix?: string
+  token: AppCheckTokenInternal
 ): Promise<void> {
-  return write(computeKey(app, keySuffix), token);
+  return write(computeKey(app), token);
 }
 
 export function writeDebugTokenToIndexedDB(token: string): Promise<void> {
@@ -150,10 +146,6 @@ async function read(key: string): Promise<unknown> {
   });
 }
 
-function computeKey(app: FirebaseApp, keySuffix?: string): string {
-  let key = `${app.options.appId}-${app.name}`;
-  if (keySuffix != null) {
-    key += `-${keySuffix}`;
-  }
-  return key;
+function computeKey(app: FirebaseApp): string {
+  return `${app.options.appId}-${app.name}`;
 }