chore(#328): throw Error on router errors (#329)

druxt · Oct 10, 2021 · c7b267a · c7b267a
1 parent 897dcbc
commit c7b267a
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 17 deletions.
diff --git a/.changeset/fresh-eyes-act.md b/.changeset/fresh-eyes-act.md
@@ -0,0 +1,5 @@
+---
+"druxt-router": minor
+---
+
+Throw Error on router errors
diff --git a/packages/router/src/router.js b/packages/router/src/router.js
@@ -144,10 +144,6 @@ class DruxtRouter {
    */
   async get (path) {
     const route = await this.getRoute(path)
-    if (route.error) {
-      return { route }
-    }
-
     const redirect = this.getRedirect(path, route)
 
     return { redirect, route }
@@ -358,11 +354,9 @@ class DruxtRouter {
 
     // Process Axios error.
     if (!(response.status >= 200 && response.status < 300)) {
-      route.error = {
-        statusCode: response.status,
-        message: response.statusText
-      }
-      route.component = 'error'
+      const error = new Error
+      error.response = response
+      throw error
     }
 
     return route

diff --git a/packages/router/src/stores/router.js b/packages/router/src/stores/router.js
@@ -234,7 +234,12 @@ const DruxtRouterStore = ({ store }) => {
           return state.routes[path]
         }
 
-        const route = await this.$druxtRouter().getRoute(path)
+        let route
+        try {
+          route = await this.$druxtRouter().getRoute(path)
+        } catch (err) {
+          route = { error: { statusCode: err.response.status, message: err.response.data.message } }
+        }
 
         commit('addRoute', { path, route })
 

diff --git a/packages/router/test/router.test.js b/packages/router/test/router.test.js
@@ -98,10 +98,12 @@ describe('DruxtRouter', () => {
   })
 
   test('get - error', async () => {
-    const { route } = await router.get('/error')
-
-    expect(route.error).toHaveProperty('message')
-    expect(route.error).toHaveProperty('statusCode', 404)
+    try {
+      await router.get('/error')
+    } catch(err) {
+      expect(err.response.status).toBe(404)
+      expect(err.response.data.message).toBe('Unable to resolve path /error.')
+    }
   })
 
   // @deprecated

diff --git a/packages/router/test/stores/router.test.js b/packages/router/test/stores/router.test.js
@@ -116,7 +116,7 @@ describe('DruxtRouterStore', () => {
 
     // Test failed request.
     await store.dispatch('druxtRouter/get', '/error')
-    expect(store.app.context.error).toHaveBeenCalledWith({ message: 'Not Found', statusCode: 404 })
+    expect(store.app.context.error).toHaveBeenCalledWith({ message: 'Unable to resolve path /error.', statusCode: 404 })
   })
 
   test('getEntity', async () => {

diff --git a/test/__mocks__/axios.js b/test/__mocks__/axios.js
@@ -31,8 +31,8 @@ const mockData = async (request, file) => {
   response = response ? response : require(file)
 
   // Throw error if error data is present.
-  if (response.data.errors) {
-    const error = new Error
+  if (response.data.errors || (!(response.status >= 200 && response.status < 300) && request.validateStatus && !request.validateStatus(response.status))) {
+    const error = new Error()
     error.response = response
     throw error
   }