update custom headers assignment logic and values; add gen flag functionality back for future deprecation

Author: stephenarosaj

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

@@ -33,7 +33,12 @@ import {
 } from '../core/FirebaseAuthProvider';
 import { QueryManager } from '../core/QueryManager';
 import { logDebug, logError } from '../logger';
-import { CallerSdkType, CallerSdkTypeEnum, DataConnectTransport, TransportClass } from '../network';
+import {
+  CallerSdkType,
+  CallerSdkTypeEnum,
+  DataConnectTransport,
+  TransportClass
+} from '../network';
 import { RESTTransport } from '../network/transport/rest';
 
 import { MutationManager } from './Mutation';
@@ -91,6 +96,7 @@ export class DataConnect {
   private _transportClass: TransportClass | undefined;
   private _transportOptions?: TransportOptions;
   private _authTokenProvider?: AuthTokenProvider;
+  _isUsingGeneratedSdk: boolean = false;
   _callerSdkType: CallerSdkType = CallerSdkTypeEnum.Base;
   private _appCheckTokenProvider?: AppCheckTokenProvider;
   // @internal
@@ -111,6 +117,12 @@ export class DataConnect {
     }
   }
   // @internal
+  _useGeneratedSdk(): void {
+    if (!this._isUsingGeneratedSdk) {
+      this._isUsingGeneratedSdk = true;
+    }
+  }
+  // @internal
   _setCallerSdkType(callerSdkType: CallerSdkType): void {
     this._callerSdkType = callerSdkType;
   }
@@ -162,6 +174,7 @@ export class DataConnect {
       this._authTokenProvider,
       this._appCheckTokenProvider,
       undefined,
+      this._isUsingGeneratedSdk,
       this._callerSdkType
     );
     if (this._transportOptions) {

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

@@ -27,16 +27,13 @@ export function initializeFetch(fetchImpl: typeof fetch): void {
 }
 function getGoogApiClientValue(_callerSdkType: CallerSdkType): string {
   let str = 'gl-js/ fire/' + SDK_VERSION;
-  if (_callerSdkType !== CallerSdkTypeEnum.Base) {
+  if (_callerSdkType === CallerSdkTypeEnum.Generated) {
     str += ' js/gen';
+  } else if (_callerSdkType !== CallerSdkTypeEnum.Base) {
+    str += ' js/' + _callerSdkType.toLowerCase();
   }
   return str;
 }
-function getWebFrameworkValue(
-  _callerSdkType: CallerSdkType
-): string {
-  return _callerSdkType + "/";
-}
 export interface DataConnectFetchBody<T> {
   name: string;
   operationName: string;
@@ -49,16 +46,15 @@ export function dcFetch<T, U>(
   appId: string | null,
   accessToken: string | null,
   appCheckToken: string | null,
+  _isUsingGen: boolean,
   _callerSdkType: CallerSdkType
 ): Promise<{ data: T; errors: Error[] }> {
   if (!connectFetch) {
     throw new DataConnectError(Code.OTHER, 'No Fetch Implementation detected!');
   }
   const headers: HeadersInit = {
     'Content-Type': 'application/json',
-    'X-Goog-Api-Client': getGoogApiClientValue(_callerSdkType),
-    'X-Firebase-DataConnect-Web-Frameworks':
-      getWebFrameworkValue(_callerSdkType)
+    'X-Goog-Api-Client': getGoogApiClientValue(_callerSdkType)
   };
   if (accessToken) {
     headers['X-Firebase-Auth-Token'] = accessToken;

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

@@ -67,5 +67,6 @@ export type TransportClass = new (
   authProvider?: AuthTokenProvider,
   appCheckProvider?: AppCheckTokenProvider,
   transportOptions?: TransportOptions,
-  _callerSdkType?: CallerSdkType
+  _isUsingGen?: boolean,
+    _callerSdkType?: CallerSdkType
 ) => DataConnectTransport;

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

@@ -43,6 +43,7 @@ export class RESTTransport implements DataConnectTransport {
     private authProvider?: AuthTokenProvider | undefined,
     private appCheckProvider?: AppCheckTokenProvider | undefined,
     transportOptions?: TransportOptions | undefined,
+    private _isUsingGen = false,
     private _callerSdkType: CallerSdkType = CallerSdkTypeEnum.Base,
   ) {
     if (transportOptions) {
@@ -180,6 +181,7 @@ export class RESTTransport implements DataConnectTransport {
         this.appId,
         this._accessToken,
         this._appCheckToken,
+        this._isUsingGen,
         this._callerSdkType
       )
     );
@@ -205,6 +207,7 @@ export class RESTTransport implements DataConnectTransport {
         this.appId,
         this._accessToken,
         this._appCheckToken,
+        this._isUsingGen,
         this._callerSdkType
       );
     });

packages/data-connect/test/unit/fetch.test.ts

@@ -52,6 +52,7 @@ describe('fetch', () => {
         null,
         null,
         null,
+        false,
         CallerSdkTypeEnum.Base
       )
     ).to.eventually.be.rejectedWith(message);
@@ -75,6 +76,7 @@ describe('fetch', () => {
         null,
         null,
         null,
+        false,
         CallerSdkTypeEnum.Base
       )
     ).to.eventually.be.rejectedWith(JSON.stringify(json));