maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "[reporting] Pass along generic parameters in high-order route handler" (#74891)

Browse source 
This reverts commit 041b78cec1.
This commit is contained in:
Josh Dover 2020-08-12 12:46:13 -06:00 committed by GitHub
parent 041b78cec1
commit 5d82ac15cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
x-pack/plugins/reporting/server/routes/jobs.ts
View file

@ -52,7 +52,11 @@ export function registerJobInfoRoutes(reporting: ReportingCore) {
const {
management: { jobTypes = [] },
} = await reporting.getLicenseInfo();
const { page: queryPage = '0', size: querySize = '10', ids: queryIds = null } = req.query;
const {
page: queryPage = '0',
size: querySize = '10',
ids: queryIds = null,
} = req.query as ListQuery; // NOTE: type inference is not working here. userHandler breaks it?
const page = parseInt(queryPage, 10) || 0;
const size = Math.min(100, parseInt(querySize, 10) || 10);
const jobIds = queryIds ? queryIds.split(',') : null;
@ -112,7 +116,7 @@ export function registerJobInfoRoutes(reporting: ReportingCore) {
return handleUnavailable(res);
}
const { docId } = req.params;
const { docId } = req.params as { docId: string };
const {
management: { jobTypes = [] },
} = await reporting.getLicenseInfo();
@ -157,7 +161,7 @@ export function registerJobInfoRoutes(reporting: ReportingCore) {
return res.custom({ statusCode: 503 });
}
const { docId } = req.params;
const { docId } = req.params as { docId: string };
const {
management: { jobTypes = [] },
} = await reporting.getLicenseInfo();
@ -209,7 +213,7 @@ export function registerJobInfoRoutes(reporting: ReportingCore) {
return handleUnavailable(res);
}
const { docId } = req.params;
const { docId } = req.params as { docId: string };
const {
management: { jobTypes = [] },
} = await reporting.getLicenseInfo();
@ -235,7 +239,7 @@ export function registerJobInfoRoutes(reporting: ReportingCore) {
return handleUnavailable(res);
}
const { docId } = req.params;
const { docId } = req.params as { docId: string };
const {
management: { jobTypes = [] },
} = await reporting.getLicenseInfo();

4
x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.ts
View file

@ -12,7 +12,7 @@ import { getUserFactory } from './get_user';
type ReportingUser = AuthenticatedUser | null;
const superuserRole = 'superuser';
export type RequestHandlerUser<P, Q, B> = RequestHandler<P, Q, B> extends (...a: infer U) => infer R
export type RequestHandlerUser = RequestHandler extends (...a: infer U) => infer R
? (user: ReportingUser, ...a: U) => R
: never;
@ -21,7 +21,7 @@ export const authorizedUserPreRoutingFactory = function authorizedUserPreRouting
) {
const setupDeps = reporting.getPluginSetupDeps();
const getUser = getUserFactory(setupDeps.security);
return <P, Q, B>(handler: RequestHandlerUser<P, Q, B>): RequestHandler<P, Q, B, RouteMethod> => {
return <P, Q, B>(handler: RequestHandlerUser): RequestHandler<P, Q, B, RouteMethod> => {
return (context, req, res) => {
let user: ReportingUser = null;
if (setupDeps.security && setupDeps.security.license.isEnabled()) {