From 5d82ac15cb3206f8a54eaef6dd940a19a55986cb Mon Sep 17 00:00:00 2001
From: Josh Dover <me@joshdover.com>
Date: Wed, 12 Aug 2020 12:46:13 -0600
Subject: [PATCH] Revert "[reporting] Pass along generic parameters in
 high-order route handler" (#74891)

This reverts commit 041b78cec1f3acc76f25eef4fd88bba0cd231451.
---
 x-pack/plugins/reporting/server/routes/jobs.ts     | 14 +++++++++-----
 .../routes/lib/authorized_user_pre_routing.ts      |  4 ++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/x-pack/plugins/reporting/server/routes/jobs.ts b/x-pack/plugins/reporting/server/routes/jobs.ts
index 510df119c2c47c..e8eac9e577beb5 100644
--- a/x-pack/plugins/reporting/server/routes/jobs.ts
+++ b/x-pack/plugins/reporting/server/routes/jobs.ts
@@ -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();
diff --git a/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.ts b/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.ts
index e2f393aad57d23..3758eafc6d718c 100644
--- a/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.ts
+++ b/x-pack/plugins/reporting/server/routes/lib/authorized_user_pre_routing.ts
@@ -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()) {