api report and minor fixes

Signed-off-by: Vincenzo Scamporlino <me@vinzscam.dev>
This commit is contained in:
Vincenzo Scamporlino
2022-04-05 16:05:25 +02:00
parent 173aadff5b
commit b4af8664b5
8 changed files with 28 additions and 15 deletions
+2 -1
View File
@@ -7,6 +7,7 @@ import { Config } from '@backstage/config';
import { DocumentTypeInfo } from '@backstage/plugin-search-common';
import express from 'express';
import { Logger } from 'winston';
import { PermissionAuthorizer } from '@backstage/plugin-permission-common';
import { PermissionEvaluator } from '@backstage/plugin-permission-common';
import { SearchEngine } from '@backstage/plugin-search-backend-node';
@@ -21,7 +22,7 @@ export function createRouter(options: RouterOptions): Promise<express.Router>;
export type RouterOptions = {
engine: SearchEngine;
types: Record<string, DocumentTypeInfo>;
permissions: PermissionEvaluator;
permissions: PermissionEvaluator | PermissionAuthorizer;
config: Config;
logger: Logger;
};
+4 -4
View File
@@ -76,13 +76,13 @@ export async function createRouter(
});
let permissionEvaluator: PermissionEvaluator;
if (!permissions.hasOwnProperty('query')) {
if ('query' in permissions) {
permissionEvaluator = permissions as PermissionEvaluator;
} else {
logger.warn(
'PermissionAuthorizer is deprecated. Please use PermissionEvaluator instead of PermissionAuthorizer in search.ts',
'PermissionAuthorizer is deprecated. Please use an instance of PermissionEvaluator instead of PermissionAuthorizer in PluginEnvironment#permissions',
);
permissionEvaluator = toPermissionEvaluator(permissions);
} else {
permissionEvaluator = permissions as PermissionEvaluator;
}
const engine = config.getOptionalBoolean('permission.enabled')