From 73353737d95b6f4b574d5cbedffa3230278e85ba Mon Sep 17 00:00:00 2001
From: Isaiah Thiessen <isaiah.thiessen@telus.com>
Date: Tue, 7 Jun 2022 11:51:33 -0700
Subject: [PATCH] fix: remove call to IdentityApi in favor of FetchApi

Signed-off-by: Isaiah Thiessen <isaiah.thiessen@telus.com>
---
 plugins/dynatrace/src/api/DynatraceClient.ts | 13 +------------
 plugins/dynatrace/src/plugin.ts              |  5 +----
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/plugins/dynatrace/src/api/DynatraceClient.ts b/plugins/dynatrace/src/api/DynatraceClient.ts
index ae352106d0..015ad4bc44 100644
--- a/plugins/dynatrace/src/api/DynatraceClient.ts
+++ b/plugins/dynatrace/src/api/DynatraceClient.ts
@@ -14,28 +14,20 @@
  * limitations under the License.
  */
 import { DynatraceProblems, DynatraceApi } from './DynatraceApi';
-import {
-  DiscoveryApi,
-  IdentityApi,
-  FetchApi,
-} from '@backstage/core-plugin-api';
+import { DiscoveryApi, FetchApi } from '@backstage/core-plugin-api';
 
 export class DynatraceClient implements DynatraceApi {
   discoveryApi: DiscoveryApi;
-  identityApi: IdentityApi;
   fetchApi: FetchApi;
 
   constructor({
     discoveryApi,
-    identityApi,
     fetchApi,
   }: {
     discoveryApi: DiscoveryApi;
-    identityApi: IdentityApi;
     fetchApi: FetchApi;
   }) {
     this.discoveryApi = discoveryApi;
-    this.identityApi = identityApi;
     this.fetchApi = fetchApi;
   }
 
@@ -43,15 +35,12 @@ export class DynatraceClient implements DynatraceApi {
     path: string,
     query: { [key in string]: any },
   ): Promise<T | undefined> {
-    const { token: idToken } = await this.identityApi.getCredentials();
-
     const apiUrl = `${await this.discoveryApi.getBaseUrl('proxy')}/dynatrace`;
     const response = await this.fetchApi.fetch(
       `${apiUrl}/${path}?${new URLSearchParams(query).toString()}`,
       {
         headers: {
           'Content-Type': 'application/json',
-          ...(idToken && { Authorization: `Bearer ${idToken}` }),
         },
       },
     );
diff --git a/plugins/dynatrace/src/plugin.ts b/plugins/dynatrace/src/plugin.ts
index 2bf1353e13..7ba3bef3a1 100644
--- a/plugins/dynatrace/src/plugin.ts
+++ b/plugins/dynatrace/src/plugin.ts
@@ -18,7 +18,6 @@ import {
   createApiFactory,
   createPlugin,
   discoveryApiRef,
-  identityApiRef,
   fetchApiRef,
   createRoutableExtension,
 } from '@backstage/core-plugin-api';
@@ -38,13 +37,11 @@ export const dynatracePlugin = createPlugin({
       api: dynatraceApiRef,
       deps: {
         discoveryApi: discoveryApiRef,
-        identityApi: identityApiRef,
         fetchApi: fetchApiRef,
       },
-      factory: ({ discoveryApi, identityApi, fetchApi }) =>
+      factory: ({ discoveryApi, fetchApi }) =>
         new DynatraceClient({
           discoveryApi,
-          identityApi,
           fetchApi,
         }),
     }),