fix short url in spaces (#58313)

elastic · Feb 25, 2020 · a60b25f · a60b25f
1 parent 1a15d3a
commit a60b25f
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/plugins/share/server/routes/goto.ts b/src/plugins/share/server/routes/goto.ts
@@ -23,6 +23,7 @@ import { schema } from '@kbn/config-schema';
 import { shortUrlAssertValid } from './lib/short_url_assert_valid';
 import { ShortUrlLookupService } from './lib/short_url_lookup';
 import { getGotoPath } from '../../common/short_url_routes';
+import { modifyUrl } from '../../../../core/utils';
 
 export const createGotoRoute = ({
   router,
@@ -49,9 +50,16 @@ export const createGotoRoute = ({
       const uiSettings = context.core.uiSettings.client;
       const stateStoreInSessionStorage = await uiSettings.get('state:storeInSessionStorage');
       if (!stateStoreInSessionStorage) {
+        const basePath = http.basePath.get(request);
+
+        const prependedUrl = modifyUrl(url, parts => {
+          if (!parts.hostname && parts.pathname && parts.pathname.startsWith('/')) {
+            parts.pathname = `${basePath}${parts.pathname}`;
+          }
+        });
         return response.redirected({
           headers: {
-            location: http.basePath.prepend(url),
+            location: prependedUrl,
           },
         });
       }