diff --git a/plugins/catalog-import/src/api/CatalogImportClient.ts b/plugins/catalog-import/src/api/CatalogImportClient.ts index 9b52de0ba4..b812e0dda9 100644 --- a/plugins/catalog-import/src/api/CatalogImportClient.ts +++ b/plugins/catalog-import/src/api/CatalogImportClient.ts @@ -49,13 +49,16 @@ export class CatalogImportClient implements CatalogImportApi { repo: string; }): Promise { 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: { - authorization: `Bearer ${idToken}`, - 'Content-Type': 'application/json', - }, + headers, method: 'POST', body: JSON.stringify({ location: { type: 'url', target: repo }, @@ -80,13 +83,16 @@ export class CatalogImportClient implements CatalogImportApi { location: string; }): Promise { 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')}/locations`, { - headers: { - authorization: `Bearer ${idToken}`, - 'Content-Type': 'application/json', - }, + headers, method: 'POST', body: JSON.stringify({ type: 'url', diff --git a/plugins/fossa/src/api/FossaClient.ts b/plugins/fossa/src/api/FossaClient.ts index 33c8c65c5f..4428ec7dbb 100644 --- a/plugins/fossa/src/api/FossaClient.ts +++ b/plugins/fossa/src/api/FossaClient.ts @@ -39,11 +39,9 @@ export class FossaClient implements FossaApi { private async callApi(path: string): Promise { const apiUrl = `${await this.discoveryApi.getBaseUrl('proxy')}/fossa`; - const headers: Record = { - authorization: await `Bearer ${this.identityApi.getIdToken()}`, - }; + const idToken = await this.identityApi.getIdToken(); const response = await fetch(`${apiUrl}/${path}`, { - headers, + headers: idToken ? { authorization: `Bearer ${idToken}` } : {}, }); if (response.status === 200) { return await response.json(); diff --git a/plugins/kubernetes/src/api/KubernetesBackendClient.ts b/plugins/kubernetes/src/api/KubernetesBackendClient.ts index e005b29517..96bdb9420f 100644 --- a/plugins/kubernetes/src/api/KubernetesBackendClient.ts +++ b/plugins/kubernetes/src/api/KubernetesBackendClient.ts @@ -39,12 +39,15 @@ export class KubernetesBackendClient implements KubernetesApi { ): Promise { 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: { - authorization: `Bearer ${idToken}`, - 'Content-Type': 'application/json', - }, + headers, body: JSON.stringify(requestBody), }); diff --git a/plugins/rollbar/src/api/RollbarClient.ts b/plugins/rollbar/src/api/RollbarClient.ts index 1041accf19..dfc82b09e5 100644 --- a/plugins/rollbar/src/api/RollbarClient.ts +++ b/plugins/rollbar/src/api/RollbarClient.ts @@ -60,9 +60,7 @@ export class RollbarClient implements RollbarApi { const url = `${await this.discoveryApi.getBaseUrl('rollbar')}${path}`; const idToken = await this.identityApi.getIdToken(); const response = await fetch(url, { - headers: { - authorization: `Bearer ${idToken}`, - }, + headers: idToken ? { authorization: `Bearer ${idToken}` } : {}, }); if (!response.ok) {