Fixes or PR feedback.

Author: DellaBitta

packages/data-connect/src/core/AppCheckTokenProvider.ts

@@ -47,7 +47,7 @@ export class AppCheckTokenProvider {
     }
   }
 
-  getToken(forceRefresh?: boolean): Promise<AppCheckTokenResult> {
+  getToken(): Promise<AppCheckTokenResult> {
     if (this.serverAppAppCheckToken) {
       return Promise.resolve({ token: this.serverAppAppCheckToken });
     }
@@ -60,14 +60,14 @@ export class AppCheckTokenProvider {
         // becomes available before the timoeout below expires.
         setTimeout(() => {
           if (this.appCheck) {
-            this.getToken(forceRefresh).then(resolve, reject);
+            this.getToken().then(resolve, reject);
           } else {
             resolve(null);
           }
         }, 0);
       });
     }
-    return this.appCheck.getToken(forceRefresh);
+    return this.appCheck.getToken();
   }
 
   addTokenChangeListener(listener: AppCheckTokenListener): void {

packages/database/src/core/AppCheckTokenProvider.ts

@@ -49,6 +49,17 @@ export class AppCheckTokenProvider {
 
   getToken(forceRefresh?: boolean): Promise<AppCheckTokenResult> {
     if (this.serverAppAppCheckToken) {
+      if (forceRefresh) {
+        return new Promise<AppCheckTokenResult>(resolve => {
+          const appCheckTokenResult = {
+            token: 'ERROR',
+            error: new Error(
+              'Attempted reuse of FirebaseServerApp.appCheckToken after previous usage failed.'
+            )
+          };
+          resolve(appCheckTokenResult);
+        });
+      }
       return Promise.resolve({ token: this.serverAppAppCheckToken });
     }
     if (!this.appCheck) {

packages/functions/src/context.ts

@@ -82,7 +82,7 @@ export class ContextProvider {
     }
 
     if (!this.appCheck) {
-      appCheckProvider.get().then(
+      appCheckProvider?.get().then(
         appCheck => (this.appCheck = appCheck),
         () => {
           /* get() never rejects */

packages/vertexai/src/models/generative-model.ts

@@ -85,7 +85,6 @@ export class GenerativeModel {
       };
 
       if (
-        vertexAI.app &&
         _isFirebaseServerApp(vertexAI.app) &&
         vertexAI.app.settings.appCheckToken
       ) {