Updated to use fetchApi as per ADR013

Signed-off-by: Andre Wanlin <awanlin@spotify.com>
This commit is contained in:
Andre Wanlin
2024-02-18 08:56:32 -06:00
parent 25adbdde2d
commit a0e33935a9
11 changed files with 84 additions and 24 deletions
+8 -3
View File
@@ -20,6 +20,7 @@ import {
createApiFactory,
createPlugin,
discoveryApiRef,
fetchApiRef,
identityApiRef,
} from '@backstage/frontend-plugin-api';
@@ -40,9 +41,13 @@ export const entityLinguistCard = createEntityCardExtension({
export const linguistApi = createApiExtension({
factory: createApiFactory({
api: linguistApiRef,
deps: { discoveryApi: discoveryApiRef, identityApi: identityApiRef },
factory: ({ discoveryApi, identityApi }) =>
new LinguistClient({ discoveryApi, identityApi }),
deps: {
discoveryApi: discoveryApiRef,
identityApi: identityApiRef,
fetchApi: fetchApiRef,
},
factory: ({ discoveryApi, identityApi, fetchApi }) =>
new LinguistClient({ discoveryApi, identityApi, fetchApi }),
}),
});
+9 -2
View File
@@ -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 { ResponseError } from '@backstage/errors';
import { Languages } from '@backstage/plugin-linguist-common';
import { LinguistApi } from './LinguistApi';
@@ -22,13 +26,16 @@ 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;
}
public async getLanguages(entityRef: string): Promise<Languages> {
@@ -46,7 +53,7 @@ export class LinguistClient implements LinguistApi {
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}` } : {},
});
+8 -3
View File
@@ -19,6 +19,7 @@ import {
createComponentExtension,
createPlugin,
discoveryApiRef,
fetchApiRef,
identityApiRef,
} from '@backstage/core-plugin-api';
import { linguistApiRef, LinguistClient } from './api';
@@ -35,9 +36,13 @@ export const linguistPlugin = createPlugin({
apis: [
createApiFactory({
api: linguistApiRef,
deps: { discoveryApi: discoveryApiRef, identityApi: identityApiRef },
factory: ({ discoveryApi, identityApi }) =>
new LinguistClient({ discoveryApi, identityApi }),
deps: {
discoveryApi: discoveryApiRef,
identityApi: identityApiRef,
fetchApi: fetchApiRef,
},
factory: ({ discoveryApi, identityApi, fetchApi }) =>
new LinguistClient({ discoveryApi, identityApi, fetchApi }),
}),
],
});