Added reset password endpoint, updated readme
This commit is contained in:
1 parent
0eda4ceb77
commit
e576514ff8
4 files changed
+209
-9
No files matched your search
@@ -154,15 +154,13 @@ const userEditController = async (req, res, next) => {
|
||||
|
||||
const recoveryRequestController = async (req, res, next) => {
|
||||
try {
|
||||
const email = req.body.email;
|
||||
const user = await req.db.getUserByEmail(req, res);
|
||||
if (user) {
|
||||
const recoveryToken = await req.db.requestRecoveryToken(req, res);
|
||||
console.log(recoveryToken);
|
||||
return res.status(200).json({
|
||||
success: true,
|
||||
msg: "Created recovery token",
|
||||
data: recoveryToken.token,
|
||||
data: recoveryToken,
|
||||
});
|
||||
}
|
||||
// TODO Email token to user
|
||||
@@ -175,8 +173,8 @@ const recoveryRequestController = async (req, res, next) => {
|
||||
|
||||
const validateRecoveryTokenController = async (req, res, next) => {
|
||||
try {
|
||||
const candidateToken = req.body.recoveryToken;
|
||||
const recoveryToken = await req.db.validateRecoveryToken(req, res);
|
||||
// TODO Redirect user to reset password after validating token
|
||||
return res.status(200).json({
|
||||
success: true,
|
||||
msg: "Token is valid",
|
||||
@@ -188,10 +186,21 @@ const validateRecoveryTokenController = async (req, res, next) => {
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
const resetPasswordController = async (req, res, next) => {
|
||||
try {
|
||||
user = await req.db.resetPassword(req, res);
|
||||
res.status(200).json({ success: true, msg: "Password reset", data: user });
|
||||
} catch (error) {
|
||||
error.service = SERVICE_NAME;
|
||||
next(error);
|
||||
}
|
||||
};
|
||||
module.exports = {
|
||||
registerController,
|
||||
loginController,
|
||||
userEditController,
|
||||
recoveryRequestController,
|
||||
validateRecoveryTokenController,
|
||||
resetPasswordController,
|
||||
};
|
||||
+30
-4
@@ -3,7 +3,7 @@ const mongoose = require("mongoose");
|
||||
const UserModel = require("../models/user");
|
||||
const Check = require("../models/Check");
|
||||
const Alert = require("../models/Alert");
|
||||
const RecoveyToken = require("../models/RecoveryToken");
|
||||
const RecoveryToken = require("../models/RecoveryToken");
|
||||
const crypto = require("crypto");
|
||||
|
||||
const connect = async () => {
|
||||
@@ -100,8 +100,8 @@ const updateUser = async (req, res) => {
|
||||
const requestRecoveryToken = async (req, res) => {
|
||||
try {
|
||||
// Delete any existing tokens
|
||||
await RecoveyToken.deleteMany({ email: req.body.email });
|
||||
let recoveryToken = new RecoveyToken({
|
||||
await RecoveryToken.deleteMany({ email: req.body.email });
|
||||
let recoveryToken = new RecoveryToken({
|
||||
email: req.body.email,
|
||||
token: crypto.randomBytes(32).toString("hex"),
|
||||
});
|
||||
@@ -115,7 +115,9 @@ const requestRecoveryToken = async (req, res) => {
|
||||
const validateRecoveryToken = async (req, res) => {
|
||||
try {
|
||||
const candidateToken = req.body.recoveryToken;
|
||||
const recoveryToken = await RecoveyToken.findOne({ token: candidateToken });
|
||||
const recoveryToken = await RecoveryToken.findOne({
|
||||
token: candidateToken,
|
||||
});
|
||||
if (recoveryToken !== null) {
|
||||
return recoveryToken;
|
||||
} else {
|
||||
@@ -126,6 +128,29 @@ const validateRecoveryToken = async (req, res) => {
|
||||
}
|
||||
};
|
||||
|
||||
const resetPassword = async (req, res) => {
|
||||
try {
|
||||
const newPassword = req.body.password;
|
||||
|
||||
// Validate token again
|
||||
const recoveryToken = await validateRecoveryToken(req, res);
|
||||
const user = await UserModel.findOne({ email: recoveryToken.email });
|
||||
|
||||
if (user !== null) {
|
||||
user.password = newPassword;
|
||||
await user.save();
|
||||
await RecoveryToken.deleteMany({ email: recoveryToken.email });
|
||||
// Fetch the user again without the password
|
||||
const userWithoutPassword = await UserModel.findOne({
|
||||
email: recoveryToken.email,
|
||||
}).select("-password");
|
||||
return userWithoutPassword;
|
||||
} else {
|
||||
throw new Error("User not found");
|
||||
}
|
||||
} catch (error) {}
|
||||
};
|
||||
|
||||
//****************************************
|
||||
// Monitors
|
||||
//****************************************
|
||||
@@ -435,6 +460,7 @@ module.exports = {
|
||||
updateUser,
|
||||
requestRecoveryToken,
|
||||
validateRecoveryToken,
|
||||
resetPassword,
|
||||
getAllMonitors,
|
||||
getMonitorById,
|
||||
getMonitorsByUserId,
|
||||
|
||||
@@ -7,15 +7,17 @@ const {
|
||||
userEditController,
|
||||
recoveryRequestController,
|
||||
validateRecoveryTokenController,
|
||||
resetPasswordController,
|
||||
} = require("../controllers/authController");
|
||||
|
||||
//Auth routes
|
||||
router.post("/register", registerController);
|
||||
router.post("/login", loginController);
|
||||
router.post("/user/:userId", verifyJWT, userEditController);
|
||||
|
||||
//Recovery routes
|
||||
|
||||
router.post("/recovery/request", recoveryRequestController);
|
||||
router.post("/recovery/validate", validateRecoveryTokenController);
|
||||
router.post("/recovery/reset/", resetPasswordController);
|
||||
|
||||
module.exports = router;
|
||||
Reference in new issue
Block a user