talksik/Ucharify_api
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

implement the actual resetting endpoint

Browse Source
This commit is contained in:
Arjun Patel
2019-05-13 01:16:56 -07:00
parent c4dd7cd1fa
commit c657b2b9c5
5 changed files with 163 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/auth.controller.js
+71 -6
View File
@@ -100,7 +100,7 @@ exports.resetPasswordEmail = async (req, res, next) => {
user = await sequelize.query( user = await sequelize.query(
` `
SELECT id FROM organizations SELECT id FROM organizations
WHERE email = :email`, WHERE primary_contact_email = :email`,
{ {
type: sequelize.QueryTypes.SELECT, type: sequelize.QueryTypes.SELECT,
replacements: { email } replacements: { email }
@@ -109,10 +109,7 @@ exports.resetPasswordEmail = async (req, res, next) => {
} }
user = user[0]; user = user[0];
if (!user) if (!user) return next(errorMaker(400, 'Not a valid user'));
return res.status(400).json({
message: 'User not found'
});
const CODE = uuidv4(); const CODE = uuidv4();
const currDate = new Date(); const currDate = new Date();
@@ -146,7 +143,8 @@ exports.resetPasswordEmail = async (req, res, next) => {
} }
); );
sendgrid.passwordResetEmail(email, CODE); await sendgrid.passwordResetEmail(email, CODE);
return res return res
.status(200) .status(200)
.json({ message: 'Successfuly sent password reset email!' }); .json({ message: 'Successfuly sent password reset email!' });
@@ -154,3 +152,70 @@ exports.resetPasswordEmail = async (req, res, next) => {
next(e); next(e);
} }
}; };
exports.resetPassword = async (req, res, next) => {
try {
const { password, code } = req.query;
var passwordResetRow = await sequelize.query(
`
SELECT * FROM password_reset
WHERE code = :code`,
{
type: sequelize.QueryTypes.SELECT,
replacements: { code }
}
);
if (!passwordResetRow.length)
return next(errorMaker(400, 'Forbidden to reset password'));
passwordResetRow = passwordResetRow[0];
//TODO check the timestamp of the code creation
const createdDate = new Date(passwordResetRow.created_at);
const currDate = new Date();
const diffTime = Math.abs(currDate.getTime() - createdDate.getTime());
const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24));
if (diffDays > 3) return next(errorMaker(400, 'Code expired'));
const hashedPass = bcrypt.hashSync(password);
if (passwordResetRow.user_type == 'donor') {
await sequelize.query(
`
UPDATE donors
SET password = :password
WHERE id = :user_id
`,
{
type: sequelize.QueryTypes.UPDATE,
replacements: {
password: hashedPass,
user_id: passwordResetRow.user_id
}
}
);
} else {
await sequelize.query(
`
UPDATE organizations
SET password = :password
WHERE id = :user_id
`,
{
type: sequelize.QueryTypes.UPDATE,
replacements: {
password: hashedPass,
user_id: passwordResetRow.user_id
}
}
);
}
return res.status(200).json({ message: 'Successfuly reset password!' });
} catch (e) {
next(e);
}
};
app/controllers/donor.controller.js
+81 -81
View File
@@ -1,91 +1,91 @@
const db = require('../../models'), const db = require('../../models'),
bcrypt = require('bcrypt-nodejs'), bcrypt = require('bcrypt-nodejs'),
errorMaker = require('../helpers/error.maker'), errorMaker = require('../helpers/error.maker'),
uuidv4 = require('uuid/v4'); uuidv4 = require('uuid/v4');
const Donor = db.Donor; const Donor = db.Donor;
// Create/post a Donor // Create/post a Donor
exports.createDonor = (req, res, next) => { exports.createDonor = (req, res, next) => {
// see if user already in db // see if user already in db
Donor.findAll({ Donor.findAll({
where: { where: {
email: req.body.email email: req.body.email
} }
}) })
.then(donors => { .then(donors => {
if (donors.length >= 1) { if (donors.length >= 1) {
return next(errorMaker(409, `Email Exists: ${req.body.email}`)); return next(errorMaker(409, `Email Exists: ${req.body.email}`));
} else { } else {
// hash and store // hash and store
bcrypt.hash(req.body.password, null, null, function(error, hash) { bcrypt.hash(req.body.password, null, null, function(error, hash) {
// Store hash in your password DB. // Store hash in your password DB.
if (error) { if (error) {
return next(error); return next(error);
} else { } else {
Donor.create({ Donor.create({
id: uuidv4(), id: uuidv4(),
first_name: req.body.first_name, first_name: req.body.first_name,
middle_name: req.body.middle_name, middle_name: req.body.middle_name,
last_name: req.body.last_name, last_name: req.body.last_name,
email: req.body.email, email: req.body.email,
password: hash, //hashed password password: hash, //hashed password
age: req.body.age, age: req.body.age,
phone: req.body.phone, phone: req.body.phone,
address: req.body.address, address: req.body.address,
city: req.body.city, city: req.body.city,
state: req.body.state, state: req.body.state,
country: req.body.country country: req.body.country
}) })
.then(donor => { .then(donor => {
// Send created donor to client // Send created donor to client
return res.status(201).json({ return res.status(201).json({
message: 'Donor created', message: 'Donor created',
donor donor
}); });
}) })
.catch(error => next(error)); .catch(error => next(error));
} }
}); });
} }
}) })
.catch(error => next(error)); .catch(error => next(error));
}; };
// FETCH all Donor // FETCH all Donor
exports.getAllDonors = (req, res, next) => { exports.getAllDonors = (req, res, next) => {
Donor.findAll().then(donors => { Donor.findAll().then(donors => {
// Send all donors to Client // Send all donors to Client
res.status(200).json({ res.status(200).json({
donors, donors,
number_donors: donors.length number_donors: donors.length
}); });
}); });
}; };
// Find a Donor by Id // Find a Donor by Id
exports.findDonorById = (req, res) => { exports.findDonorById = (req, res) => {
Donor.findById(req.params.donor_id).then(donor => { Donor.findById(req.params.donor_id).then(donor => {
res.send(donor); res.send(donor);
}); });
}; };
// Delete a Donor by Id // Delete a Donor by Id
exports.deleteDonor = (req, res) => { exports.deleteDonor = (req, res) => {
const id = req.params.donor_id; const id = req.params.donor_id;
Donor.destroy({ Donor.destroy({
where: { id: id } where: { id: id }
}).then(() => { }).then(() => {
res.status(200).send('deleted successfully a donor with id = ' + id); res.status(200).send('deleted successfully a donor with id = ' + id);
}); });
}; };
// GET the quick stats for the dashboard // GET the quick stats for the dashboard
exports.getDashboardData = async (req, res, next) => { exports.getDashboardData = async (req, res, next) => {
const donor_id = req.user.id; const donor_id = req.user.id;
const donors = await db.sequelize.query( const donors = await db.sequelize.query(
` `
select d.id, select d.id,
d.first_name, d.first_name,
sum(g.amount) as total_contributions sum(g.amount) as total_contributions
@@ -94,25 +94,25 @@ exports.getDashboardData = async (req, res, next) => {
group by d.id group by d.id
order by total_contributions DESC order by total_contributions DESC
`, `,
{ {
type: db.sequelize.QueryTypes.SELECT type: db.sequelize.QueryTypes.SELECT
} }
); );
let number_donors = donors.length; let number_donors = donors.length;
donors.map((donor, index) => { donors.map((donor, index) => {
if (donor.id == donor_id) { if (donor.id == donor_id) {
const donor_contributions = donor.total_contributions; const donor_contributions = donor.total_contributions;
let percentile = let percentile =
donor_contributions > 0 ? (number_donors - index) / number_donors : 0; donor_contributions > 0 ? (number_donors - index) / number_donors : 0;
return res.status(200).json({ return res.status(200).json({
message: 'Successfully got the stats', message: 'Successfully got the stats',
percentile percentile
}); });
} }
}); });
}; };
// // Update a Donor // // Update a Donor
app/controllers/sendgrid.controller.js
+5 -3
View File
@@ -86,17 +86,19 @@ exports.passwordResetEmail = async (receiver, code) => {
const msg = { const msg = {
to: receiver, to: receiver,
from: { email: '[email protected]', name: 'UCharify Security' }, from: { email: '[email protected]', name: 'UCharify Security' },
template_id: 'd-569f804f5e7749cba66bac1994607280', template_id: 'd-f26ce08089914f3a983f8932913ed262',
substitutionWrappers: ['{{', '}}'], substitutionWrappers: ['{{', '}}'],
dynamic_template_data: { dynamic_template_data: {
reset_link: `${process.env.WEB_CLIENT}/resetpassword/form`, reset_link: `${
process.env.WEB_CLIENT
}/resetpassword/form?code=${code}`,
subject: 'Reset Your Password' subject: 'Reset Your Password'
} }
}; };
const sentRes = await sgMail.send(msg); const sentRes = await sgMail.send(msg);
resolve(); resolve(sentRes);
} catch (e) { } catch (e) {
reject(e); reject(e);
} }
app/routes/auth.route.js
+1 -1
View File
@@ -14,6 +14,6 @@ router.post('/org/login', auth.orgLogin);
router.get('/resetpassword', auth.resetPasswordEmail); router.get('/resetpassword', auth.resetPasswordEmail);
// Reset password for either donor or charity after verifying code // Reset password for either donor or charity after verifying code
router.post('/resetpassword', auth.resetPasswordEmail); router.post('/resetpassword', auth.resetPassword);
module.exports = router; module.exports = router;
models/PasswordReset.js
+5 -5
View File
@@ -4,24 +4,24 @@ module.exports = (sequelize, DataTypes) => {
'password_reset', 'password_reset',
{ {
code: { code: {
type: Sequelize.STRING, type: DataTypes.STRING,
allowNull: false allowNull: false
}, },
user_id: { user_id: {
type: Sequelize.UUID, type: DataTypes.UUID,
allowNull: false allowNull: false
}, },
user_type: { user_type: {
type: Sequelize.STRING, type: DataTypes.STRING,
allowNull: false allowNull: false
}, },
created_at: { created_at: {
allowNull: false, allowNull: false,
type: Sequelize.DATE type: DataTypes.DATE
}, },
updated_at: { updated_at: {
allowNull: false, allowNull: false,
type: Sequelize.DATE type: DataTypes.DATE
} }
}, },
{} {}