Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added hashing Issue#60 #112

Merged
merged 6 commits into from
May 20, 2024
Merged

Added hashing Issue#60 #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
40ab028
Hashed password NgoRoutes.js
its-AkshatJain May 14, 2024
967bfb9
Corrected path of form in NGO-Registration.ejs
its-AkshatJain May 14, 2024
ba71c98
Update NgoRoutes.js and added the mail code as base branch
its-AkshatJain May 18, 2024
205a0fa
Merge branch 'main' into addHash
its-AkshatJain May 19, 2024
2e0876a
updated code
May 19, 2024
7d2a64c
Merge branch 'addHash' of https://github.com/its-AkshatJain/Petari in…
its-AkshatJain May 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
252 changes: 86 additions & 166 deletions routers/NgoRoutes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,176 +15,96 @@ const Admin = require("../model/admin");
const NGO = require("../model/ngo");
const Query = require("../model/query"); // Adjust the path based on your project structure

//Added some error handling in ngo login
router.post("/NGO-login", async (req, res) => {
const username = req.body.username;
const password = req.body.password;
const ngo = await NGO.findOne({ username: username, password: password });

try {
if (ngo) {
//checking NGO is APPROVED or NOT
if (ngo.approved == false) {
res.status(500).json({ messaage: "NGO is send for approval" });
}

const dooner = await User.find(); // Assuming User is your Mongoose model for users

res.render("NGO-Dashboard", {
fullName: ngo.NGOName,
email: ngo.username,
id: ngo.NGOID,
phoneNo: ngo.Mobile,
address: ngo.NGOLocation,
Donation: dooner,
Pickup: dooner,
complain: "",
});
} else {
res.status(404).json({ message: "NGO is not registered" });
const username = req.body.username;
const password = req.body.password;
try {
const ngo = await NGO.findOne({ username: username, password: password });
if (!ngo) {
return res.status(400).json({ error: 'NGO not found' });
}
const isPasswordValid = await bcrypt.compare(password, ngo.password);
if (!isPasswordValid) {
return res.status(400).json({ error: 'Invalid credentials' });
}
const dooner = await User.find(); // Assuming User is your Mongoose model for users
res.render("NGO-Dashboard", {
fullName: ngo.NGOName,
email: ngo.username,
id: ngo.NgoID, //corrected the id fetch from database
phoneNo: ngo.Mobile,
address: ngo.NgoLocation,
Donation: dooner,
Pickup: dooner,
complain: ""
});
} catch (err) {
console.error(err);
res.status(500).send("An internal server error occurred.");
}
} catch (err) {
console.error(err);
res.status(500).send("An internal server error occurred.");
}
});

router.post("/NGO-Registarion", async (req, res) => {
// Check if the NGO already exists
const existingNGO = await NGO.findOne({ username: req.body.username });
if (existingNGO) {
return res.status(400).json({ error: "NGO already exists" });
}

// Create a new NGO registration
const newNGO = new NGO({
username: req.body.username,
password: req.body.password,
NGOName: req.body.NgoName,
Mobile: req.body.Mobile,
NgoID: req.body.NgoID,
NgoLocation: req.body.NgoLocation,
approved: false,
});
// Save the new NGO to the database

try {
// Save the new NGO to the database
await newNGO.save();

const templatePath = path.join(
__dirname,
"../views",
"Email.template.handlebars"
);
const templateContent = fs.readFileSync(templatePath, "utf8");

// Compile the Handlebars template with the provided context data
const compiledHtml = Handlebars.compile(templateContent)({
user: {
_id: newNGO.NgoID, // Example ID
username: newNGO.NGOName, // Example username
email: newNGO.username, // Example email
fname: newNGO.NGOName, // Example first name
},
});
// Send an email to the admin for approval
const mailOptions = {
to: newNGO.username, // Admin's email address
subject: "New NGO Registration",
text: "A new NGO registration is pending approval. Login to the admin panel to review and approve.",
html: compiledHtml,
// Include any necessary information in the email body
};
transporter.transporter.sendMail(mailOptions, function (error, info) {
if (error) {
console.log(error);
} else {
console.log("Email sent: " + info.response);
router.post("/NGO-Registration", async (req, res) => {
try {
// Check if the NGO already exists
const existingNGO = await NGO.findOne({ username: req.body.username });
if (existingNGO) {
return res.status(400).json({ error: 'NGO already exists' });
}

// Hash the password for security
const hashedPassword = await bcrypt.hash(req.body.password, saltRounds);

// Create a new NGO registration
const newNGO = new NGO({
username: req.body.username,
password: hashedPassword, // Save the hashed password
NGOName: req.body.NGOName,
Mobile: req.body.Mobile,
NgoID: req.body.NgoID,
NgoLocation: req.body.NgoLocation,
approved: false
});

// Save the new NGO to the database
await newNGO.save();

const templatePath = path.join(__dirname, '../views', 'Email.template.handlebars');
const templateContent = fs.readFileSync(templatePath, 'utf8');

// Compile the Handlebars template with the provided context data
const compiledHtml = Handlebars.compile(templateContent)({
user: {
_id: newNGO.NgoID, // Example ID
username: newNGO.NGOName, // Example username
email: newNGO.username, // Example email
fname: newNGO.NGOName // Example first name
}
});
// Send an email to the admin for approval
const mailOptions = {
to: newNGO.username, // Admin's email address
subject: "New NGO Registration",
text: "A new NGO registration is pending approval. Login to the admin panel to review and approve.",
html: compiledHtml
// Include any necessary information in the email body
};
transporter.transporter.sendMail(mailOptions, function (error, info) {
if (error) {
console.log(error);
} else {
console.log("Email sent: " + info.response);
}
});

console.log('NGO registration request sent for approval');
res.status(200).json({ message: 'NGO registration request sent for approval' });
} catch (err) {
console.error('Error creating NGO:', err);
res.status(500).json({ error: 'Internal server error' });
}
});

console.log("NGO registration request sent for approval");
res
.status(200)
.json({ message: "NGO registration request sent for approval" });
} catch (err) {
console.error("Error creating NGO:", err);
res.status(500).json({ error: "Internal server error" });
}
// try {
// await newNGO.save();

// let mailOptions = {
// to: newNGO.username,
// subject: 'Welcome To Petari',
// template: 'Email.template',
// context: {
// ngo: {
// ngoName: newNGO.name,
// _id: newNGO._id,
// username: newNGO.password,
// },
// year: new Date().getFullYear()
// },
// attachments: [{
// filename: 'logo.png',
// path: path.join(__dirname, 'public', 'img', 'logo.png'),
// cid: 'logo'
// }]
// };

// transporter.sendMail(mailOptions, function(error, info){
// if (error) {
// console.log(error);
// } else {
// console.log('Email sent: ' + info.response);
// }
// });

// console.log('NGO registered successfully');
// res.status(200).json({ message: 'NGO registration received. It will be reviewed by the admin.' });
// } catch (err) {
// console.error('Error creating NGO:', err);
// res.status(500).json({ error: 'Internal server error' });
// }
// newNGO.save()
// .then((ngo) => {
// let mailOptions = {
// to: ngo.username,
// subject: 'Welcome To Petari',
// template: 'Email.template',
// context: {
// ngo: {
// ngoName: ngo.name,
// _id: ngo._id,
// username: ngo.password,

// },

// year: new Date().getFullYear()
// },
// attachments: [{
// filename: 'logo.png',
// path: path.join(__dirname, 'public', 'img', 'logo.png'),
// cid: 'logo'
// }]
// };
// transporter.sendMail(mailOptions, function(error, info){
// if (error) {
// console.log(error);
// } else {
// console.log('Email sent: ' + info.response);
// }
// });

// console.log('NGO registered successfully');
// res.status(200).json({ message: 'NGO registered successfully' });
});

// })
// .catch((err) => {
// console.error('Error creating NGO:', err);
// res.status(500).json({ error: 'Internal server error' });
// });
});
module.exports = router;

module.exports = router;
5 changes: 4 additions & 1 deletion views/NGO-Registration.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,9 @@
<header class="header">NGO Registration Form</header>
<br>
<hr>
<form action="/NGO-Registarion" class="form custom-box" method="POST">

<!-- Corrected the form action path -->
<form action="/NGO-Registration" class="form" method="POST">
<div class="input-box">
<label>NGO Name</label>
<input type="text" name="NgoName" placeholder="Enter NGO name" required />
Expand Down Expand Up @@ -158,3 +160,4 @@

</body>
</html>