Merge pull request #8601 from erikxiv/fix-api-auth-in-tech-insights
fixes api auth bug in tech-insights plugin
This commit is contained in:
@@ -0,0 +1,5 @@
|
||||
---
|
||||
'@backstage/plugin-tech-insights': minor
|
||||
---
|
||||
|
||||
fixes api auth in tech-insights plugin
|
||||
@@ -17,7 +17,7 @@
|
||||
import { TechInsightsApi } from './TechInsightsApi';
|
||||
import { CheckResult } from '@backstage/plugin-tech-insights-common';
|
||||
import { Check } from './types';
|
||||
import { DiscoveryApi } from '@backstage/core-plugin-api';
|
||||
import { DiscoveryApi, IdentityApi } from '@backstage/core-plugin-api';
|
||||
import { ResponseError } from '@backstage/errors';
|
||||
import { EntityName } from '@backstage/catalog-model';
|
||||
|
||||
@@ -28,13 +28,16 @@ import {
|
||||
|
||||
export type Options = {
|
||||
discoveryApi: DiscoveryApi;
|
||||
identityApi: IdentityApi;
|
||||
};
|
||||
|
||||
export class TechInsightsClient implements TechInsightsApi {
|
||||
private readonly discoveryApi: DiscoveryApi;
|
||||
private readonly identityApi: IdentityApi;
|
||||
|
||||
constructor(options: Options) {
|
||||
this.discoveryApi = options.discoveryApi;
|
||||
this.identityApi = options.identityApi;
|
||||
}
|
||||
|
||||
getScorecardsDefinition(
|
||||
@@ -47,7 +50,14 @@ export class TechInsightsClient implements TechInsightsApi {
|
||||
|
||||
async getAllChecks(): Promise<Check[]> {
|
||||
const url = await this.discoveryApi.getBaseUrl('tech-insights');
|
||||
const response = await fetch(`${url}/checks`);
|
||||
const token = await this.identityApi.getIdToken();
|
||||
const response = await fetch(`${url}/checks`, {
|
||||
headers: token
|
||||
? {
|
||||
Authorization: `Bearer ${token}`,
|
||||
}
|
||||
: undefined,
|
||||
});
|
||||
if (!response.ok) {
|
||||
throw await ResponseError.fromResponse(response);
|
||||
}
|
||||
@@ -59,6 +69,7 @@ export class TechInsightsClient implements TechInsightsApi {
|
||||
checks: Check[],
|
||||
): Promise<CheckResult[]> {
|
||||
const url = await this.discoveryApi.getBaseUrl('tech-insights');
|
||||
const token = await this.identityApi.getIdToken();
|
||||
const { namespace, kind, name } = entityParams;
|
||||
const allChecks = checks ? checks : await this.getAllChecks();
|
||||
const checkIds = allChecks.map((check: Check) => check.id);
|
||||
@@ -71,6 +82,7 @@ export class TechInsightsClient implements TechInsightsApi {
|
||||
body: JSON.stringify({ checks: checkIds }),
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
...(token && { Authorization: `Bearer ${token}` }),
|
||||
},
|
||||
},
|
||||
);
|
||||
|
||||
@@ -18,6 +18,7 @@ import {
|
||||
createRoutableExtension,
|
||||
createApiFactory,
|
||||
discoveryApiRef,
|
||||
identityApiRef,
|
||||
} from '@backstage/core-plugin-api';
|
||||
import { rootRouteRef } from './routes';
|
||||
import { techInsightsApiRef } from './api/TechInsightsApi';
|
||||
@@ -31,8 +32,9 @@ export const techInsightsPlugin = createPlugin({
|
||||
apis: [
|
||||
createApiFactory({
|
||||
api: techInsightsApiRef,
|
||||
deps: { discoveryApi: discoveryApiRef },
|
||||
factory: ({ discoveryApi }) => new TechInsightsClient({ discoveryApi }),
|
||||
deps: { discoveryApi: discoveryApiRef, identityApi: identityApiRef },
|
||||
factory: ({ discoveryApi, identityApi }) =>
|
||||
new TechInsightsClient({ discoveryApi, identityApi }),
|
||||
}),
|
||||
],
|
||||
routes: {
|
||||
|
||||
Reference in New Issue
Block a user