Rename permission backend request and response types

Signed-off-by: Joe Porpeglia <josephp@spotify.com>
This commit is contained in:
Joe Porpeglia
2022-03-22 10:24:08 -04:00
committed by Joe Porpeglia
parent 970814ed38
commit e43290ce96
14 changed files with 114 additions and 90 deletions
@@ -16,7 +16,7 @@
import { ConfigReader } from '@backstage/config';
import {
AuthorizeDecision,
EvaluatePermissionResponse,
AuthorizeResult,
createPermission,
PermissionAuthorizer,
@@ -243,7 +243,7 @@ describe('AuthorizedSearchEngine', () => {
}
return {
result: AuthorizeResult.CONDITIONAL,
} as AuthorizeDecision;
} as EvaluatePermissionResponse;
}
return {
@@ -294,7 +294,7 @@ describe('AuthorizedSearchEngine', () => {
return {
result: AuthorizeResult.CONDITIONAL,
} as AuthorizeDecision;
} as EvaluatePermissionResponse;
}),
);
@@ -336,7 +336,9 @@ describe('AuthorizedSearchEngine', () => {
result: AuthorizeResult.ALLOW,
};
}
return { result: AuthorizeResult.CONDITIONAL } as AuthorizeDecision;
return {
result: AuthorizeResult.CONDITIONAL,
} as EvaluatePermissionResponse;
}),
);
@@ -413,7 +415,9 @@ describe('AuthorizedSearchEngine', () => {
: AuthorizeResult.ALLOW,
};
}
return { result: AuthorizeResult.CONDITIONAL } as AuthorizeDecision;
return {
result: AuthorizeResult.CONDITIONAL,
} as EvaluatePermissionResponse;
}),
);
@@ -495,7 +499,9 @@ describe('AuthorizedSearchEngine', () => {
if (query.resourceRef) {
return { result: AuthorizeResult.ALLOW };
}
return { result: AuthorizeResult.CONDITIONAL } as AuthorizeDecision;
return {
result: AuthorizeResult.CONDITIONAL,
} as EvaluatePermissionResponse;
}),
);
@@ -18,8 +18,8 @@ import { compact, zipObject } from 'lodash';
import qs from 'qs';
import DataLoader from 'dataloader';
import {
AuthorizeDecision,
AuthorizeQuery,
EvaluatePermissionResponse,
EvaluatePermissionRequest,
AuthorizeResult,
isResourcePermission,
PermissionAuthorizer,
@@ -90,7 +90,7 @@ export class AuthorizedSearchEngine implements SearchEngine {
const queryStartTime = Date.now();
const authorizer = new DataLoader(
(requests: readonly AuthorizeQuery[]) =>
(requests: readonly EvaluatePermissionRequest[]) =>
this.permissions.authorize(requests.slice(), options),
{
// Serialize the permission name and resourceRef as
@@ -185,8 +185,11 @@ export class AuthorizedSearchEngine implements SearchEngine {
private async filterResults(
results: IndexableResult[],
typeDecisions: Record<string, AuthorizeDecision>,
authorizer: DataLoader<AuthorizeQuery, AuthorizeDecision>,
typeDecisions: Record<string, EvaluatePermissionResponse>,
authorizer: DataLoader<
EvaluatePermissionRequest,
EvaluatePermissionResponse
>,
) {
return compact(
await Promise.all(