inline optional id token auth headers

packages/catalog-client/src/CatalogClient.ts

@@ -89,18 +89,15 @@ export class CatalogClient implements CatalogApi {
     { type = 'url', target, dryRun, presence }: AddLocationRequest,
     options?: CatalogRequestOptions,
   ): Promise<AddLocationResponse> {
-    const headers = {
-      'Content-Type': 'application/json',
-    } as { [header: string]: string };
-    if (options?.token) {
-      headers.authorization = `Bearer ${options.token}`;
-    }
     const response = await fetch(
       `${await this.discoveryApi.getBaseUrl('catalog')}/locations${
         dryRun ? '?dryRun=true' : ''
       }`,
       {
-        headers,
+        headers: {
+          'Content-Type': 'application/json',
+          ...(options?.token && { Authorization: `Bearer ${options?.token}` }),
+        },
         method: 'POST',
         body: JSON.stringify({ type, target, presence }),
       },

plugins/catalog-import/src/api/CatalogImportClient.ts

@@ -133,16 +133,13 @@ export class CatalogImportClient implements CatalogImportApi {
     repo: string;
   }): Promise<PartialEntity[]> {
     const idToken = await this.identityApi.getIdToken();
-    const headers = {
-      'Content-Type': 'application/json',
-    } as { [header: string]: string };
-    if (idToken) {
-      headers.authorization = `Bearer ${idToken}`;
-    }
     const response = await fetch(
       `${await this.discoveryApi.getBaseUrl('catalog')}/analyze-location`,
       {
-        headers,
+        headers: {
+          'Content-Type': 'application/json',
+          ...(idToken && { Authorization: `Bearer ${idToken}` }),
+        },
         method: 'POST',
         body: JSON.stringify({
           location: { type: 'url', target: repo },

plugins/kubernetes/src/api/KubernetesBackendClient.ts

@@ -39,15 +39,12 @@ export class KubernetesBackendClient implements KubernetesApi {
   ): Promise<any> {
     const url = `${await this.discoveryApi.getBaseUrl('kubernetes')}${path}`;
     const idToken = await this.identityApi.getIdToken();
-    const headers = {
-      'Content-Type': 'application/json',
-    } as { [header: string]: string };
-    if (idToken) {
-      headers.authorization = `Bearer ${idToken}`;
-    }
     const response = await fetch(url, {
       method: 'POST',
-      headers,
+      headers: {
+        'Content-Type': 'application/json',
+        ...(idToken && { Authorization: `Bearer ${idToken}` }),
+      },
       body: JSON.stringify(requestBody),
     });