Updated to use fetchApi as per ADR013

Signed-off-by: Andre Wanlin <awanlin@spotify.com>

plugins/devtools/src/alpha/plugin.tsx

@@ -22,6 +22,7 @@ import {
   createPageExtension,
   createPlugin,
   discoveryApiRef,
+  fetchApiRef,
   identityApiRef,
 } from '@backstage/frontend-plugin-api';
 
@@ -37,9 +38,13 @@ import { rootRouteRef } from '../routes';
 export const devToolsApi = createApiExtension({
   factory: createApiFactory({
     api: devToolsApiRef,
-    deps: { discoveryApi: discoveryApiRef, identityApi: identityApiRef },
-    factory: ({ discoveryApi, identityApi }) =>
-      new DevToolsClient({ discoveryApi, identityApi }),
+    deps: {
+      discoveryApi: discoveryApiRef,
+      identityApi: identityApiRef,
+      fetchApi: fetchApiRef,
+    },
+    factory: ({ discoveryApi, identityApi, fetchApi }) =>
+      new DevToolsClient({ discoveryApi, identityApi, fetchApi }),
   }),
 });
 

plugins/devtools/src/api/DevToolsClient.ts

@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 
-import { DiscoveryApi, IdentityApi } from '@backstage/core-plugin-api';
+import {
+  DiscoveryApi,
+  FetchApi,
+  IdentityApi,
+} from '@backstage/core-plugin-api';
 import {
   ConfigInfo,
   DevToolsInfo,
@@ -26,13 +30,16 @@ import { DevToolsApi } from './DevToolsApi';
 export class DevToolsClient implements DevToolsApi {
   private readonly discoveryApi: DiscoveryApi;
   private readonly identityApi: IdentityApi;
+  private readonly fetchApi: FetchApi;
 
   public constructor(options: {
     discoveryApi: DiscoveryApi;
     identityApi: IdentityApi;
+    fetchApi: FetchApi;
   }) {
     this.discoveryApi = options.discoveryApi;
     this.identityApi = options.identityApi;
+    this.fetchApi = options.fetchApi;
   }
 
   public async getConfig(): Promise<ConfigInfo | undefined> {
@@ -65,7 +72,7 @@ export class DevToolsClient implements DevToolsApi {
     const url = new URL(path, baseUrl);
 
     const { token } = await this.identityApi.getCredentials();
-    const response = await fetch(url.toString(), {
+    const response = await this.fetchApi.fetch(url.toString(), {
       headers: token ? { Authorization: `Bearer ${token}` } : {},
     });
 

plugins/devtools/src/plugin.ts

@@ -19,6 +19,7 @@ import {
   createPlugin,
   createRoutableExtension,
   discoveryApiRef,
+  fetchApiRef,
   identityApiRef,
 } from '@backstage/core-plugin-api';
 import { devToolsApiRef, DevToolsClient } from './api';
@@ -31,9 +32,13 @@ export const devToolsPlugin = createPlugin({
   apis: [
     createApiFactory({
       api: devToolsApiRef,
-      deps: { discoveryApi: discoveryApiRef, identityApi: identityApiRef },
-      factory: ({ discoveryApi, identityApi }) =>
-        new DevToolsClient({ discoveryApi, identityApi }),
+      deps: {
+        discoveryApi: discoveryApiRef,
+        identityApi: identityApiRef,
+        fetchApi: fetchApiRef,
+      },
+      factory: ({ discoveryApi, identityApi, fetchApi }) =>
+        new DevToolsClient({ discoveryApi, identityApi, fetchApi }),
     }),
   ],
   routes: {