Remove functions changes

Author: hsubox76

packages-exp/functions-exp/src/config.ts

@@ -24,10 +24,7 @@ import {
   InstanceFactory
 } from '@firebase/component';
 import { FUNCTIONS_TYPE } from './constants';
-import { AppCheckInternalComponentName } from '@firebase/app-check-interop-types';
 
-const APP_CHECK_INTERNAL_NAME: AppCheckInternalComponentName =
-  'app-check-internal';
 export function registerFunctions(fetchImpl: typeof fetch): void {
   const factory: InstanceFactory<'functions-exp'> = (
     container: ComponentContainer,
@@ -37,14 +34,12 @@ export function registerFunctions(fetchImpl: typeof fetch): void {
     const app = container.getProvider('app-exp').getImmediate();
     const authProvider = container.getProvider('auth-internal');
     const messagingProvider = container.getProvider('messaging');
-    const appCheckProvider = container.getProvider(APP_CHECK_INTERNAL_NAME);
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     return new FunctionsService(
       app,
       authProvider,
       messagingProvider,
-      appCheckProvider,
       regionOrCustomDomain,
       fetchImpl
     );

packages-exp/functions-exp/src/context.ts

@@ -23,10 +23,6 @@ import {
   FirebaseAuthInternalName
 } from '@firebase/auth-interop-types';
 import { Provider } from '@firebase/component';
-import {
-  AppCheckInternalComponentName,
-  FirebaseAppCheckInternal
-} from '@firebase/app-check-interop-types';
 
 /**
  * The metadata that should be supplied with function calls.
@@ -35,7 +31,6 @@ import {
 export interface Context {
   authToken?: string;
   messagingToken?: string;
-  appCheckToken: string | null;
 }
 
 /**
@@ -45,11 +40,9 @@ export interface Context {
 export class ContextProvider {
   private auth: FirebaseAuthInternal | null = null;
   private messaging: FirebaseMessaging | null = null;
-  private appCheck: FirebaseAppCheckInternal | null = null;
   constructor(
     authProvider: Provider<FirebaseAuthInternalName>,
-    messagingProvider: Provider<FirebaseMessagingName>,
-    appCheckProvider: Provider<AppCheckInternalComponentName>
+    messagingProvider: Provider<FirebaseMessagingName>
   ) {
     this.auth = authProvider.getImmediate({ optional: true });
     this.messaging = messagingProvider.getImmediate({
@@ -73,10 +66,6 @@ export class ContextProvider {
         }
       );
     }
-
-    if (!this.appCheck) {
-      this.appCheck = appCheckProvider.getImmediate({ optional: true });
-    }
   }
 
   async getAuthToken(): Promise<string | undefined> {
@@ -113,22 +102,9 @@ export class ContextProvider {
     }
   }
 
-  async getAppCheckToken(): Promise<string | null> {
-    if (this.appCheck) {
-      const result = await this.appCheck.getToken();
-      // If getToken() fails, it will still return a dummy token that also has
-      // an error field containing the error message. We will send any token
-      // provided here and show an error if/when it is rejected by the functions
-      // endpoint.
-      return result.token;
-    }
-    return null;
-  }
-
   async getContext(): Promise<Context> {
     const authToken = await this.getAuthToken();
     const messagingToken = await this.getMessagingToken();
-    const appCheckToken = await this.getAppCheckToken();
-    return { authToken, messagingToken, appCheckToken };
+    return { authToken, messagingToken };
   }
 }

packages-exp/functions-exp/src/service.ts

@@ -27,7 +27,6 @@ import { encode, decode } from './serializer';
 import { Provider } from '@firebase/component';
 import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
 import { FirebaseMessagingName } from '@firebase/messaging-types';
-import { AppCheckInternalComponentName } from '@firebase/app-check-interop-types';
 
 export const DEFAULT_REGION = 'us-central1';
 
@@ -87,15 +86,10 @@ export class FunctionsService implements _FirebaseService {
     readonly app: FirebaseApp,
     authProvider: Provider<FirebaseAuthInternalName>,
     messagingProvider: Provider<FirebaseMessagingName>,
-    appCheckProvider: Provider<AppCheckInternalComponentName>,
     regionOrCustomDomain: string = DEFAULT_REGION,
     readonly fetchImpl: typeof fetch
   ) {
-    this.contextProvider = new ContextProvider(
-      authProvider,
-      messagingProvider,
-      appCheckProvider
-    );
+    this.contextProvider = new ContextProvider(authProvider, messagingProvider);
     // Cancels all ongoing requests when resolved.
     this.cancelAllRequests = new Promise(resolve => {
       this.deleteService = () => {
@@ -240,9 +234,6 @@ async function call(
   if (context.messagingToken) {
     headers['Firebase-Instance-ID-Token'] = context.messagingToken;
   }
-  if (context.appCheckToken !== null) {
-    headers['X-Firebase-AppCheck'] = context.appCheckToken;
-  }
 
   // Default timeout to 70s, but let the options override it.
   const timeout = options.timeout || 70000;