From 493eab8c577f7effbe5bc6691b4ef5d8ed9533c8 Mon Sep 17 00:00:00 2001
From: Niklas Aronsson <niklasar@axis.com>
Date: Wed, 14 Jun 2023 10:53:29 +0200
Subject: [PATCH] catalog-unprocessed-entities: use FetchApi instead of native
 fetch

Token auth fails if native fetch is used.

Signed-off-by: Niklas Aronsson <niklasar@axis.com>
---
 .changeset/tender-clouds-run.md                       |  5 +++++
 plugins/catalog-unprocessed-entities/src/api/index.ts | 10 +++++++---
 plugins/catalog-unprocessed-entities/src/plugin.ts    |  7 ++++---
 3 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/tender-clouds-run.md

diff --git a/.changeset/tender-clouds-run.md b/.changeset/tender-clouds-run.md
new file mode 100644
index 0000000000..cff94c9e7f
--- /dev/null
+++ b/.changeset/tender-clouds-run.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-unprocessed-entities': patch
+---
+
+Use FetchApi instead of native fetch
diff --git a/plugins/catalog-unprocessed-entities/src/api/index.ts b/plugins/catalog-unprocessed-entities/src/api/index.ts
index a4f2294aac..5be81c8331 100644
--- a/plugins/catalog-unprocessed-entities/src/api/index.ts
+++ b/plugins/catalog-unprocessed-entities/src/api/index.ts
@@ -13,7 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { DiscoveryApi, createApiRef } from '@backstage/core-plugin-api';
+import {
+  DiscoveryApi,
+  createApiRef,
+  FetchApi,
+} from '@backstage/core-plugin-api';
 import { ResponseError } from '@backstage/errors';
 import { UnprocessedEntity } from '../types';
 
@@ -35,13 +39,13 @@ export const catalogUnprocessedEntitiesApiRef =
 export class CatalogUnprocessedEntitiesApi {
   url: string = '';
 
-  constructor(public discovery: DiscoveryApi) {}
+  constructor(public discovery: DiscoveryApi, public fetchApi: FetchApi) {}
 
   private async fetch<T>(path: string, init?: RequestInit): Promise<T> {
     if (!this.url) {
       this.url = await this.discovery.getBaseUrl('catalog');
     }
-    const resp = await fetch(`${this.url}/${path}`, init);
+    const resp = await this.fetchApi.fetch(`${this.url}/${path}`, init);
     if (!resp.ok) {
       throw await ResponseError.fromResponse(resp);
     }
diff --git a/plugins/catalog-unprocessed-entities/src/plugin.ts b/plugins/catalog-unprocessed-entities/src/plugin.ts
index 88d3ed45ea..14598c825b 100644
--- a/plugins/catalog-unprocessed-entities/src/plugin.ts
+++ b/plugins/catalog-unprocessed-entities/src/plugin.ts
@@ -18,6 +18,7 @@ import {
   createPlugin,
   createRoutableExtension,
   discoveryApiRef,
+  fetchApiRef,
 } from '@backstage/core-plugin-api';
 
 import { rootRouteRef } from './routes';
@@ -39,9 +40,9 @@ export const catalogUnprocessedEntitiesPlugin = createPlugin({
   apis: [
     createApiFactory({
       api: catalogUnprocessedEntitiesApiRef,
-      deps: { discoveryApi: discoveryApiRef },
-      factory: ({ discoveryApi }) =>
-        new CatalogUnprocessedEntitiesApi(discoveryApi),
+      deps: { discoveryApi: discoveryApiRef, fetchApi: fetchApiRef },
+      factory: ({ discoveryApi, fetchApi }) =>
+        new CatalogUnprocessedEntitiesApi(discoveryApi, fetchApi),
     }),
   ],
 });