Fixed: /sendFeedback route working

Fixed: /sendFeedback route working

Author: hariketsheth

.gitignore

@@ -1,4 +1,4 @@
 node_modules
 
 ## sensitive information
-constants.js
+.env

Mailer/transporter.js

@@ -1,15 +1,14 @@
-const nodemailer = require('nodemailer')
+const nodemailer = require("nodemailer");
 
 // constants
-const { SERVICE, EMAIL, PASSWORD } = require('../constants')
+const { SERVICE, EMAIL, PASSWORD } = require("../constants");
 
 const transporter = nodemailer.createTransport({
-    service: SERVICE,
-    auth: {
-        user: EMAIL,
-        pass: PASSWORD
-    }
-})
-
-
-module.exports = transporter
+  service: SERVICE,
+  auth: {
+    user: EMAIL,
+    pass: PASSWORD,
+  },
+});
+
+module.exports = transporter;

ValidateUser/validateuser.js

@@ -1,19 +1,16 @@
-const express = require('express')
-
+const express = require("express");
 
 // TOKEN
-const { TOKEN } = require('../constants')
-
-const verifyToken = (req,res,next)=>{
+const { TOKEN } = require("../constants");
 
-    if(!req.headers['authorization']) return next(new Error('User token not found'))
+const verifyToken = (req, res, next) => {
+  if (!req.headers["authorization"])
+    return next(new Error("User token not found"));
 
-    const authHeader = req.headers['authorization']
-    const token = authHeader.split(' ')[1]
-    if(token==TOKEN) next()
-    else 
-        return next(new Error('Unauthorized User.'))
-    
-}
+  const authHeader = req.headers["authorization"];
+  const token = authHeader.split(" ")[1];
+  if (token == TOKEN) next();
+  else return next(new Error("Unauthorized User."));
+};
 
-module.exports = verifyToken
+module.exports = verifyToken;

constants.js

@@ -0,0 +1,15 @@
+// email credentials
+const SERVICE = process.env.EMAIL_SERVICE;
+const EMAIL = process.env.EMAIL;
+const PASSWORD = process.env.PASSWORD;
+
+// for feedback
+const EMAILTO = process.env.EMAIL_TO;
+
+// google photos
+const ALBUMID = process.env.ALBUM_ID;
+
+// token
+const TOKEN = process.env.TOKEN;
+
+module.exports = { SERVICE, EMAIL, PASSWORD, EMAILTO, ALBUMID, TOKEN };

index.js

@@ -1,52 +1,51 @@
-const express = require('express')
-const cors = require('cors')
-const bodyParser = require('body-parser')
+const express = require("express");
+const cors = require("cors");
+const bodyParser = require("body-parser");
 const app = express();
+require("dotenv").config();
 
 // user verification
-const verifyToken = require('./ValidateUser/validateuser')
+const verifyToken = require("./ValidateUser/validateuser");
 
 // google photos
-const { getAlbum } = require('./GooglePhotos/googlePhotos')
+const { getAlbum } = require("./GooglePhotos/googlePhotos");
 
 // mail
-const transporter = require('./Mailer/transporter')
-const sendEmail = require('./Mailer/mail')
+const transporter = require("./Mailer/transporter");
+const sendEmail = require("./Mailer/mail");
 
 // constants
-const { EMAIL, EMAILTO, ALBUMID } = require('./constants')
+const { EMAIL, EMAILTO, ALBUMID } = require("./constants");
 
 // middlewares
 app.use(bodyParser.urlencoded({ extended: true }));
-app.use(bodyParser.json())
-app.use(cors())
+app.use(bodyParser.json());
+app.use(cors());
 
 app.use(express.static("public"));
 
 /**
  * To change email id (to be used for sending emails)
- * 
+ *
  * 1. Go to account setting of your GMAIL account.
  * 2. Then go to 'allow less secure apps..'.
  * 3. Generate a new password and use that here to allow nodemailer to logging in your gmail account, skipping 2 step verification step.
- *  
+ *
  * Reference:
  * https://stackoverflow.com/questions/26196467/sending-email-via-node-js-using-nodemailer-is-not-working
- * 
+ *
  */
 
-
 /**
  * this endpoint is for sending user's credentials when a new account is created from admin panel.
  */
 
