forgot password js
This commit is contained in:
1 parent
e65af5336f
commit
a40b6d514b
7 files changed
+231
-124
No files matched your search
@@ -0,0 +1,55 @@
|
||||
const express = require('express');
|
||||
const { server } = require('ws');
|
||||
const crypto = require('crypto');
|
||||
const nodeMail = require('nodemailer');
|
||||
require('dotenv').config();
|
||||
|
||||
const transporter = nodeMail.createTransport({
|
||||
service: 'gmail',
|
||||
auth: {
|
||||
user: process.env.EMAIL_USER,
|
||||
pass: process.env.PASS,
|
||||
}
|
||||
});
|
||||
|
||||
module.exports = (users) => {
|
||||
const router = express.Router();
|
||||
|
||||
|
||||
router.post('/resetPass', async (req, res) => {
|
||||
const { email } = req.body;
|
||||
const user = await users.findOne({ email });
|
||||
|
||||
if (!user) {
|
||||
req.session.error = 'No user found'
|
||||
return res.redirect('/forgotPassword');
|
||||
}
|
||||
|
||||
const token = crypto.randomBytes(32).toString('hex');
|
||||
const expiration = Date.now() + 360000;
|
||||
|
||||
await users.updateOne({ email }, {
|
||||
$set: { resetToken: token, resetTokenExpires: expiration }
|
||||
});
|
||||
|
||||
const resetUrl = `http://localhost:3000/reset/${token}`;
|
||||
|
||||
const mailSend = {
|
||||
from: process.env.EMAIL_USER,
|
||||
to: email,
|
||||
subject: 'Password reset',
|
||||
text: `reset your password here ${resetUrl} \n this link will expire within 1 hour`,
|
||||
|
||||
};
|
||||
|
||||
try {
|
||||
await transporter.sendMail(mailSend);
|
||||
req.session.reset = 'Reset link sent Check your email';
|
||||
res.redirect('/login');
|
||||
} catch (err) {
|
||||
console.log('there was an error', err);
|
||||
res.status(500).send('email failed to send try again');
|
||||
}
|
||||
});
|
||||
return router;
|
||||
}
|
||||
+75
-75
@@ -5,7 +5,7 @@ const salt = 12;
|
||||
|
||||
module.exports = (middleware, users, plans) => {
|
||||
const router = require("express").Router();
|
||||
|
||||
|
||||
router.use(middleware);
|
||||
|
||||
router.get('/home', async (req, res) => {
|
||||
@@ -22,17 +22,17 @@ module.exports = (middleware, users, plans) => {
|
||||
if (!req.session.email) {
|
||||
return res.status(status.Unauthorized).redirect('/login');
|
||||
}
|
||||
|
||||
|
||||
try {
|
||||
|
||||
// console.log(req.user.email);
|
||||
const userPlans = await plans.find({userEmail: req.user.email }).toArray();
|
||||
const userPlans = await plans.find({ userEmail: req.user.email }).toArray();
|
||||
// console.log(userPlans);
|
||||
res.render('plans', {
|
||||
user: req.user,
|
||||
plans: userPlans
|
||||
});
|
||||
|
||||
|
||||
} catch (err) {
|
||||
console.error("Error fetching plans:", err);
|
||||
req.session.errMessage = "Could not load your plans. Please try again.";
|
||||
@@ -42,7 +42,7 @@ module.exports = (middleware, users, plans) => {
|
||||
|
||||
router.get('/newPlan', (req, res) => {
|
||||
const errMessage = req.session.errMessage;
|
||||
req.session.errMessage = "";
|
||||
req.session.errMessage = "";
|
||||
res.render('newPlan', { user: req.user, errMessage: errMessage });
|
||||
});
|
||||
|
||||
@@ -51,45 +51,45 @@ module.exports = (middleware, users, plans) => {
|
||||
return res.status(status.Unauthorized).redirect('/login');
|
||||
}
|
||||
|
||||
const planSchema = joi.object({
|
||||
name: joi.string().min(3).max(100).required(),
|
||||
retirementAge: joi.number().min(18).max(120).required(),
|
||||
retirementExpenses: joi.number().min(0).required(),
|
||||
retirementAssets: joi.number().min(0).required(),
|
||||
retirementLiabilities: joi.number().min(0).required(),
|
||||
});
|
||||
|
||||
const validationOptions = { convert: true, abortEarly: false };
|
||||
const { error, value } = planSchema.validate(req.body, validationOptions);
|
||||
|
||||
if (error) {
|
||||
console.error("Plan validation error:", error.details);
|
||||
req.session.errMessage = "Invalid input: " + error.details.map(d => d.message.replace(/"/g, '')).join(', ');
|
||||
res.status(status.BadRequest).redirect("/newPlan");
|
||||
return;
|
||||
}
|
||||
const newPlan = {
|
||||
userEmail: req.user.email,
|
||||
name: value.name,
|
||||
retirementAge: value.retirementAge,
|
||||
retirementExpenses: value.retirementExpenses,
|
||||
retirementAssets: value.retirementAssets,
|
||||
retirementLiabilities: value.retirementLiabilities,
|
||||
progress: "0%"
|
||||
};
|
||||
|
||||
try{
|
||||
await plans.insertOne(newPlan);
|
||||
req.session.errMessage = "";
|
||||
res.redirect('/plans');
|
||||
}
|
||||
catch(err){
|
||||
console.error("Error saving plan:", err);
|
||||
req.session.errMessage = "An error occurred while saving your plan. Please try again.";
|
||||
res.status(status.InternalServerError).redirect("/newPlan");
|
||||
}
|
||||
const planSchema = joi.object({
|
||||
name: joi.string().min(3).max(100).required(),
|
||||
retirementAge: joi.number().min(18).max(120).required(),
|
||||
retirementExpenses: joi.number().min(0).required(),
|
||||
retirementAssets: joi.number().min(0).required(),
|
||||
retirementLiabilities: joi.number().min(0).required(),
|
||||
});
|
||||
|
||||
const validationOptions = { convert: true, abortEarly: false };
|
||||
const { error, value } = planSchema.validate(req.body, validationOptions);
|
||||
|
||||
if (error) {
|
||||
console.error("Plan validation error:", error.details);
|
||||
req.session.errMessage = "Invalid input: " + error.details.map(d => d.message.replace(/"/g, '')).join(', ');
|
||||
res.status(status.BadRequest).redirect("/newPlan");
|
||||
return;
|
||||
}
|
||||
const newPlan = {
|
||||
userEmail: req.user.email,
|
||||
name: value.name,
|
||||
retirementAge: value.retirementAge,
|
||||
retirementExpenses: value.retirementExpenses,
|
||||
retirementAssets: value.retirementAssets,
|
||||
retirementLiabilities: value.retirementLiabilities,
|
||||
progress: "0%"
|
||||
};
|
||||
|
||||
try {
|
||||
await plans.insertOne(newPlan);
|
||||
req.session.errMessage = "";
|
||||
res.redirect('/plans');
|
||||
}
|
||||
catch (err) {
|
||||
console.error("Error saving plan:", err);
|
||||
req.session.errMessage = "An error occurred while saving your plan. Please try again.";
|
||||
res.status(status.InternalServerError).redirect("/newPlan");
|
||||
}
|
||||
});
|
||||
|
||||
router.get('/more', (req, res) => {
|
||||
res.render('more', { user: req.user });
|
||||
return res.status(status.Ok);
|
||||
@@ -107,13 +107,13 @@ module.exports = (middleware, users, plans) => {
|
||||
|
||||
router.get('/questionnaire', (req, res) => {
|
||||
const errMessage = req.session.errMessage;
|
||||
req.session.errMessage = "";
|
||||
req.session.errMessage = "";
|
||||
res.render('questionnaire', { user: req.user, errMessage: errMessage });
|
||||
});
|
||||
|
||||
router.post('/questionnaire', (req, res) => {
|
||||
// console.log("Questionnaire POST body:", req.body);
|
||||
|
||||
|
||||
const questionnaireSchema = joi.object({
|
||||
dob: joi.date().required(),
|
||||
education: joi.string().valid('primary', 'secondary', 'tertiary', 'postgraduate').required(),
|
||||
@@ -123,22 +123,22 @@ module.exports = (middleware, users, plans) => {
|
||||
assets: joi.number().min(0).required(),
|
||||
liabilities: joi.number().min(0).required(),
|
||||
});
|
||||
|
||||
const validationOptions = { convert: true, abortEarly: false };
|
||||
|
||||
const validationOptions = { convert: true, abortEarly: false };
|
||||
const { error, value } = questionnaireSchema.validate(req.body, validationOptions);
|
||||
|
||||
if (error) {
|
||||
|
||||
if (error) {
|
||||
console.error("Questionnaire validation error:", error.details);
|
||||
req.session.errMessage = "Invalid input: " + error.details.map(d => d.message.replace(/"/g, '')).join(', ');
|
||||
res.status(status.BadRequest).redirect("/questionnaire");
|
||||
return;
|
||||
req.session.errMessage = "Invalid input: " + error.details.map(d => d.message.replace(/"/g, '')).join(', ');
|
||||
res.status(status.BadRequest).redirect("/questionnaire");
|
||||
return;
|
||||
}
|
||||
|
||||
users.updateOne(
|
||||
{ email: req.session.email },
|
||||
{
|
||||
$set: {
|
||||
financialData: true,
|
||||
|
||||
users.updateOne(
|
||||
{ email: req.session.email },
|
||||
{
|
||||
$set: {
|
||||
financialData: true,
|
||||
dob: value.dob,
|
||||
education: value.education,
|
||||
maritalStatus: value.maritalStatus,
|
||||
@@ -146,26 +146,26 @@ module.exports = (middleware, users, plans) => {
|
||||
expenses: value.expenses,
|
||||
assets: value.assets,
|
||||
liabilities: value.liabilities,
|
||||
}
|
||||
}
|
||||
}
|
||||
).then((result) => {
|
||||
).then((result) => {
|
||||
if (result.matchedCount === 0) {
|
||||
console.log(`User not found during questionnaire update: ${req.session.email}`);
|
||||
req.session.errMessage = "User session invalid. Please log in again.";
|
||||
res.status(status.NotFound).redirect("/login");
|
||||
req.session.errMessage = "User session invalid. Please log in again.";
|
||||
res.status(status.NotFound).redirect("/login");
|
||||
return;
|
||||
}
|
||||
if (result.modifiedCount === 0 && result.matchedCount === 1) {
|
||||
console.log(`User questionnaire data unchanged (already up-to-date): ${req.session.email}`);
|
||||
}
|
||||
|
||||
req.session.errMessage = "";
|
||||
res.status(status.Ok).redirect("/home");
|
||||
|
||||
}).catch(err => {
|
||||
|
||||
req.session.errMessage = "";
|
||||
res.status(status.Ok).redirect("/home");
|
||||
|
||||
}).catch(err => {
|
||||
console.error("Error updating questionnaire in database:", err);
|
||||
req.session.errMessage = "An error occurred while saving your information. Please try again.";
|
||||
res.status(status.InternalServerError).redirect("/questionnaire");
|
||||
res.status(status.InternalServerError).redirect("/questionnaire");
|
||||
});
|
||||
});
|
||||
|
||||
@@ -181,7 +181,7 @@ module.exports = (middleware, users, plans) => {
|
||||
|
||||
if (valid.err) {
|
||||
req.session.errMessage = "Invalid input",
|
||||
res.status(status.BadRequest);
|
||||
res.status(status.BadRequest);
|
||||
return res.redirect("/profile");
|
||||
}
|
||||
|
||||
@@ -205,20 +205,20 @@ module.exports = (middleware, users, plans) => {
|
||||
).then((result) => {
|
||||
if (result.matchedCount === 0) {
|
||||
console.log(`User not found during account update: ${req.session.email}`);
|
||||
req.session.errMessage = "User session invalid. Please log in again.";
|
||||
res.status(status.NotFound).redirect("/login");
|
||||
req.session.errMessage = "User session invalid. Please log in again.";
|
||||
res.status(status.NotFound).redirect("/login");
|
||||
return;
|
||||
}
|
||||
if (result.modifiedCount === 0 && result.matchedCount === 1) {
|
||||
console.log(`User account data unchanged (already up-to-date): ${req.session.email}`);
|
||||
}
|
||||
|
||||
req.session.errMessage = "";
|
||||
return res.status(status.Ok).redirect("/profile");
|
||||
}).catch(err => {
|
||||
|
||||
req.session.errMessage = "";
|
||||
return res.status(status.Ok).redirect("/profile");
|
||||
}).catch(err => {
|
||||
console.error("Error updating account in database:", err);
|
||||
req.session.errMessage = "An error occurred while saving your information. Please try again.";
|
||||
return res.status(status.InternalServerError).redirect("/profile");
|
||||
return res.status(status.InternalServerError).redirect("/profile");
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
<%- include("./partials/fileHeader") %>
|
||||
|
||||
<main>
|
||||
<div class="flex justify-center items-center h-screen">
|
||||
<form action="/resetPass" method="POST">
|
||||
<div class="w-96 p-6 shadow-1g bg-white rounded-md">
|
||||
<h1 class="text-3xl block text-center font-semibold">Reset Password</h1>
|
||||
<hr class="mt-3">
|
||||
<div class="mt-3">
|
||||
<label for="email" class="block text-base mb-2">Email</label>
|
||||
<input type="text" id="email" name="email"
|
||||
class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
|
||||
placeholder="Enter Email" />
|
||||
</div>
|
||||
<div class="mt-5">
|
||||
<button type="submit"
|
||||
class="cursor-pointer border-2 border-gray-600 bg-blue-600 text-white py-1 w-full rounded-md hover:bg-transparent hover:text-indigo-700 font-semibold">Send
|
||||
reset Link</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</main>
|
||||
|
||||
<%- include("./partials/footer") %>
|
||||
+44
-48
@@ -1,52 +1,48 @@
|
||||
<%- include("./partials/fileHeader") %>
|
||||
<%- include("./partials/headerStart") %>
|
||||
<%- include("./partials/headerStart") %>
|
||||
|
||||
<main>
|
||||
<div class="flex justify-center items-center h-screen">
|
||||
<form action="/signup" method="POST">
|
||||
<div class="w-96 p-6 shadow-1g bg-white rounded-md">
|
||||
<h1 class="text-3xl block text-center font-semibold">Signup</h1>
|
||||
<hr class="mt-3">
|
||||
<div class="mt-3">
|
||||
<label for="name" class="block text-base mb-2">Name</label>
|
||||
<input type="text" id="name" name="name"
|
||||
class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
|
||||
placeholder="Enter Name" />
|
||||
</div>
|
||||
<div class="mt-3">
|
||||
<label for="email" class="block text-base mb-2">Email</label>
|
||||
<input type="text" id="email" name="email"
|
||||
class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
|
||||
placeholder="Enter Email" />
|
||||
</div>
|
||||
<div class="mt-3">
|
||||
<label for="name" class="block text-base mb-2">Name</label>
|
||||
<input type="text" id="name" name="name"
|
||||
class="border focus:border-gray-600 w-full text-base px-2 py-1 focus:outline-none focus:ring-0 "
|
||||
placeholder="Enter Name" />
|
||||
</div>
|
||||
<div class="mt-3">
|
||||
<label for="password" class="block text-base mb-2">Password</label>
|
||||
<input type="password" id="password" name="password"
|
||||
class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
|
||||
placeholder="Enter Password" />
|
||||
<label for="password" class="block text-base mb-2 mt-3">Re-type Password</label>
|
||||
<input type="password" id="repassword" name="repassword"
|
||||
class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
|
||||
placeholder="Enter Password" />
|
||||
</div>
|
||||
<div class="text-red-800 font-bold " id="forgor"> <%= errMessage %></div>
|
||||
<div class="mt-5">
|
||||
<button type="submit"
|
||||
class="border-2 border-gray-600 bg-blue-600 text-white py-1 w-full rounded-md hover:bg-transparent hover:text-indigo-700 font-semibold">Signup</button>
|
||||
</div>
|
||||
<div class="mt-5 block justify-between items-center">
|
||||
<label>Already have an account?</label>
|
||||
<a href="/login" class="text-indigo-600 font-semibold">Login</a>
|
||||
</div>
|
||||
<main>
|
||||
<div class="flex justify-center items-center h-screen">
|
||||
<form action="/signup" method="POST">
|
||||
<div class="w-96 p-6 shadow-1g bg-white rounded-md">
|
||||
<h1 class="text-3xl block text-center font-semibold">Signup</h1>
|
||||
<hr class="mt-3">
|
||||
<div class="mt-3">
|
||||
<label for="email" class="block text-base mb-2">Email</label>
|
||||
<input type="text" id="email" name="email"
|
||||
class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
|
||||
placeholder="Enter Email" />
|
||||
</div>
|
||||
<div class="mt-3">
|
||||
<label for="name" class="block text-base mb-2">Name</label>
|
||||
<input type="text" id="name" name="name"
|
||||
class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
|
||||
placeholder="Enter Name" />
|
||||
</div>
|
||||
<div class="mt-3">
|
||||
<label for="password" class="block text-base mb-2">Password</label>
|
||||
<input type="password" id="password" name="password"
|
||||
class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
|
||||
placeholder="Enter Password" />
|
||||
<label for="password" class="block text-base mb-2 mt-3">Re-type Password</label>
|
||||
<input type="password" id="repassword" name="repassword"
|
||||
class="border focus:border-gray-600 w-full rounded-md text-base px-2 py-1 focus:outline-none focus:ring-0 "
|
||||
placeholder="Enter Password" />
|
||||
</div>
|
||||
<div class="text-red-800 font-bold " id="forgor">
|
||||
<%= errMessage %>
|
||||
</div>
|
||||
<div class="mt-5">
|
||||
<button type="submit"
|
||||
class="border-2 border-gray-600 bg-blue-600 text-white py-1 w-full rounded-md hover:bg-transparent hover:text-indigo-700 font-semibold">Signup</button>
|
||||
</div>
|
||||
<div class="mt-5 block justify-between items-center">
|
||||
<label>Already have an account?</label>
|
||||
<a href="/login" class="text-indigo-600 font-semibold">Login</a>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</main>
|
||||
</main>
|
||||
|
||||
<%- include("./partials/footer") %>
|
||||
<%- include("./partials/footer") %>
|
||||
Reference in new issue
Block a user