Worked on email templete

.dockerignore

@@ -0,0 +1,2 @@
+node_modules
+npm-debug.log

.env

@@ -1,4 +1,5 @@
 
-PORT=2000
+PORT=3000
 JWT_SECRET=askfeed1234
-
+[email protected]
+PASS=*Saheb13*

.gitignore

@@ -1 +1,2 @@
 node_modules
+.env

.scannerwork/report-task.txt

@@ -0,0 +1,6 @@
+projectKey=token
+serverUrl=http://dev-sonarqube.springrole.com:9000
+serverVersion=8.9.1.44547
+dashboardUrl=http://dev-sonarqube.springrole.com:9000/dashboard?id=token
+ceTaskId=AXoaL8nL8zulQfXeM_9Q
+ceTaskUrl=http://dev-sonarqube.springrole.com:9000/api/ce/task?id=AXoaL8nL8zulQfXeM_9Q

.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+    "configurations": [
+        {
+            "name": "Docker Node.js Launch",
+            "type": "docker",
+            "request": "launch",
+            "preLaunchTask": "docker-run: debug",
+            "platform": "node",
+            "node": {
+                "package": "${workspaceFolder}/node_modules/which-module/package.json",
+                "localRoot": "${workspaceFolder}/node_modules/which-module"
+            }
+        }
+    ]
+}

.vscode/tasks.json

@@ -0,0 +1,46 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"type": "docker-build",
+			"label": "docker-build",
+			"platform": "node",
+			"dockerBuild": {
+				"dockerfile": "${workspaceFolder}/node_modules/which-module/Dockerfile",
+				"context": "${workspaceFolder}/node_modules/which-module",
+				"pull": true
+			},
+			"node": {
+				"package": "${workspaceFolder}/node_modules/which-module/package.json"
+			}
+		},
+		{
+			"type": "docker-run",
+			"label": "docker-run: release",
+			"dependsOn": [
+				"docker-build"
+			],
+			"platform": "node",
+			"node": {
+				"package": "${workspaceFolder}/node_modules/which-module/package.json"
+			}
+		},
+		{
+			"type": "docker-run",
+			"label": "docker-run: debug",
+			"dependsOn": [
+				"docker-build"
+			],
+			"dockerRun": {
+				"env": {
+					"DEBUG": "*",
+					"NODE_ENV": "development"
+				}
+			},
+			"node": {
+				"package": "${workspaceFolder}/node_modules/which-module/package.json",
+				"enableDebugging": true
+			}
+		}
+	]
+}

Dockerfile

@@ -0,0 +1,13 @@
+FROM node:14.16 
+
+WORKDIR /ask-feed
+
+COPY package.json /ask-feed/package.json
+
+RUN npm install
+
+COPY . /ask-feed
+
+EXPOSE 3000
+
+CMD ["npm","start"]

app.js

@@ -4,6 +4,8 @@ const cors = require("cors");
 const bcryptjs = require("bcryptjs");
 require("dotenv").config();
 require("./db/connectionDB");
+require("./models/user");
+require("./models/survey");
 const authRoutes = require("./routes/auth");
 const surveyRoutes = require("./routes/survey");
 
@@ -14,7 +16,10 @@ app.use(express.json());
 app.use(cors());
 app.use("/survey", surveyRoutes);
 app.use("/api", authRoutes);
