switch to boom wrapper

elastic · Dec 3, 2019 · cd2afab · cd2afab
1 parent 71ecee0
commit cd2afab
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 127 deletions.
diff --git a/src/plugins/share/server/routes/goto.ts b/src/plugins/share/server/routes/goto.ts
@@ -20,7 +20,6 @@
 import { CoreSetup, IRouter } from 'kibana/server';
 import { schema } from '@kbn/config-schema';
 
-import { handleShortUrlError } from './lib/short_url_error';
 import { shortUrlAssertValid } from './lib/short_url_assert_valid';
 import { ShortUrlLookupService } from './lib/short_url_lookup';
 
@@ -40,31 +39,27 @@ export const createGotoRoute = ({
         params: schema.object({ urlId: schema.string() }),
       },
     },
-    async function(context, request, response) {
-      try {
-        const url = await shortUrlLookup.getUrl(request.params.urlId, {
-          savedObjects: context.core.savedObjects.client,
-        });
-        shortUrlAssertValid(url);
+    router.handleLegacyErrors(async function(context, request, response) {
+      const url = await shortUrlLookup.getUrl(request.params.urlId, {
+        savedObjects: context.core.savedObjects.client,
+      });
+      shortUrlAssertValid(url);
 
-        const uiSettings = context.core.uiSettings.client;
-        const stateStoreInSessionStorage = await uiSettings.get('state:storeInSessionStorage');
-        if (!stateStoreInSessionStorage) {
-          return response.redirected({
-            headers: {
-              location: http.basePath.prepend(url),
-            },
-          });
-        } else {
-          return response.redirected({
-            headers: {
-              location: http.basePath.prepend('/goto_LP/' + request.params.urlId),
-            },
-          });
-        }
-      } catch (err) {
-        return handleShortUrlError(response, err);
+      const uiSettings = context.core.uiSettings.client;
+      const stateStoreInSessionStorage = await uiSettings.get('state:storeInSessionStorage');
+      if (!stateStoreInSessionStorage) {
+        return response.redirected({
+          headers: {
+            location: http.basePath.prepend(url),
+          },
+        });
+      } else {
+        return response.redirected({
+          headers: {
+            location: http.basePath.prepend('/goto_LP/' + request.params.urlId),
+          },
+        });
       }
-    }
+    })
   );
 };
diff --git a/src/plugins/share/server/routes/lib/short_url_error.test.ts b/src/plugins/share/server/routes/lib/short_url_error.test.ts
diff --git a/src/plugins/share/server/routes/lib/short_url_error.ts b/src/plugins/share/server/routes/lib/short_url_error.ts
diff --git a/src/plugins/share/server/routes/shorten_url.ts b/src/plugins/share/server/routes/shorten_url.ts
@@ -20,7 +20,6 @@
 import { IRouter } from 'kibana/server';
 import { schema } from '@kbn/config-schema';
 
-import { handleShortUrlError } from './lib/short_url_error';
 import { shortUrlAssertValid } from './lib/short_url_assert_valid';
 import { ShortUrlLookupService } from './lib/short_url_lookup';
 
@@ -38,16 +37,13 @@ export const createShortenUrlRoute = ({
         body: schema.object({ url: schema.string() }, { allowUnknowns: false }),
       },
     },
-    async function(context, request, response) {
-      try {
-        shortUrlAssertValid(request.body.url);
-        const urlId = await shortUrlLookup.generateUrlId(request.body.url, {
-          savedObjects: context.core.savedObjects.client,
-        });
-        return response.ok({ body: { urlId } });
-      } catch (err) {
-        return handleShortUrlError(response, err);
-      }
-    }
+    router.handleLegacyErrors(async function(context, request, response) {
+      shortUrlAssertValid(request.body.url);
+      const urlId = await shortUrlLookup.generateUrlId(request.body.url, {
+        savedObjects: context.core.savedObjects.client,
+      });
+      throw new Error();
+      return response.ok({ body: { urlId } });
+    })
   );
 };