Răsfoiți Sursa

improved error handling

kaori 4 ani în urmă
părinte
comite
8426ae31fb
1 a modificat fișierele cu 4 adăugiri și 9 ștergeri
  1. 4 9
      packages/app/src/server/routes/apiv3/forgot-password.js

+ 4 - 9
packages/app/src/server/routes/apiv3/forgot-password.js

@@ -79,18 +79,13 @@ module.exports = (crowi) => {
     }
     }
   });
   });
 
 
-  router.put('/', apiLimiter, csrf, injectResetOrderByTokenMiddleware, validator.password, apiV3FormValidator, async(req, res) => {
-    if (req.error != null) {
-      if (req.error === 'Token not found') {
-        return res.json({ status: 404, error: req.error });
-      }
+  router.put('/', /* apiLimiter, */ csrf, injectResetOrderByTokenMiddleware, validator.password, apiV3FormValidator, async(req, res) => {
 
 
-      if (req.error === 'passwordResetOrder is null or expired or revoked') {
-        return res.json({ status: 400, error: req.error });
-      }
+    if (req.error != null) {
+      return res.apiv3Err(req.error.message);
     }
     }
 
 
-    const passwordResetOrder = req.passwordResetOrder;
+    const { passwordResetOrder } = req;
     const { email } = passwordResetOrder;
     const { email } = passwordResetOrder;
     const grobalLang = configManager.getConfig('crowi', 'app:globalLang');
     const grobalLang = configManager.getConfig('crowi', 'app:globalLang');
     const i18n = req.language || grobalLang;
     const i18n = req.language || grobalLang;