Refactored to removed items cover by fetchApi

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

plugins/azure-devops/api-report.md

@@ -14,7 +14,6 @@ import { DiscoveryApi } from '@backstage/core-plugin-api';
 import { Entity } from '@backstage/catalog-model';
 import { FetchApi } from '@backstage/core-plugin-api';
 import { GitTag } from '@backstage/plugin-azure-devops-common';
-import { IdentityApi } from '@backstage/core-plugin-api';
 import { JSX as JSX_2 } from 'react';
 import { PullRequest } from '@backstage/plugin-azure-devops-common';
 import { PullRequestOptions } from '@backstage/plugin-azure-devops-common';
@@ -122,11 +121,7 @@ export const azureDevOpsApiRef: ApiRef<AzureDevOpsApi>;
 
 // @public (undocumented)
 export class AzureDevOpsClient implements AzureDevOpsApi {
-  constructor(options: {
-    discoveryApi: DiscoveryApi;
-    identityApi: IdentityApi;
-    fetchApi: FetchApi;
-  });
+  constructor(options: { discoveryApi: DiscoveryApi; fetchApi: FetchApi });
   // (undocumented)
   getAllTeams(): Promise<Team[]>;
   // (undocumented)

plugins/azure-devops/src/alpha/plugin.tsx

@@ -22,7 +22,6 @@ import {
   createPlugin,
   discoveryApiRef,
   fetchApiRef,
-  identityApiRef,
 } from '@backstage/frontend-plugin-api';
 import { azureDevOpsApiRef, AzureDevOpsClient } from '../api';
 import {
@@ -41,11 +40,10 @@ export const azureDevOpsApi = createApiExtension({
     api: azureDevOpsApiRef,
     deps: {
       discoveryApi: discoveryApiRef,
-      identityApi: identityApiRef,
       fetchApi: fetchApiRef,
     },
-    factory: ({ discoveryApi, identityApi, fetchApi }) =>
-      new AzureDevOpsClient({ discoveryApi, identityApi, fetchApi }),
+    factory: ({ discoveryApi, fetchApi }) =>
+      new AzureDevOpsClient({ discoveryApi, fetchApi }),
   }),
 });
 

plugins/azure-devops/src/api/AzureDevOpsClient.ts

@@ -27,27 +27,20 @@ import {
   RepoBuildOptions,
   Team,
 } from '@backstage/plugin-azure-devops-common';
-import {
-  DiscoveryApi,
-  FetchApi,
-  IdentityApi,
-} from '@backstage/core-plugin-api';
+import { DiscoveryApi, FetchApi } from '@backstage/core-plugin-api';
 import { ResponseError } from '@backstage/errors';
 import { AzureDevOpsApi } from './AzureDevOpsApi';
 
 /** @public */
 export class AzureDevOpsClient implements AzureDevOpsApi {
   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;
   }
 
@@ -207,10 +200,7 @@ export class AzureDevOpsClient implements AzureDevOpsApi {
     const baseUrl = `${await this.discoveryApi.getBaseUrl('azure-devops')}/`;
     const url = new URL(path, baseUrl);
 
-    const { token: idToken } = await this.identityApi.getCredentials();
-    const response = await this.fetchApi.fetch(url.toString(), {
-      headers: idToken ? { Authorization: `Bearer ${idToken}` } : {},
-    });
+    const response = await this.fetchApi.fetch(url.toString());
 
     if (!response.ok) {
       throw await ResponseError.fromResponse(response);

plugins/azure-devops/src/plugin.ts

@@ -62,8 +62,8 @@ export const azureDevOpsPlugin = createPlugin({
         identityApi: identityApiRef,
         fetchApi: fetchApiRef,
       },
-      factory: ({ discoveryApi, identityApi, fetchApi }) =>
-        new AzureDevOpsClient({ discoveryApi, identityApi, fetchApi }),
+      factory: ({ discoveryApi, fetchApi }) =>
+        new AzureDevOpsClient({ discoveryApi, fetchApi }),
     }),
   ],
 });

plugins/devtools/src/alpha/plugin.tsx

@@ -23,7 +23,6 @@ import {
   createPlugin,
   discoveryApiRef,
   fetchApiRef,
-  identityApiRef,
 } from '@backstage/frontend-plugin-api';
 
 import { devToolsApiRef, DevToolsClient } from '../api';
@@ -40,11 +39,10 @@ export const devToolsApi = createApiExtension({
     api: devToolsApiRef,
     deps: {
       discoveryApi: discoveryApiRef,
-      identityApi: identityApiRef,
       fetchApi: fetchApiRef,
     },
-    factory: ({ discoveryApi, identityApi, fetchApi }) =>
-      new DevToolsClient({ discoveryApi, identityApi, fetchApi }),
+    factory: ({ discoveryApi, fetchApi }) =>
+      new DevToolsClient({ discoveryApi, fetchApi }),
   }),
 });
 

