Refactored to removed items cover by fetchApi

Signed-off-by: Andre Wanlin <awanlin@spotify.com>
This commit is contained in:
Andre Wanlin
2024-02-18 09:19:04 -06:00
parent a0e33935a9
commit 1d6af04ad0
10 changed files with 19 additions and 64 deletions
+2 -4
View File
@@ -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 }),
}),
});
+2 -12
View File
@@ -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);
+2 -4
View File
@@ -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 }),
}),
],
});