tem1

app.js

@@ -130,7 +130,7 @@ try {
         },async function (email, givenPassword, done) {
             debug("LINE 20");
             debug(email, givenPassword);
-            return pool.query('Select id, password, name, uType, isActive, isVerified, verificationLink from user where email = ?;', [email])
+            return pool.query('Select id, password, name, uType, isActive, isVerified, verificationCode from user where email = ?;', [email])
                 .then(results => {
                     if (results[0].length > 0) {
                         const {

bin/www

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 
 /**
  * Module dependencies.

package.json

@@ -12,6 +12,7 @@
     "ip": "node ip.test.js"
   },
   "dependencies": {
+    "@sendgrid/mail": "^7.4.0",
     "bcrypt": "^5.0.0",
     "body-parser": "^1.19.0",
     "compression": "^1.7.4",
@@ -27,6 +28,7 @@
     "helmet": "^4.2.0",
     "morgan": "^1.9.1",
     "mysql2": "^2.2.5",
+    "nanoid": "^3.1.20",
     "passport": "^0.4.1",
     "passport-local": "^1.0.0",
     "validator-pizza-node": "^1.0.3"

routes/index.js

@@ -1,5 +1,13 @@
 const express = require('express');
 const path = require('path');
+const {
+    nanoid
+} = require('nanoid');
+// const bcrypt = require('bcrypt');
+const {
+    sendVerificationMail
+} = require('../tools/sendEmails');
+
 const router = express.Router();
 const debug = require('debug')('backend:server:index.js');
 const {
@@ -54,7 +62,7 @@ router.get("/login", function (req, res, next) {
 });
 
 router.post("/login", (req, res, next) => {
-    if(req.isAuthenticated()) {
+    if (req.isAuthenticated()) {
         debug("Is Authenticated");
         res.redirect(301, "/users/student");
         return;
@@ -256,12 +264,13 @@ router.post('/register',
                 errors: results.array()
             });
         } else {
+            const verificationID = nanoid();
             // console.table([{
             //     ...req.body
             // }]);
 
             // debug("Received at /register");
-            req.db.query("CALL Reg(?, ?, ?, ?, ?, ?, ?, ?, ?, ?);", [req.body.email, req.body.password, req.body.fullname, req.body.mobile, req.body.address, req.body.city, req.body.country, req.body.postcode, req.body.institute_name, req.body.photo])
+            req.db.query("CALL Reg(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);", [req.body.email, req.body.password, req.body.fullname, req.body.mobile, req.body.address, req.body.city, req.body.country, req.body.postcode, req.body.institute_name, req.body.photo, verificationID])
                 .then((...results) => {
                     const data = results[0][0][0];
                     console.log(...results);
@@ -273,8 +282,16 @@ router.post('/register',
                     }]);
                     // res.json(req.body);
                     // res.redirect("/registrationSuccess")
-                    debug("Response Sent successfully");
-                    res.send("Registration Successful");
+                    // debug("Response Sent successfully");
+                    // res.send("Registration Successful");
+
+                    return sendVerificationMail(req.body.email, verificationID);
+                })
+                .then(results => {
+                    if (results[0].statusCode == 202) {
+                        debug("sent code:  " + verificationID);
+                        res.send("<h1>SUCCESSFULLY REGISTERED Please verify from your mail</h1>");
+                    } else throw results;
                 })
                 .catch((err) => {
                     debug(err);
@@ -327,20 +344,22 @@ router.post("/uploadImage", (req, res) => {
 })
 
 router.get('/companyQuizs', (req, res) => {
-    const { companyId } = req.query;
+    const {
+        companyId
+    } = req.query;
     // res.send(companyId);
     req.db.query('select q.id, q.quiz_id, q.quiz_time from quiz_list q join company c on q.company_id = c.id where q.company_id = ? and c.active = true and q.isActive = true;', [companyId])
-    .then((results) => {
-        if (results[0].length >= 1) {
-          res.send(results[0]);
-        } else if (results[0].length === 0) {
-          res.send("No Quiz");
-        }
-      })
-      .catch((err) => {
-        console.log(err);
-        res.status(500).send(err);
-      });
+        .then((results) => {
+            if (results[0].length >= 1) {
+                res.send(results[0]);
+            } else if (results[0].length === 0) {
+                res.send("No Quiz");
+            }
+        })
+        .catch((err) => {
+            console.log(err);
+            res.status(500).send(err);
+        });
 });
 
 router.use("/images", express.static(path.join(__dirname, "..", "custom-images")));

routes/student.js

@@ -35,7 +35,7 @@ router.get('/fetchQuiz/:id/:quizId', (req, res) => {
         });
 
         // res.send({id, quizId});
-})
+});
 
 router.use(express.static(path.join(__dirname, "..", "public", "student")));
 module.exports = router;

routes/users.js

@@ -1,6 +1,7 @@
 const express = require('express');
 const path = require('path');
 const mysql = require('mysql2');
+const bcrypt = require('bcrypt');
 
 const router = express.Router();
 const debug = require('debug')('backend:server:index.js');
@@ -16,6 +17,21 @@ router.all('/test', function (_req, res) {
     debug("into /test");
     res.send("TEST SUCCESS");
 });
+router.get('/verify', (req, res) => {
+    const verificationID = req.query.code;
+    const email = req.query.refs;
+    req.db.query('update user set isVerified = TRUE, verificationCode = NULL where verificationCode = ?;', [verificationID])
+    .then((results) => {
+      if(results[0].changedRows===1) {
+        res.send("<h1>SUCCESSFULLY Verified</h1>")
+      } else {
+        res.send("<h1>INVALID Verification</h1>");
+      }
+    })
+    .catch((err) => {
+      console.log(err);
+    });
+})
 
 router.use("/assets", express.static(path.join(__dirname, "..", "public", "assets")));
 router.use("/admin", express.static(path.join(__dirname, "..", "public", "admin")))