Fix app check

Author: hsubox76

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

@@ -39,8 +39,9 @@ import * as client from './client';
 import * as storage from './storage';
 import * as internalApi from './internal-api';
 import { deleteApp, FirebaseApp } from '@firebase/app-exp';
-import { ReCaptchaV3Provider } from './providers';
+import { CustomProvider, ReCaptchaV3Provider } from './providers';
 import { AppCheckService } from './factory';
+import { AppCheckToken } from './public-types';
 
 describe('api', () => {
   let app: FirebaseApp;
@@ -57,16 +58,65 @@ describe('api', () => {
   });
 
   describe('initializeAppCheck()', () => {
-    it('can only be called once', () => {
+    it('can only be called once (if given different provider classes)', () => {
       initializeAppCheck(app, {
         provider: new ReCaptchaV3Provider(FAKE_SITE_KEY)
       });
       expect(() =>
         initializeAppCheck(app, {
-          provider: new ReCaptchaV3Provider(FAKE_SITE_KEY)
+          provider: new CustomProvider({
+            getToken: () => Promise.resolve({ token: 'mm' } as AppCheckToken)
+          })
+        })
+      ).to.throw(/appCheck\/already-initialized/);
+    });
+    it('can only be called once (if given different ReCaptchaV3Providers)', () => {
+      initializeAppCheck(app, {
+        provider: new ReCaptchaV3Provider(FAKE_SITE_KEY)
+      });
+      expect(() =>
+        initializeAppCheck(app, {
+          provider: new ReCaptchaV3Provider(FAKE_SITE_KEY + 'X')
         })
       ).to.throw(/appCheck\/already-initialized/);
     });
+    it('can only be called once (if given different CustomProviders)', () => {
+      initializeAppCheck(app, {
+        provider: new CustomProvider({
+          getToken: () => Promise.resolve({ token: 'ff' } as AppCheckToken)
+        })
+      });
+      expect(() =>
+        initializeAppCheck(app, {
+          provider: new CustomProvider({
+            getToken: () => Promise.resolve({ token: 'gg' } as AppCheckToken)
+          })
+        })
+      ).to.throw(/appCheck\/already-initialized/);
+    });
+    it('can be called multiple times (if given equivalent ReCaptchaV3Providers)', () => {
+      const appCheckInstance = initializeAppCheck(app, {
+        provider: new ReCaptchaV3Provider(FAKE_SITE_KEY)
+      });
+      expect(initializeAppCheck(app, {
+          provider: new ReCaptchaV3Provider(FAKE_SITE_KEY)
+        })
+      ).to.equal(appCheckInstance);
+    });
+    it('can be called multiple times (if given equivalent CustomProviders)', () => {
+      const appCheckInstance = initializeAppCheck(app, {
+        provider: new CustomProvider({
+          getToken: () => Promise.resolve({ token: 'ff' } as AppCheckToken)
+        })
+      });
+      expect(
+        initializeAppCheck(app, {
+          provider: new CustomProvider({
+            getToken: () => Promise.resolve({ token: 'ff' } as AppCheckToken)
+          })
+        })
+      ).to.equal(appCheckInstance);
+    });
 
     it('initialize reCAPTCHA when a ReCaptchaV3Provider is provided', () => {
       const initReCAPTCHAStub = stub(reCAPTCHA, 'initialize').returns(

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

@@ -25,15 +25,14 @@ import {
 import { ERROR_FACTORY, AppCheckError } from './errors';
 import { getState, setState, AppCheckState } from './state';
 import { FirebaseApp, getApp, _getProvider } from '@firebase/app-exp';
-import { getModularInstance, ErrorFn, NextFn, deepEqual } from '@firebase/util';
+import { getModularInstance, ErrorFn, NextFn } from '@firebase/util';
 import { AppCheckService } from './factory';
 import { AppCheckProvider, ListenerType } from './types';
 import {
   getToken as getTokenInternal,
   addTokenListener,
   removeTokenListener
 } from './internal-api';
-import { CustomProvider, ReCaptchaV3Provider } from './providers';
 
 declare module '@firebase/component' {
   interface NameServiceMapping {

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

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { AppCheck, AppCheckOptions } from './public-types';
+import { AppCheck } from './public-types';
 import { FirebaseApp, _FirebaseService } from '@firebase/app-exp';
 import { FirebaseAppCheckInternal, ListenerType } from './types';
 import {
@@ -32,8 +32,7 @@ import { getState } from './state';
 export class AppCheckService implements AppCheck, _FirebaseService {
   constructor(
     public app: FirebaseApp,
-    public platformLoggerProvider: Provider<'platform-logger'>,
-    public options: AppCheckOptions
+    public platformLoggerProvider: Provider<'platform-logger'>
   ) {}
   _delete(): Promise<void> {
     const { tokenObservers } = getState(this.app);
@@ -46,10 +45,9 @@ export class AppCheckService implements AppCheck, _FirebaseService {
 
 export function factory(
   app: FirebaseApp,
-  platformLoggerProvider: Provider<'platform-logger'>,
-  options: AppCheckOptions
+  platformLoggerProvider: Provider<'platform-logger'>
 ): AppCheckService {
-  return new AppCheckService(app, platformLoggerProvider, options);
+  return new AppCheckService(app, platformLoggerProvider);
 }
 
 export function internalFactory(

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

@@ -138,7 +138,10 @@ export class CustomProvider implements AppCheckProvider {
    */
   isEqual(otherProvider: unknown): boolean {
     if (otherProvider instanceof CustomProvider) {
-      return this.getToken.toString() === otherProvider.getToken.toString();
+      return (
+        this._customProviderOptions.getToken.toString() ===
+        otherProvider._customProviderOptions.getToken.toString()
+      );
     } else {
       return false;
     }