chore: updating the type which is used for permissions

Signed-off-by: blam <ben@blam.sh>
This commit is contained in:
blam
2024-04-05 11:26:04 +02:00
parent f5cec5547c
commit 0dc6d9dc21
2 changed files with 9 additions and 12 deletions
+2 -1
View File
@@ -26,6 +26,7 @@ import { KubernetesServiceLocator as KubernetesServiceLocator_2 } from '@backsta
import { Logger } from 'winston';
import { ObjectToFetch as ObjectToFetch_2 } from '@backstage/plugin-kubernetes-node';
import { PermissionEvaluator } from '@backstage/plugin-permission-common';
import { PermissionsService } from '@backstage/backend-plugin-api';
import { PluginEndpointDiscovery } from '@backstage/backend-common';
import { RequestHandler } from 'http-proxy-middleware';
import { TokenCredential } from '@azure/identity';
@@ -339,7 +340,7 @@ export class KubernetesProxy {
// @public
export type KubernetesProxyCreateRequestHandlerOptions = {
permissionApi: PermissionEvaluator;
permissionApi: PermissionsService;
};
// @public
@@ -20,16 +20,12 @@ import {
NotFoundError,
serializeError,
} from '@backstage/errors';
import { getBearerTokenFromAuthorizationHeader } from '@backstage/plugin-auth-node';
import {
ANNOTATION_KUBERNETES_AUTH_PROVIDER,
KubernetesRequestAuth,
kubernetesProxyPermission,
} from '@backstage/plugin-kubernetes-common';
import {
AuthorizeResult,
PermissionEvaluator,
} from '@backstage/plugin-permission-common';
import { AuthorizeResult } from '@backstage/plugin-permission-common';
import {
Cluster,
KubeConfig,
@@ -45,7 +41,10 @@ import { ClusterDetails, KubernetesClustersSupplier } from '../types/types';
import type { Request } from 'express';
import { IncomingHttpHeaders } from 'http';
import { HttpAuthService } from '@backstage/backend-plugin-api';
import {
HttpAuthService,
PermissionsService,
} from '@backstage/backend-plugin-api';
export const APPLICATION_JSON: string = 'application/json';
@@ -70,7 +69,7 @@ export const HEADER_KUBERNETES_AUTH: string =
* @public
*/
export type KubernetesProxyCreateRequestHandlerOptions = {
permissionApi: PermissionEvaluator;
permissionApi: PermissionsService;
};
/**
@@ -112,10 +111,7 @@ export class KubernetesProxy {
const authorizeResponse = await permissionApi.authorize(
[{ permission: kubernetesProxyPermission }],
{
// todo: this should be updated too.
token: getBearerTokenFromAuthorizationHeader(
req.header('authorization'),
),
credentials: await this.httpAuth.credentials(req),
},
);
const auth = authorizeResponse[0];