plugins/devtools/src/api/DevToolsClient.ts

@@ -14,11 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  DiscoveryApi,
-  FetchApi,
-  IdentityApi,
-} from '@backstage/core-plugin-api';
+import { DiscoveryApi, FetchApi } from '@backstage/core-plugin-api';
 import {
   ConfigInfo,
   DevToolsInfo,
@@ -29,16 +25,13 @@ 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;
   }
 
@@ -71,10 +64,7 @@ export class DevToolsClient implements DevToolsApi {
     const baseUrl = `${await this.discoveryApi.getBaseUrl('devtools')}/`;
     const url = new URL(path, baseUrl);
 
-    const { token } = await this.identityApi.getCredentials();
-    const response = await this.fetchApi.fetch(url.toString(), {
-      headers: token ? { Authorization: `Bearer ${token}` } : {},
-    });
+    const response = await this.fetchApi.fetch(url.toString());
 
     if (!response.ok) {
       throw await ResponseError.fromResponse(response);

plugins/devtools/src/plugin.ts

@@ -20,7 +20,6 @@ import {
   createRoutableExtension,
   discoveryApiRef,
   fetchApiRef,
-  identityApiRef,
 } from '@backstage/core-plugin-api';
 import { devToolsApiRef, DevToolsClient } from './api';
 
@@ -34,11 +33,10 @@ export const devToolsPlugin = createPlugin({
       api: devToolsApiRef,
       deps: {
         discoveryApi: discoveryApiRef,
-        identityApi: identityApiRef,
         fetchApi: fetchApiRef,
       },
-      factory: ({ discoveryApi, identityApi, fetchApi }) =>
-        new DevToolsClient({ discoveryApi, identityApi, fetchApi }),
+      factory: ({ discoveryApi, fetchApi }) =>
+        new DevToolsClient({ discoveryApi, fetchApi }),
     }),
   ],
   routes: {

plugins/linguist/src/alpha/plugin.tsx

@@ -21,7 +21,6 @@ import {
   createPlugin,
   discoveryApiRef,
   fetchApiRef,
-  identityApiRef,
 } from '@backstage/frontend-plugin-api';
 
 import { LinguistClient, linguistApiRef } from '../api';
@@ -43,11 +42,10 @@ export const linguistApi = createApiExtension({
     api: linguistApiRef,
     deps: {
       discoveryApi: discoveryApiRef,
-      identityApi: identityApiRef,
       fetchApi: fetchApiRef,
     },
-    factory: ({ discoveryApi, identityApi, fetchApi }) =>
-      new LinguistClient({ discoveryApi, identityApi, fetchApi }),
+    factory: ({ discoveryApi, fetchApi }) =>
+      new LinguistClient({ discoveryApi, fetchApi }),
   }),
 });
 

plugins/linguist/src/api/LinguistClient.ts

@@ -14,27 +14,20 @@
  * limitations under the License.
  */
 
-import {
-  DiscoveryApi,
-  FetchApi,
-  IdentityApi,
-} from '@backstage/core-plugin-api';
+import { DiscoveryApi, FetchApi } from '@backstage/core-plugin-api';
 import { ResponseError } from '@backstage/errors';
 import { Languages } from '@backstage/plugin-linguist-common';
 import { LinguistApi } from './LinguistApi';
 
 export class LinguistClient implements LinguistApi {
   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;
   }
 
@@ -52,10 +45,7 @@ export class LinguistClient implements LinguistApi {
     const baseUrl = `${await this.discoveryApi.getBaseUrl('linguist')}/`;
     const url = new URL(path, baseUrl);
 
-    const { token } = await this.identityApi.getCredentials();
-    const response = await this.fetchApi.fetch(url.toString(), {
-      headers: token ? { Authorization: `Bearer ${token}` } : {},
-    });
+    const response = await this.fetchApi.fetch(url.toString());
 
     if (!response.ok) {
       throw await ResponseError.fromResponse(response);

plugins/linguist/src/plugin.ts

@@ -20,7 +20,6 @@ import {
   createPlugin,
   discoveryApiRef,
   fetchApiRef,
-  identityApiRef,
 } from '@backstage/core-plugin-api';
 import { linguistApiRef, LinguistClient } from './api';
 import { LINGUIST_ANNOTATION } from '@backstage/plugin-linguist-common';
@@ -38,11 +37,10 @@ export const linguistPlugin = createPlugin({
       api: linguistApiRef,
       deps: {
         discoveryApi: discoveryApiRef,
-        identityApi: identityApiRef,
         fetchApi: fetchApiRef,
       },
-      factory: ({ discoveryApi, identityApi, fetchApi }) =>
-        new LinguistClient({ discoveryApi, identityApi, fetchApi }),
+      factory: ({ discoveryApi, fetchApi }) =>
+        new LinguistClient({ discoveryApi, fetchApi }),
     }),
   ],
 });