-
-app.listen(process.env.PORT || 2000, () => {
-  console.log("server running on port 2000");
+app.get("/health", function (req, res) {
+  const message = "Running on port " + process.env.PORT;
+  return res.send(message);
+});
+app.listen(process.env.PORT || 3000, () => {
+  console.log("server running on port 3000");
 });

controllers/auth.js

@@ -3,15 +3,10 @@
 const bcryptjs = require("bcryptjs");
 const jwt = require("jsonwebtoken");
 
-const transporter = nodemailer.createTransport({
-  service: "gmail",
-  auth: {
-    user: "[email protected]",
-    pass: "*Saheb13*",
-  },
-});
+const { transporter } = require("../utils/transporter");
 
 const signup = async (req, res) => {
+  try{
   const { username, password, email, phoneNo } = req.body;
   const userexist = await User.findOne({ email });
   if (!userexist) {
@@ -26,16 +21,32 @@
       phoneNo,
       token,
     };
-
     const user = await User.create(newUser);
     if (user) {
       const data = {
         from: "[email protected]",
         to: email,
-        subject: "Account activation link",
-        html: `<h2>PLease click on given link to activate your account</h2>
-              <p>http://localhost:2000/api/activate/${token}</p>
-       `,
+        subject: "This is your Email verification link",
+        html: ` <hr style="height:2px;border-width:0;color:gray;background-color:gray">
+        <div style="text-align:center;">
+        <img src="cid:askfeedlogo"  width="150px" height="150px"> 
+        <h2 style="color:black;">Please click on the button to verify your mail!<br>We’re very excited to have you on board!</h2>
+        <button style="background-color:#3362a8"  target="_blank"><p input type="button" onclick="window.location.href='link' "><a style="color:white; text-decoration:none;" href="http://localhost:3000/api/activate/${token}">VERIFY EMAIL</a></p> </button>
+
+        <hr style="height:2px;border-width:0;color:gray;background-color:gray">
+
+          </div>
+          </div>
+      </div>
+      </body>
+      </html>`,
+        attachments: [
+          {
+            filename: "askfeedlogo.jpeg",
+            path: `${__dirname}/images/askfeedlogo.jpeg`,
+            cid: "askfeedlogo",
+          },
+        ],
       };
       try {
         await transporter.sendMail(data);
@@ -48,6 +59,11 @@
   } else {
     res.send("User already exist!");
   }
+}
+catch(e)
+{
+  throw new Error("Failed to create the function")
+}
 };
 
 const verifyAccount = async (req, res) => {
@@ -78,7 +94,6 @@
 const resetlink = async (req, res) => {
   const { email } = req.body;
   const user = await User.findOne({ email });
-  // console.log("user", user, email);
   if (user) {
     const token = jwt.sign({ email }, process.env.JWT_SECRET, {
       expiresIn: "30m",
@@ -95,10 +110,26 @@
     const data = {
       from: "[email protected]",
       to: email,
-      subject: "Reset link",
-      html: `<h2>PLease click on given link to reset your account</h2>
-            <p>http://localhost:2000/api/changepassword/?token=${token}</p>
-     `,
+      subject: "This is your account reset link",
+      html: ` <hr style="height:2px;border-width:0;color:gray;background-color:gray">
+      <div style="text-align:center;">
+      <img src="cid:askfeedlogo"  width="150px" height="150px"> 
+      <h2 style="color:black;">This is your account reset link!<br>Please click on the link to reset your password!</h2>
+      <button style="background-color:#3362a8"  target="_blank"><p input type="button" onclick="window.location.href='link' "><a style="color:white; text-decoration:none;" href="http://localhost:3000/api/changepassword/${token}">RESET PASSWORD</a></p> </button> 
+      <hr style="height:2px;border-width:0;color:gray;background-color:gray">
+
+        </div>
+        </div>
+    </div>
+    </body>
+    </html>`,
+      attachments: [
+        {
+          filename: "askfeedlogo.jpeg",
+          path: `${__dirname}/images/askfeedlogo.jpeg`,
+          cid: "askfeedlogo",
+        },
+      ],
     };
     try {
       await transporter.sendMail(data);
@@ -113,7 +144,7 @@
 
 const changepassword = async (req, res) => {
   const { password } = req.body;
-  const token = req.query.token;
+  const token = req.params.token;
   const decodedtoken = jwt.verify(token, process.env.JWT_SECRET);
   const hashedPass = await bcryptjs.hashSync(password, 10);
   const user = await User.findOneAndUpdate(
@@ -132,20 +163,45 @@
   }
 };
 const login = async (req, res) => {
-  const { email, password } = req.body;
-  const user = await User.findOne({ email });
-  const { _id } = user;
-  if (user) {
-    console.log("user", user);
-    const matchpassword = await bcryptjs.compare(password, user.password);
-    if (matchpassword && user.isVarified) {
-      const token = jwt.sign({ email, _id }, process.env.JWT_SECRET);
-      res.send({ token });
+  try {
+    const { email, password } = req.body;
+    const user = await User.findOne({ email });
+
+    if (user) {
+      const { _id } = user;
+
+      const matchpassword = await bcryptjs.compare(password, user.password);
+      if (matchpassword && user.isVarified) {
+        const token = jwt.sign({ email, _id }, process.env.JWT_SECRET);
+        res.send({ token, email: user.email, username: user.username });
+      }
     } else {
-      res.send("Login unsuccessful!");
+      res.send("Incorrect Email or password!");
     }
-  } else {
-    res.send("Incorrect Email or password!");
+  } catch (e) {
+    throw new Error("Fail to create operation");
   }
 };
-module.exports = { signup, verifyAccount, resetlink, changepassword, login };
+const updateProfile = async (req, res) => {
+  try {
+    const { _id } = req.body;
+    const userexist = await User.findOneAndUpdate({ _id }, { $set: req.body });
+    if (userexist) {
+      res.send("user updated successfully");
+    } else {
+      res.send("unable to update");
+    }
+  } catch (e) {
+    throw new Error("Unable to update");
+  }
+};
+
+
+module.exports = {
+  signup,
+  verifyAccount,
+  resetlink,
+  changepassword,
+  login,
+  updateProfile,
+};