[auth][m]: upgrade error handler to work with kratos v0.4.6-alpha.

datopian · Apr 1, 2021 · bb0b0fe · bb0b0fe
1 parent 2727088
commit bb0b0fe
Showing 1 changed file with 19 additions and 21 deletions.
diff --git a/routes/auth/errorHandler.js b/routes/auth/errorHandler.js
@@ -18,23 +18,9 @@ module.exports.errorHandler = (req, res, next) => {
 
   kratos
     .getSelfServiceError(error)
-    .then(
-      ({
-        body,
-        response,
-      }) => {
-        if (response.statusCode == 404) {
-          // The error could not be found, redirect back to home.
-          res.redirect(config.get('SITE_URL'))
-          return
-        }
-
-        return body
-      }
-    )
-    .then((errorContainer = {}) => {
-      if ('errors' in errorContainer) {
-        const errorMessage = JSON.stringify(errorContainer.errors, null, 2)
+    .then(({ status, data: body }) => {
+      if ('errors' in body) {
+        const errorMessage = JSON.stringify(body.errors, null, 2)
         logger.warn(errorMessage)
         req.flash(
           'info',
@@ -45,11 +31,23 @@ module.exports.errorHandler = (req, res, next) => {
       }
 
       return Promise.reject(
-        `expected errorContainer to contain "errors" but got ${JSON.stringify(
-          errorContainer
+        `expected body to contain "errors" but got ${JSON.stringify(
+          body
         )}`
       )
     })
-    .catch(err => next(err))
-}
+    .catch((err) => {
+      if (!err.response) {
+        next(err)
+        return
+      }
 
+      if (err.response.status === 404) {
+        // The error could not be found, redirect back to home.
+        res.redirect(config.get('SITE_URL'))
+        return
+      }
+
+      next(err)
+    })
+}