Merge branch 'master' into rm/sysv

.browserslistrc

@@ -4,6 +4,8 @@ last 2 Chrome versions
 last 2 Safari versions
 > 0.25%
 not ie 11
+not op_mini all
+not samsung 4
 
 [dev]
 last 1 chrome versions

.github/ISSUE_TEMPLATE/v8_breaking_change.md

@@ -7,6 +7,16 @@ assignees: ''
 
 ---
 
+<!-- 
+****************************************
+******* LABEL CHANGES NECESSARY ********
+****************************************
+ 
+Please add a "NeededFor:${TeamName}" label to denote the team that is
+requesting the breaking change is surfaced in the Upgrade Assistant.
+ 
+-->
+
 ## Change description
 
 **Which release will ship the breaking change?**

docs/development/core/server/kibana-plugin-core-server.kibanarequest.md

@@ -30,9 +30,9 @@ export declare class KibanaRequest<Params = unknown, Query = unknown, Body = unk
 |  [isSystemRequest](./kibana-plugin-core-server.kibanarequest.issystemrequest.md) |  | <code>boolean</code> | Whether or not the request is a "system request" rather than an application-level request. Can be set on the client using the <code>HttpFetchOptions#asSystemRequest</code> option. |
 |  [params](./kibana-plugin-core-server.kibanarequest.params.md) |  | <code>Params</code> |  |
 |  [query](./kibana-plugin-core-server.kibanarequest.query.md) |  | <code>Query</code> |  |
-|  [rewrittenUrl](./kibana-plugin-core-server.kibanarequest.rewrittenurl.md) |  | <code>Url</code> | URL rewritten in onPreRouting request interceptor. |
+|  [rewrittenUrl](./kibana-plugin-core-server.kibanarequest.rewrittenurl.md) |  | <code>URL</code> | URL rewritten in onPreRouting request interceptor. |
 |  [route](./kibana-plugin-core-server.kibanarequest.route.md) |  | <code>RecursiveReadonly&lt;KibanaRequestRoute&lt;Method&gt;&gt;</code> | matched route details |
 |  [socket](./kibana-plugin-core-server.kibanarequest.socket.md) |  | <code>IKibanaSocket</code> | [IKibanaSocket](./kibana-plugin-core-server.ikibanasocket.md) |
-|  [url](./kibana-plugin-core-server.kibanarequest.url.md) |  | <code>Url</code> | a WHATWG URL standard object. |
+|  [url](./kibana-plugin-core-server.kibanarequest.url.md) |  | <code>URL</code> | a WHATWG URL standard object. |
 |  [uuid](./kibana-plugin-core-server.kibanarequest.uuid.md) |  | <code>string</code> | A UUID to identify this request. |
 

docs/development/core/server/kibana-plugin-core-server.kibanarequest.rewrittenurl.md

@@ -9,5 +9,5 @@ URL rewritten in onPreRouting request interceptor.
 <b>Signature:</b>
 
 ```typescript
-readonly rewrittenUrl?: Url;
+readonly rewrittenUrl?: URL;
 ```

docs/development/core/server/kibana-plugin-core-server.kibanarequest.url.md

@@ -9,5 +9,5 @@ a WHATWG URL standard object.
 <b>Signature:</b>
 
 ```typescript
-readonly url: Url;
+readonly url: URL;
 ```

src/core/server/http/http_server.mocks.ts

@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { parse as parseUrl } from 'url';
 import { Request } from 'hapi';
 import { merge } from 'lodash';
 import { Socket } from 'net';
