Blankie/pastel.codes
1
0
Fork 0
mirror of https://github.com/aurora-dot/pastel.codes.git synced 2025-10-31 15:11:35 +00:00
Code Issues Projects Releases Wiki Activity

Hopefully worked, switched email method

Browse Source
This commit is contained in:
Esther
2020-07-01 15:00:52 +01:00
parent 111724c8e7
commit 02ae139566
4 changed files with 101 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
routes/contact.js
View File

@@ -4,20 +4,28 @@ const {verify} = require('hcaptcha');
const nodemailer = require('nodemailer')
var router = express.Router();
const sgMail = require('@sendgrid/mail');
sgMail.setApiKey(process.env.SENDGRID_API_KEY);
const contact_rate_limit = rate_limit({
windowMs: 10 * 60 * 1000, // 10 minutes
max: 5, // limit each IP to 10 requests per windowMs
message: "Too many contact requests, try again later.",
handler: function(req, res /*, next*/) {
res.render('error', {title:"Error", message: "Too many contact requests, try again later.", error: {status: null}})
handler: function (req, res /*, next*/) {
res.render('error', {
title: "Error",
message: "Too many contact requests, try again later.",
error: {status: null}
})
},
});
// POST route from contact form
router.post('/', contact_rate_limit,(req, res) => {
router.post('/', contact_rate_limit, (req, res) => {
const TO_GMAIL_USER = process.env.TO_GMAIL_USER
const FROM_GMAIL_USER = process.env.FROM_GMAIL_USER
const GMAIL_PASS = process.env.GMAIL_PASS
console.log(GMAIL_PASS)
const HCAPTCHA_KEY = process.env.HCAPTCHA_KEY
const token = req.body["g-recaptcha-response"];
const ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress;
@@ -25,51 +33,41 @@ router.post('/', contact_rate_limit,(req, res) => {
verify(HCAPTCHA_KEY, token)
.then((data) => {
if (data.success === true) {
// Instantiate the SMTP server
const smtpTrans = nodemailer.createTransport({
host: 'smtp.gmail.com',
port: 465,
secure: true,
auth: {
user: FROM_GMAIL_USER,
pass: GMAIL_PASS
}
})
// Specify what the email will look like
const mailOpts = {
from: 'Pastel.codes Contact Notifications', // This is ignored by Gmail
const msg = {
to: TO_GMAIL_USER,
from: FROM_GMAIL_USER,
subject: 'New message from contact form at pastel.codes',
text: `${req.body.firstname} ${req.body.lastname} (${req.body.email})\nsays: ${req.body.message}\n\nip: ${ip}`
}
};
// maybe send conformation email?
// Attempt to send the email
smtpTrans.sendMail(mailOpts, (error, response) => {
if (error) {
sgMail
.send(msg)
.then(() => {
res.render('contact', {
message: "I will get back to you soon!",
success: "Make sure the email is from ",
email: TO_GMAIL_USER
})
})
.catch(error => {
console.log(error)
res.render('error', { message: "Email did not send" }) // Show a page indicating failure
}
else {
res.render('contact', { message: "I will get back to you soon!", success: "Make sure the email is from ", email: TO_GMAIL_USER }) // Show a page indicating success
}
})
res.render('error', {message: "Email did not send"})
});
} else {
// rerender with same info in the text box and show error message
res.render('contact', { message: "Captcha failed, try again" });
// // rerender with same info in the text box and show error message
res.render('contact', {message: "Captcha failed, try again"});
}
})
.catch(error => {
console.log(error);
res.render('contact', { message: "Something wrong happened, try again later" });
res.render('contact', {message: "Something wrong happened, try again later"});
});
})
/* GET home page. */
router.get('/', function(req, res, next) {
res.render('contact', { title: 'Contact', description: "Contact me!"});
router.get('/', function (req, res, next) {
res.render('contact', {title: 'Contact', description: "Contact me!"});
});
module.exports = router;