-app.post("/sendMail", verifyToken ,async (req, res, next) => {
-
-    let mailOptions = {
-        from: EMAIL,
-        to: req.body.email || EMAIL,
-        subject: 'Technocrats Member Profile Credentials',
-        html: `
+app.post("/sendMail", verifyToken, async (req, res, next) => {
+  let mailOptions = {
+    from: EMAIL,
+    to: req.body.email || EMAIL,
+    subject: "Technocrats Member Profile Credentials",
+    html: `
         <h1>Welcome to Technocrats Robotics</h1>
         <p>Click on the&nbsp;<strong>Member Login</strong> button at the bottom footer of the web app.</p>
         <p><span style="color: #0000ff;">Following are your credentials to customize your profile on the web app:<br /> <span style="color: #ff0000;"><strong>Username:</strong> ${req.body.data.username}</span><br /><span style="color: #ff0000;"><strong>Password:</strong> ${req.body.data.password}<br /></span>Whosoever holds these credentials, if he be worthy, shall possess the power of a Member.</span></p>
@@ -55,73 +54,70 @@ app.post("/sendMail", verifyToken ,async (req, res, next) => {
         <blockquote>
         <p><strong>This is only a foretaste of what is to come, and only the shadow of what is going to be. <em>~ Alan Turing</em></strong></p>
         </blockquote>
-        `
-    };
-
-    let response = await sendEmail(transporter, mailOptions,next)
+        `,
+  };
 
-    if (response)
-        res.status(200).send({ message: "Sent" });
-})
+  let response = await sendEmail(transporter, mailOptions, next);
 
+  if (response) res.status(200).send({ message: "Sent" });
+});
 
 /**
- * endpoint to send feedback submitted by user in Contact Us form to TCR's official mail id 
+ * endpoint to send feedback submitted by user in Contact Us form to TCR's official mail id
  */
-app.post("/sendFeedback", verifyToken ,async (req, res, next) => {
-
-    let mailOptions = {
-        from: EMAIL,
-        to: EMAILTO,
-        subject: 'Got a Feedback !!',
-        html: `
+app.post("/sendFeedback", verifyToken, async (req, res, next) => {
+  let mailOptions = {
+    from: EMAIL,
+    to: EMAILTO,
+    subject: "Got a Feedback !!",
+    html: `
         <h1><u>Feedback</u></h1>
         <p><b><u>Name:</u></b> ${req.body.data.name}</p>
         <p><b><u>Email:</u></b> ${req.body.data.email}</p>
         <p><b><u>Contact:</u></b> ${req.body.data.contact}</p>
         <p><b><u>Message:</u></b> ${req.body.data.message}</p>
-        `
-    };
-
-    const response = await sendEmail(transporter, mailOptions, next)
+        `,
+  };
 
-    if (response)
-        res.status(200).send({ message: "Sent" });
-})
+  try {
+    const response = await sendEmail(transporter, mailOptions, next);
 
+    if (response) res.status(200).send({ message: "Sent" });
+  } catch (err) {
+    next(err);
+  }
+});
 
 /**
  * get the album id from google photos and pass it in the function getAlbum(<id>)
- * 
+ *
  */
 
-app.get("/gallery", verifyToken,async (req, res, next) => {
-    const result = await getAlbum(ALBUMID)
-    res.json(result)
-})
+app.get("/gallery", verifyToken, async (req, res, next) => {
+  const result = await getAlbum(ALBUMID);
+  res.json(result);
+});
 
 /*
  * information
  */
 app.get("/", (req, res, next) => {
-    res.sendFile(__dirname + "/" + "Information/information.html")
-})
+  res.sendFile(__dirname + "/" + "Information/information.html");
+});
 
 // error handler
 app.use((err, req, res, next) => {
-    res.status(err.status || 500)
-    res.send({
-        error: {
-            status: err.status || 500,
-            message: err.message
-        }
-    })
-})
-
+  res.status(err.status || 500);
+  res.send({
+    error: {
+      status: err.status || 500,
+      message: err.message,
+    },
+  });
+});
 
 var port = process.env.PORT || 5000;
 
-
 app.listen(port, function () {
-    console.log('Express server listening on port ' + port);
+  console.log("Express server listening on port " + port);
 });

package.json

@@ -20,6 +20,7 @@
     "axios": "^0.24.0",
     "body-parser": "^1.19.0",
     "cors": "^2.8.5",
+    "dotenv": "^16.0.1",
     "express": "^4.17.2",
     "nodemailer": "^6.7.1"
   }