Completed app check integration

Author: maneesht

packages/data-connect/src/api/DataConnect.ts

@@ -35,6 +35,8 @@ import { DataConnectTransport, TransportClass } from '../network';
 import { RESTTransport } from '../network/transport/rest';
 
 import { MutationManager } from './Mutation';
+import { AppCheckTokenProvider } from '../core/AppCheckTokenProvider';
+import { AppCheckInternalComponentName, FirebaseAppCheckInternal } from '@firebase/app-check-interop-types';
 
 /**
  * Connector Config for calling Data Connect backend.
@@ -89,11 +91,13 @@ export class DataConnect {
   private _transportClass: TransportClass | undefined;
   private _transportOptions?: TransportOptions;
   private _authTokenProvider?: AuthTokenProvider;
+  private _appCheckTokenProvider?: AppCheckTokenProvider
   constructor(
     public readonly app: FirebaseApp,
     // TODO(mtewani): Replace with _dataConnectOptions in the future
     private readonly dataConnectOptions: DataConnectOptions,
-    private readonly _authProvider: Provider<FirebaseAuthInternalName>
+    private readonly _authProvider: Provider<FirebaseAuthInternalName>,
+    private readonly _appCheckProvider: Provider<AppCheckInternalComponentName>
   ) {
     if (typeof process !== 'undefined' && process.env) {
       const host = process.env[FIREBASE_DATA_CONNECT_EMULATOR_HOST_VAR];
@@ -135,12 +139,16 @@ export class DataConnect {
         this._authProvider
       );
     }
+    if (this._appCheckProvider) {
+      this._appCheckTokenProvider = new AppCheckTokenProvider(this.app.name, this._appCheckProvider);
+    }
 
     this.initialized = true;
     this._transport = new this._transportClass(
       this.dataConnectOptions,
       this.app.options.apiKey,
-      this._authTokenProvider
+      this._authTokenProvider,
+      this._appCheckTokenProvider
     );
     if (this._transportOptions) {
       this._transport.useEmulator(

packages/data-connect/src/network/fetch.ts

@@ -30,7 +30,8 @@ export function dcFetch<T, U>(
   url: string,
   body: U,
   { signal }: AbortController,
-  accessToken: string | null
+  accessToken: string | null,
+  appCheckToken: string | null
 ) {
   if (!connectFetch) {
     throw new DataConnectError(Code.OTHER, 'No Fetch Implementation detected!');
@@ -42,6 +43,9 @@ export function dcFetch<T, U>(
   if (accessToken) {
     headers['X-Firebase-Auth-Token'] = accessToken;
   }
+  if (appCheckToken) {
+    headers['X-Firebase-AppCheck'] = appCheckToken;
+  }
   const bodyStr = JSON.stringify(body);
   logDebug(`Making request out to ${url} with body: ${bodyStr}`);
   return connectFetch(url, {

packages/data-connect/src/network/transport/index.ts

@@ -16,6 +16,7 @@
  */
 
 import { DataConnectOptions, TransportOptions } from '../../api/DataConnect';
+import { AppCheckTokenProvider } from '../../core/AppCheckTokenProvider';
 import { AuthTokenProvider } from '../../core/FirebaseAuthProvider';
 
 // Change this to only specify specific args.
@@ -52,6 +53,7 @@ export type TransportClass = new (
   options: DataConnectOptions,
   apiKey?: string,
   authProvider?: AuthTokenProvider,
+  appCheckProvider?: AppCheckTokenProvider,
   transportOptions?: TransportOptions
 ) => DataConnectTransport;
 export * from '../../core/FirebaseAuthProvider';

packages/data-connect/src/network/transport/rest.ts

@@ -23,6 +23,7 @@ import { addToken, urlBuilder } from '../../util/url';
 import { dcFetch } from '../fetch';
 
 import { DataConnectTransport } from '.';
+import { AppCheckTokenProvider } from '../../core/AppCheckTokenProvider';
 
 export class RESTTransport implements DataConnectTransport {
   private _host = '';
@@ -33,11 +34,13 @@ export class RESTTransport implements DataConnectTransport {
   private _project = 'p';
   private _serviceName: string;
   private _accessToken: string | null = null;
+  private _appCheckToken: string | null = null;
   private _authInitialized = false;
   constructor(
     options: DataConnectOptions,
     private apiKey?: string | undefined,
     private authProvider?: AuthTokenProvider | undefined,
+    private appCheckProvider?: AppCheckTokenProvider | undefined,
     transportOptions?: TransportOptions | undefined
   ) {
     if (transportOptions) {
@@ -68,6 +71,11 @@ export class RESTTransport implements DataConnectTransport {
       logDebug(`New Token Available: ${token}`);
       this._accessToken = token;
     });
+    this.appCheckProvider?.addTokenChangeListener(result => {
+      const { token } = result;
+      logDebug(`New App Check Token Available: ${token}`);
+      this._appCheckToken = token;
+    });
   }
   get endpointUrl(): string {
     return urlBuilder(
@@ -129,7 +137,8 @@ export class RESTTransport implements DataConnectTransport {
           variables: body
         } as unknown as U, // TODO(mtewani): This is a patch, fix this.
         abortController,
-        this._accessToken
+        this._accessToken,
+        this._appCheckToken
       );
     });
 
@@ -148,7 +157,8 @@ export class RESTTransport implements DataConnectTransport {
           variables: body
         } as unknown as U,
         abortController,
-        this._accessToken
+        this._accessToken,
+        this._appCheckToken
       );
     });
 

packages/data-connect/src/register.ts

@@ -36,6 +36,7 @@ export function registerDataConnect(variant?: string): void {
       (container, { instanceIdentifier: settings, options }) => {
         const app = container.getProvider('app').getImmediate()!;
         const authProvider = container.getProvider('auth-internal');
+        const appCheckProvider = container.getProvider('app-check-internal');
         let newOpts = options as ConnectorConfig;
         if (settings) {
           newOpts = JSON.parse(settings);
@@ -46,7 +47,8 @@ export function registerDataConnect(variant?: string): void {
         return new DataConnect(
           app,
           { ...newOpts, projectId: app.options.projectId! },
-          authProvider
+          authProvider,
+          appCheckProvider
         );
       },
       ComponentType.PUBLIC