Kaynağa Gözat

log error message

kaori 4 yıl önce
ebeveyn
işleme
4629bf652c

+ 0 - 1
packages/app/src/components/PasswordResetExecutionForm.jsx

@@ -34,7 +34,6 @@ const PasswordResetExecutionForm = (props) => {
     }
 
     try {
-      // get endpoint by /forgot-password/${token} or window.location.pathname
       await appContainer.apiv3Put('/forgot-password', {
         token, newPassword, newPasswordConfirm,
       });

+ 6 - 3
packages/app/src/server/middlewares/inject-reset-order-by-token-middleware.js

@@ -2,12 +2,12 @@ const createError = require('http-errors');
 
 module.exports = (crowi, app) => {
   const PasswordResetOrder = crowi.model('PasswordResetOrder');
+  const forgotPassword = require('../routes/forgot-password')(crowi, app);
 
   return async(req, res, next) => {
     const token = req.params.token || req.body.token;
 
     if (token == null) {
-      res.redirect('/login');
       return next(createError(400, 'Token not found'));
     }
 
@@ -15,8 +15,11 @@ module.exports = (crowi, app) => {
 
     // check if the token is valid
     if (passwordResetOrder == null || passwordResetOrder.isExpired() || passwordResetOrder.isRevoked) {
-      res.redirect('/forgot-password/error/password-reset-order');
-      return next(createError(400, 'passwordResetOrder is null or expired or revoked'));
+      console.log('bbb');
+      const err = 'passwordResetOrder is null or expired or revoked';
+      // req.err = err;
+      forgotPassword.error(err);
+      return next(createError(400, err));
     }
 
     req.passwordResetOrder = passwordResetOrder;

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

@@ -13,11 +13,21 @@ module.exports = function(crowi, app) {
     return res.render('reset-password', { email });
   };
 
-  actions.error = function(req, res) {
-    const { reason } = req.params;
+  // actions.error = function(req, res) {
+  //   const { reason } = req.params;
 
-    if (reason === 'password-reset-order') {
-      return res.render('forgot-password/error', { reason });
+  //   if (reason === 'password-reset-order') {
+  //     return res.render('forgot-password/error', { reason });
+  //   }
+  // };
+
+  actions.error = async function(err) {
+    // const { err } = req;
+
+    if (err === 'passwordResetOrder is null or expired or revoked') {
+      console.log('errHoge', err);
+      // return res.render('forgot-password/error', { err });
+      // return;
     }
   };