@@ -72,6 +73,7 @@ function createKibanaRequestMock<P = any, Q = any, B = any>({
   auth = { isAuthenticated: true },
 }: RequestFixtureOptions<P, Q, B> = {}) {
   const queryString = stringify(query, { sort: false });
+  const url = parseUrl(`${path}${queryString ? `?${queryString}` : ''}`);
 
   return KibanaRequest.from<P, Q, B>(
     createRawRequestMock({
@@ -83,12 +85,7 @@ function createKibanaRequestMock<P = any, Q = any, B = any>({
       payload: body,
       path,
       method,
-      url: {
-        path,
-        pathname: path,
-        query: queryString,
-        search: queryString ? `?${queryString}` : queryString,
-      },
+      url,
       route: {
         settings: { tags: routeTags, auth: routeAuthRequired, app: kibanaRouteOptions },
       },
@@ -121,6 +118,11 @@ interface DeepPartialArray<T> extends Array<DeepPartial<T>> {}
 type DeepPartialObject<T> = { [P in keyof T]+?: DeepPartial<T[P]> };
 
 function createRawRequestMock(customization: DeepPartial<Request> = {}) {
+  const pathname = customization.url?.pathname || '/';
+  const path = `${pathname}${customization.url?.search || ''}`;
+  const url = Object.assign({ pathname, path, href: path }, customization.url);
+
+  // @ts-expect-error _core isn't supposed to be accessed - remove once we upgrade to hapi v18
   return merge(
     {},
     {
@@ -129,17 +131,21 @@ function createRawRequestMock(customization: DeepPartial<Request> = {}) {
         isAuthenticated: true,
       },
       headers: {},
-      path: '/',
+      path,
       route: { settings: {} },
-      url: {
-        href: '/',
-      },
+      url,
       raw: {
         req: {
-          url: '/',
+          url: path,
           socket: {},
         },
       },
+      // TODO: Remove once we upgrade to hapi v18
+      _core: {
+        info: {
+          uri: 'http://localhost',
+        },
+      },
     },
     customization
   ) as Request;

src/core/server/http/http_server.ts

@@ -271,7 +271,7 @@ export class HttpServer {
     }
 
     this.registerOnPreRouting((request, response, toolkit) => {
-      const oldUrl = request.url.href!;
+      const oldUrl = request.url.pathname + request.url.search;
       const newURL = basePathService.remove(oldUrl);
       const shouldRedirect = newURL !== oldUrl;
       if (shouldRedirect) {

src/core/server/http/integration_tests/lifecycle.test.ts

@@ -124,7 +124,13 @@ describe('OnPreRouting', () => {
     const router = createRouter('/');
 
     router.get({ path: '/login', validate: false }, (context, req, res) => {
-      return res.ok({ body: { rewrittenUrl: req.rewrittenUrl?.path } });
+      return res.ok({
+        body: {
+          rewrittenUrl: req.rewrittenUrl
+            ? `${req.rewrittenUrl.pathname}${req.rewrittenUrl.search}`
+            : undefined,
+        },
+      });
     });
 
     registerOnPreRouting((req, res, t) => t.rewriteUrl('/login'));
@@ -143,7 +149,13 @@ describe('OnPreRouting', () => {
     const router = createRouter('/');
 
     router.get({ path: '/reroute-2', validate: false }, (context, req, res) => {
-      return res.ok({ body: { rewrittenUrl: req.rewrittenUrl?.path } });
+      return res.ok({
+        body: {
+          rewrittenUrl: req.rewrittenUrl
+            ? `${req.rewrittenUrl.pathname}${req.rewrittenUrl.search}`
+            : undefined,
+        },
+      });
     });
 
     registerOnPreRouting((req, res, t) => t.rewriteUrl('/reroute-1'));
@@ -163,7 +175,13 @@ describe('OnPreRouting', () => {
     const router = createRouter('/');
 
     router.get({ path: '/login', validate: false }, (context, req, res) => {
-      return res.ok({ body: { rewrittenUrl: req.rewrittenUrl?.path } });
+      return res.ok({
+        body: {
+          rewrittenUrl: req.rewrittenUrl
+            ? `${req.rewrittenUrl.pathname}${req.rewrittenUrl.search}`
+            : undefined,
+        },
+      });
     });
 
     registerOnPreRouting((req, res, t) => t.next());