Jenkins: use PermissionEvaluator instead of PermissionAuthorizer

Signed-off-by: Vincenzo Scamporlino <me@vinzscam.dev>
This commit is contained in:
Vincenzo Scamporlino
2022-03-31 10:01:35 +02:00
parent afb7535c2e
commit 1917923ab8
4 changed files with 11 additions and 6 deletions
+2 -2
View File
@@ -8,7 +8,7 @@ import { CompoundEntityRef } from '@backstage/catalog-model';
import { Config } from '@backstage/config';
import express from 'express';
import { Logger } from 'winston';
import { PermissionAuthorizer } from '@backstage/plugin-permission-common';
import { PermissionEvaluator } from '@backstage/plugin-permission-common';
// Warning: (ae-missing-release-tag) "createRouter" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
@@ -98,6 +98,6 @@ export interface RouterOptions {
// (undocumented)
logger: Logger;
// (undocumented)
permissions?: PermissionAuthorizer;
permissions?: PermissionEvaluator;
}
```
@@ -25,7 +25,7 @@ import type {
} from '../types';
import {
AuthorizeResult,
PermissionAuthorizer,
PermissionEvaluator,
} from '@backstage/plugin-permission-common';
import { jenkinsExecutePermission } from '@backstage/plugin-jenkins-common';
import { NotAllowedError } from '@backstage/errors';
@@ -64,7 +64,7 @@ export class JenkinsApiImpl {
${JenkinsApiImpl.jobTreeSpec}
]{0,50}`;
constructor(private readonly permissionApi?: PermissionAuthorizer) {}
constructor(private readonly permissionApi?: PermissionEvaluator) {}
/**
* Get a list of projects for the given JenkinsInfo.
@@ -20,14 +20,14 @@ import Router from 'express-promise-router';
import { Logger } from 'winston';
import { JenkinsInfoProvider } from './jenkinsInfoProvider';
import { JenkinsApiImpl } from './jenkinsApi';
import { PermissionAuthorizer } from '@backstage/plugin-permission-common';
import { PermissionEvaluator } from '@backstage/plugin-permission-common';
import { getBearerTokenFromAuthorizationHeader } from '@backstage/plugin-auth-node';
import { stringifyEntityRef } from '@backstage/catalog-model';
export interface RouterOptions {
logger: Logger;
jenkinsInfoProvider: JenkinsInfoProvider;
permissions?: PermissionAuthorizer;
permissions?: PermissionEvaluator;
}
export async function createRouter(