SowinskiBraeden/RetirementCalculator
1
0 Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into feature/ai-challenge2

Browse Source
This commit is contained in:
Nícolas Agostini authored and GitHub committed 2025-05-14 11:24:31 -07:00
2 parents 73d61d76de 370d5d3292
commit 5771f1372f
7 files changed
+157 -79
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app.js
-2
View File
@@ -83,7 +83,6 @@ app.get('/forgotPassword', (req, res) => {
return res.status(status.Ok);
});
// Reset with token given to user via email
app.get('/reset/:token', async (req, res) => {
const token = req.params.token;
@@ -106,7 +105,6 @@ app.get('/reset/:token', async (req, res) => {
});
});
// 404 handler - keep the actual notFound route please
// REALLY DONT DELETE THIS
app.get('/notFound', (req, res) => {
src/auth/authentication.js
+35 -9
View File
@@ -12,10 +12,18 @@ module.exports = (users) => {
const router = require("express").Router();
router.get("/logout", (req, res) => {
req.session.destroy();
return res.redirect('/login');
req.session.destroy((err) => {
if (err) {
console.error("Failed to destroy session: ", err);
res.status(status.InternalServerError);
return res.redirect("back");
}
res.status(status.Ok);
return res.redirect('/login');
});
});
router.post("/login", async (req, res) => {
const credentialSchema = joi.object({
@@ -46,10 +54,19 @@ module.exports = (users) => {
req.session.authenticated = true;
req.session.userId = user._id;
req.session.email = req.body.email;
req.session.errMessage = "";
res.redirect("/home");
return res.status(status.Ok);
req.session.save((err) => {
if (err) {
console.error("Failed to save session: ", err);
req.session.errMessage = "Failed to save session. Please try again.";
res.status(status.InternalServerError);
return res.redirect("/login");
}
res.status(status.Ok);
return res.redirect("/home");
});
});
});
@@ -97,11 +114,20 @@ module.exports = (users) => {
}
req.session.authenticated = true;
req.session.email = req.body.email;
req.session.userId = results.insertedId;
req.session.errMessage = "";
return res.status(status.Ok).redirect("/home");
req.session.save((err) => {
if (err) {
console.error("Failed to save session: ", err);
req.session.errMessage = "Please login";
res.status(status.Ok);
return res.redirect("/login");
}
res.status(status.Ok);
return res.redirect("/home");
});
});
});
src/auth/forgotPass.js
+3 -2
View File
@@ -4,6 +4,7 @@ const joi = require('joi');
const nodeMail = require('nodemailer');
const bcrypt = require('bcrypt');
require('dotenv').config();
const PORT = process.env.PORT;
const transporter = nodeMail.createTransport({
@@ -13,7 +14,7 @@ const transporter = nodeMail.createTransport({
pass: process.env.EMAIL_PASS,
}
});
// users info
module.exports = (users) => {
const router = express.Router();
@@ -73,7 +74,7 @@ module.exports = (users) => {
});
const valid = passwordSchema.validate({ password, confirmPassword });
if (valid.error) {
console.log("houston we have a problem");
console.log("houston we have a problem"); // nice
req.session.error = 'Invalid input';
res.status(status.BadRequest);
return res.redirect(`/reset/${token}`);
src/auth/middleware.js
+35 -7
View File
@@ -1,5 +1,6 @@
const status = require("../util/statuses");
const session = require("express-session");
const ObjectId = require("mongodb").ObjectId;
// Get all names of user routes
let userRouter = require("../router/user")((req, res, next) => next(), null, null, null);
@@ -18,26 +19,53 @@ const createMiddleware = (users) => {
return res.status(status.NotFound).redirect("/notFound");
}
if (!req.session.authenticated || !req.session.email) {
if (!req.session.authenticated || !req.session.userId) {
req.session.errMessage = "Please login to view that resource";
res.redirect("/login");
return res.status(status.Unauthorized);
}
if (!req.session.user) {
let user = await users.findOne({ "email": req.session.email }).then((user) => user);
let user = await users.findOne({ _id: new ObjectId(req.session.userId) }).then((user) => user);
if (!user) {
req.session.errMessage = "User not found";
res.redirect("/login");
return res.status(status.Unauthorized);
return req.session.destroy((err) => {
if (err) {
console.error("Failed to destroy session: ", err);
req.session.errMessage = "Failed to logout. Please try again";
res.status(status.InternalServerError);
return res.redirect("/home");
}
req.session.errMessage = "User not found";
res.status(status.NotFound);
res.redirect("/login");
});
}
req.session.user = user;
return req.session.save((err) => {
if (err) {
console.error("Failed to save session: ", err);
return req.session.destroy((err) => {
req.session.errMessage = "An error occured, please login again.";
if (err) {
console.error("Failed to destroy session: ", err);
}
res.status(status.InternalServerError);
res.redirect("/login");
});
}
next();
});
}
next();
};
}
};
module.exports = createMiddleware;
src/public/scripts/geolocation.js
+48 -33
View File
@@ -5,38 +5,47 @@ function getLocation() {
}
function update(data) {
document.getElementById("loading").style = "display: none";
document.getElementById("currencyExchange").style = "display: flex";
document.getElementById("yourFlag").src = `/static/svgs/flags/${data.data.country}.svg`
document.getElementById("yourFlag").alt = data.data.country;
document.getElementById("flagTag").innerHTML = `(${data.data.country})`;
document.getElementById("exchangeFlag").src = `/static/svgs/flags/USD.svg`;
document.getElementById("exchangeFlag").alt = "USD";
document.getElementById("exFlagTag").innerHTML = "(USD)";
if (data.data.message != "error") {
document.getElementById("loading").style = "display: none";
document.getElementById("currencyExchange").style = "display: flex";
document.getElementById("dropdown-country-button").value = data.data.toCurrencyRates["USD"];
updateExchange(document.getElementById("dropdown-country-button").value);
const dropdown = document.getElementById("dropdown");
let countries = Object.keys(data.data.toCurrencyRates);
countries.forEach(item => {
if (dropdown.querySelector(`button[value="${data.data.toCurrencyRates[item]}"]`)) {
return;
}
const listItem = document.createElement("li");
listItem.innerHTML = `<button onclick="switchButton(this)" type="button" value="${data.data.toCurrencyRates[item]}" class="country Button inline-flex w-full px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:text-gray-200 dark:hover:bg-gray-600 dark:hover:text-white" role="menuitem">
<span class="inline-flex items-center">
<img src="/static/svgs/flags/${item}.svg" class="h-4 w-4 me-2" alt="${item}"> (${item})
</span>
</button>`;
dropdown.appendChild(listItem);
});
document.getElementById("yourFlag").src = `/static/svgs/flags/${data.data.country}.svg`
document.getElementById("yourFlag").alt = data.data.country;
document.getElementById("flagTag").innerHTML = `(${data.data.country})`;
document.getElementById("exchangeFlag").src = `/static/svgs/flags/USD.svg`;
document.getElementById("exchangeFlag").alt = "USD";
document.getElementById("exFlagTag").innerHTML = "(USD)";
document.getElementById("dropdown-country-button").value = data.data.toCurrencyRates["USD"];
updateExchange(document.getElementById("dropdown-country-button").value);
const dropdown = document.getElementById("dropdown");
let countries = Object.keys(data.data.toCurrencyRates);
countries.forEach(item => {
if (dropdown.querySelector(`button[value="${data.data.toCurrencyRates[item]}"]`)) {
return;
}
const listItem = document.createElement("li");
listItem.innerHTML = `<button onclick="switchButton(this)" type="button" value="${data.data.toCurrencyRates[item]}" class="country Button inline-flex w-full px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:text-gray-200 dark:hover:bg-gray-600 dark:hover:text-white" role="menuitem">
<span class="inline-flex items-center">
<img src="/static/svgs/flags/${item}.svg" class="h-4 w-4 me-2" alt="${item}"> (${item})
</span>
</button>`;
dropdown.appendChild(listItem);
});
} else {
document.getElementById("loading").style = "display: none";
document.getElementById("exFrom").style = "display: none";
document.getElementById("dropdown-country-button").style = "display: none";
document.getElementById("currencyExchange").style = "display: flex";
document.getElementById("exchange").innerHTML = "Country not supported";
document.getElementById("exchange").className = "block rounded-lg text-center p-2.5 w-50 z-20 text-sm border bg-gray-700 border-gray-600 placeholder-gray-400 text-white focus:border-blue-500";
}
}
function switchButton(clickedButton) {
@@ -60,10 +69,16 @@ async function getLatestExchange(position) {
let lon = position.coords.longitude;
const res = await fetch(`/exRates/${lat}/${lon}`);
const data = await res.json();
update(data);
}
function error(err) {
console.error("Geolocation error: ", err);
const data = {
data: {
message: "error"
}
}
update(data);
}
src/router/user.js
+32 -24
View File
@@ -86,7 +86,7 @@ module.exports = (middleware, users, plans, assets) => {
});
router.get('/assets', async (req, res) => {
let userAssets = await assets.find({ userId: new ObjectId(req.session.user._id) }).toArray();
let userAssets = await assets.find({ userId: new ObjectId(req.session.userId) }).toArray();
res.render('assets', {
user: req.session.user,
errMessage: req.session.errMessage,
@@ -99,7 +99,7 @@ module.exports = (middleware, users, plans, assets) => {
router.get('/plans', async (req, res) => {
try {
const userPlansFromDB = await plans.find({ userId: new ObjectId(req.session.user._id) }).toArray();
const userPlansFromDB = await plans.find({ userId: new ObjectId(req.session.userId) }).toArray();
for (const plan of userPlansFromDB) {
const percentage = await calculatePlanProgress(plan, assets, req.session.user._id);
@@ -108,6 +108,7 @@ module.exports = (middleware, users, plans, assets) => {
const updatedUserPlans = await plans.find({ userId: new ObjectId(req.session.user._id) }).toArray();
res.render('plans', {
user: req.session.user,
plans: updatedUserPlans,
@@ -124,18 +125,17 @@ module.exports = (middleware, users, plans, assets) => {
try {
const planId = req.params.id;
let userAssets = await assets.find({ userId: new ObjectId(req.session.user._id) }).toArray();
let userAssets = await assets.find({ userId: new ObjectId(req.session.userId) }).toArray();
if (!ObjectId.isValid(planId)) {
req.session.errMessage = "Invalid plan ID format.";
return res.status(status.BadRequest).redirect('/plans');
}
const plan = await plans.findOne({ userId: new ObjectId(req.session.user._id), _id: new ObjectId(planId) });
const plan = await plans.findOne({ userId: new ObjectId(req.session.userId), _id: new ObjectId(planId) });
if (!plan) {
console.log(`Plan not found with ID: ${planId} for user: ${req.session.user.email}`);
console.log(`Plan not found with ID: ${planId} for user: ${req.session.userId}`);
req.session.errMessage = "Plan not found or you do not have permission to view it.";
return res.status(status.NotFound).redirect('/plans');
}
@@ -188,7 +188,7 @@ module.exports = (middleware, users, plans, assets) => {
return;
}
const newPlan = {
userId: new ObjectId(req.session.user._id),
userId: new ObjectId(req.session.userId),
name: value.name,
retirementAge: value.retirementAge,
retirementExpenses: value.retirementExpenses,
@@ -198,7 +198,7 @@ module.exports = (middleware, users, plans, assets) => {
};
try {
await plans.insertOne({ userId: new ObjectId(req.session.user._id), ...newPlan });
await plans.insertOne({ userId: new ObjectId(req.session.userId), ...newPlan });
req.session.errMessage = "";
res.redirect('/plans');
}
@@ -272,7 +272,7 @@ module.exports = (middleware, users, plans, assets) => {
}
users.updateOne(
{ _id: new ObjectId(req.session.user._id) },
{ _id: new ObjectId(req.session.userId) },
{
$set: {
financialData: true,
@@ -287,13 +287,13 @@ module.exports = (middleware, users, plans, assets) => {
}
).then((result) => {
if (result.matchedCount === 0) {
console.log(`User not found during questionnaire update: ${req.session.user.email}`);
console.log(`User not found during questionnaire update: ${req.session.userId}`);
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.user.email}`);
console.log(`User questionnaire data unchanged (already up-to-date): ${req.session.userId}`);
}
req.session.user.financialData = true;
@@ -325,7 +325,7 @@ module.exports = (middleware, users, plans, assets) => {
if (valid.err) {
req.session.errMessage = "Invalid input",
res.status(status.BadRequest);
res.status(status.BadRequest);
return res.redirect("/profile");
}
@@ -343,17 +343,17 @@ module.exports = (middleware, users, plans, assets) => {
}
users.updateOne(
{ email: req.session.email },
{ _id: new ObjectId(req.session.userId) },
{ $set: update }
).then((result) => {
if (result.matchedCount === 0) {
console.log(`User not found during account update: ${req.session.email}`);
console.log(`User not found during account update: ${req.session.userId}`);
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}`);
console.log(`User account data unchanged (already up-to-date): ${req.session.userId}`);
}
req.session.errMessage = "";
@@ -385,7 +385,7 @@ module.exports = (middleware, users, plans, assets) => {
}
let newAsset = {
userId: new ObjectId(req.session.user._id),
userId: new ObjectId(req.session.userId),
...req.body,
updatedAt: new Date(),
};
@@ -429,7 +429,7 @@ module.exports = (middleware, users, plans, assets) => {
return res.redirect("/assets");
}
if (req.body.userId != req.session.user._id) {
if (req.body.userId != req.session.userId) {
req.session.errMessage = "Cannot change asset owner",
res.status(status.BadRequest);
return res.redirect("/assets");
@@ -499,20 +499,20 @@ module.exports = (middleware, users, plans, assets) => {
router.post("/deleteUser", (req, res) => {
// not as critical if results aren't as expected only if crashing
assets.deleteMany({ userId: new ObjectId(req.session.user._id) }).catch((err) => {
assets.deleteMany({ userId: new ObjectId(req.session.userId) }).catch((err) => {
console.error("Error deleting user assets: ", err);
req.session.errMessage = "An error occured while deleting your account. Please try again.";
return res.status(status.InternalServerError).redirect("/profile");
});
plans.deleteMany({ userId: new ObjectId(req.session.user._id) }).catch((err) => {
plans.deleteMany({ userId: new ObjectId(req.session.userId) }).catch((err) => {
console.error("Error deleting user assets: ", err);
req.session.errMessage = "An error occured while deleting your account. Please try again.";
return res.status(status.InternalServerError).redirect("/profile");
});
users.deleteOne(
{ _id: new ObjectId(req.session.user._id) },
{ _id: new ObjectId(req.session.userId) },
).then((result) => {
if (result.deletedCount === 0) {
console.error(`User not found: ${req.body.id}`);
@@ -543,11 +543,19 @@ module.exports = (middleware, users, plans, assets) => {
country = data.results[0].formatted_address;
let results = await getRates(country);
req.session.geoData = {
country: results.abbreviation,
toCurrencyRates: results.exRates,
geoData: req.session.geoData
if (!results.exRates) {
req.session.geoData = {
message: "error"
}
} else {
req.session.geoData = {
country: results.abbreviation,
toCurrencyRates: results.exRates,
geoData: req.session.geoData
}
}
}
return res.status(status.Ok).send({ data: req.session.geoData });
src/views/partials/header.ejs
+4 -2
View File
@@ -17,12 +17,12 @@
</div>
<div style="display: none;" class="flex items-center" id="currencyExchange">
<div class="shrink-0 z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center text-gray-900 bg-gray-100 border border-gray-300 rounded-s-lg focus:ring-4 focus:outline-none focus:ring-gray-100 dark:bg-gray-700 dark:focus:ring-gray-700 dark:text-white dark:border-gray-600">
<div id="exFrom" class="shrink-0 z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center text-gray-900 bg-gray-100 border border-gray-300 rounded-s-lg focus:ring-4 focus:outline-none focus:ring-gray-100 dark:bg-gray-700 dark:focus:ring-gray-700 dark:text-white dark:border-gray-600">
<img src="" id="yourFlag" class="h-4 w-4 me-2" alt="">
<p id="flagTag"></p>
</div>
<div class="relative w-full">
<p id="exchange" class="block text-center p-2.5 w-40 z-20 text-sm text-gray-900 bg-gray-50 border-s-0 border border-gray-300 focus:ring-blue-500 focus:border-blue-500 dark:bg-gray-700 dark:border-s-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:border-blue-500">
<p id="exchange" class="block text-center p-2.5 w-40 z-20 text-sm border bg-gray-700 border-gray-600 placeholder-gray-400 text-white focus:border-blue-500">
</p>
</div>
<button id="dropdown-country-button" value="" data-dropdown-toggle="dropdown-country" class="shrink-0 z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center text-gray-900 bg-gray-100 border border-gray-300 rounded-e-lg hover:bg-gray-200 focus:ring-4 focus:outline-none focus:ring-gray-100 dark:bg-gray-700 dark:hover:bg-gray-600 dark:focus:ring-gray-700 dark:text-white dark:border-gray-600" type="button">
@@ -38,6 +38,8 @@
</ul>
</div>
</div>
<% } else if(geoData.message == "error") { %>
<p>error</p>
<% } else { %>
<div class="flex items-center">
<div class="shrink-0 z-10 inline-flex items-center py-2.5 px-4 text-sm font-medium text-center text-gray-900 bg-gray-100 border border-gray-300 rounded-s-lg focus:ring-4 focus:outline-none focus:ring-gray-100 dark:bg-gray-700 dark:focus:ring-gray-700 dark:text-white dark:border-gray-600">