|
|
@@ -1,3 +1,5 @@
|
|
|
+const createError = require('http-errors');
|
|
|
+
|
|
|
module.exports = (crowi, app) => {
|
|
|
const PasswordResetOrder = crowi.model('PasswordResetOrder');
|
|
|
|
|
|
@@ -6,14 +8,25 @@ module.exports = (crowi, app) => {
|
|
|
return async(req, res, next) => {
|
|
|
const { token } = req.params;
|
|
|
|
|
|
+ // if (token == null) {
|
|
|
+ // return res.redirect('/login');
|
|
|
+ // }
|
|
|
+
|
|
|
if (token == null) {
|
|
|
- return res.redirect('/login');
|
|
|
+ return next(createError(401, 'Token not found'));
|
|
|
}
|
|
|
|
|
|
const passwordResetOrder = await PasswordResetOrder.findOne({ token });
|
|
|
// check the oneTimeToken is valid
|
|
|
+ // console.log('passwordResetOrder.isRevoked1', passwordResetOrder.isRevoked);
|
|
|
+
|
|
|
+ // if (passwordResetOrder == null || passwordResetOrder.isExpired() || passwordResetOrder.isRevoked) {
|
|
|
+ // console.log('passwordResetOrder.isRevoked2', passwordResetOrder.isRevoked);
|
|
|
+ // return res.redirect('/forgot-password/error/password-reset-order');
|
|
|
+ // }
|
|
|
+
|
|
|
if (passwordResetOrder == null || passwordResetOrder.isExpired() || passwordResetOrder.isRevoked) {
|
|
|
- return res.redirect('/forgot-password/error/password-reset-order');
|
|
|
+ return next(createError(401, 'passwordResetOrder is null or expired or revoked'));
|
|
|
}
|
|
|
|
|
|
req.DataFromPasswordResetOrderMiddleware = passwordResetOrder;
|