SQUASH: I think I got it working
This commit is contained in:
@@ -25,13 +25,13 @@ const route = async (req, res) => {
|
||||
}
|
||||
|
||||
//save the token
|
||||
recovery.upsert({
|
||||
await recovery.upsert({
|
||||
email: req.body.email,
|
||||
token: token
|
||||
});
|
||||
|
||||
//finally
|
||||
res.status(200).send("Validation email sent!");
|
||||
res.status(200).send("Recovery email sent!");
|
||||
return null;
|
||||
};
|
||||
|
||||
@@ -57,7 +57,7 @@ const validateDetails = async (body) => {
|
||||
};
|
||||
|
||||
const sendRecoveryEmail = async (email, token) => {
|
||||
const addr = `${process.env.WEB_PROTOCOL}://${process.env.WEB_ADDRESS}/auth/validation?token=${token}`;
|
||||
const addr = `${process.env.WEB_PROTOCOL}://${process.env.WEB_ADDRESS}/auth/reset?token=${token}`;
|
||||
const msg = `Hello,
|
||||
|
||||
Please visit the following link to reset your password: ${addr}
|
||||
|
||||
@@ -3,8 +3,10 @@ const { accounts, recovery } = require('../database/models');
|
||||
//auth/reset
|
||||
const route = async (req, res) => {
|
||||
//verify the recovery record exists
|
||||
const record = recovery.findOne({
|
||||
token: req.query.token
|
||||
const record = await recovery.findOne({
|
||||
where: {
|
||||
token: req.query.token
|
||||
}
|
||||
});
|
||||
|
||||
if (!record) {
|
||||
@@ -12,7 +14,7 @@ const route = async (req, res) => {
|
||||
}
|
||||
|
||||
//redirect to the front-end
|
||||
res.redirect(`${process.env.WEB_PROTOCOL}${process.env.WEB_RESET_ADDRESS}?email=${record.email}&token=${record.token}`);
|
||||
res.redirect(`${process.env.WEB_PROTOCOL}://${process.env.WEB_RESET_ADDRESS}?email=${record.email}&token=${record.token}`);
|
||||
return null;
|
||||
};
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ const route = async (req, res) => {
|
||||
const hash = await bcrypt.hash(req.body.password, await bcrypt.genSalt(11));
|
||||
|
||||
//update the account data
|
||||
accounts.update({
|
||||
await accounts.update({
|
||||
hash: hash
|
||||
}, {
|
||||
where: {
|
||||
@@ -24,20 +24,23 @@ const route = async (req, res) => {
|
||||
})
|
||||
|
||||
//delete from the recovery table
|
||||
recovery.destroy({
|
||||
await recovery.destroy({
|
||||
where: {
|
||||
email: req.query.email
|
||||
}
|
||||
});
|
||||
|
||||
res.status(200).end();
|
||||
return null;
|
||||
};
|
||||
|
||||
const validateDetails = async (query, body) => {
|
||||
//verify the recovery record exists
|
||||
const record = recovery.findOne({
|
||||
email: query.email,
|
||||
token: query.token
|
||||
const record = await recovery.findOne({
|
||||
where: {
|
||||
email: query.email,
|
||||
token: query.token
|
||||
}
|
||||
});
|
||||
|
||||
if (!record) {
|
||||
@@ -56,4 +59,4 @@ const validateDetails = async (query, body) => {
|
||||
return null;
|
||||
};
|
||||
|
||||
module.exports = route;
|
||||
module.exports = route;
|
||||
|
||||
Reference in New Issue
Block a user