routes protecting

imrahulkumar · imrahulkumar · commit eb83c076b79e · 2020-10-28T02:05:27.000+05:30
diff --git a/src/controllers/UserControllers.ts b/src/controllers/UserControllers.ts
@@ -47,7 +47,7 @@ export class UserController {
     static async verify(req, res, next) {
 
         const verificationToken = req.body.verification_token;
-        const email = req.body.email;
+        const email = req.user.email;
 
         try {
             const user = await User.findOneAndUpdate({
@@ -73,7 +73,7 @@ export class UserController {
 
     static async resendVerificationEmail(req, res, next) {
         // console.log(re)
-        const email = req.query.email;
+        const email = req.user.email;
         const verificationToken = Utils.generateVerificationToken();
         try {
             const user = await User.findOneAndUpdate({ email: email }, {
@@ -83,6 +83,7 @@ export class UserController {
 
             if (user) {
                 //SEND VERIFICATION EMAIL
+                console.log("verification code:", verificationToken)
                 await NodeMailer.sendEmail({
                     to: ['rahulgbu13@gmail.com'],
                     subject: 'Email Verification',
diff --git a/src/middleware/CheckError.ts b/src/middleware/CheckError.ts
@@ -1,19 +1,43 @@
 import { validationResult } from "express-validator";
+import * as Jwt from 'jsonwebtoken';
+import { getEnvironmentVariable } from "../environments/env";
 
 export class GlobalCheckErrorMiddleWare {
 
     static checkError(req, res, next) {
-
-        const error = validationResult(req);       
-
+        const error = validationResult(req);
         if (!error.isEmpty()) {
             next(new Error(error.array()[0].msg))
         } else {
             next();
         }
-
     }
 
+    static async authentication(req, res, next) {
+        const authHeader = req.headers.authorization;
+        const token = authHeader ? authHeader.slice(7, authHeader.length) : null;
+
+        try {
+            req.errorStatus = 401;
+            Jwt.verify(token, getEnvironmentVariable().jwt_secret, (err, decoded) => {
+            
+             if(err){
+                 next(err)
+             }
+             else if(!decoded){
+                 next(new Error('User Not Authorised'))
+             }
+             else{
+                 req.user = decoded;
+                 next();
+             }
+
+            })
+        }
+        catch (e) {
 
+        }
+
+    }
 
 }
diff --git a/src/routers/UserRouter.ts b/src/routers/UserRouter.ts
@@ -19,7 +19,7 @@ class UserRouter {
 
 
     getRoutes() {
-        this.router.get('/send/verification/email', UserValidators.resendVerificationEmail(), UserController.resendVerificationEmail);
+        this.router.get('/send/verification/email', UserValidators.resendVerificationEmail(),GlobalCheckErrorMiddleWare.authentication, UserController.resendVerificationEmail);
 
 
     }
@@ -29,7 +29,7 @@ class UserRouter {
     }
     patchRoutes() {
 
-        this.router.patch('/signup', UserValidators.verifyUser(), GlobalCheckErrorMiddleWare.checkError, UserController.verify);
+        this.router.patch('/verify', UserValidators.verifyUser(), GlobalCheckErrorMiddleWare.checkError,GlobalCheckErrorMiddleWare.authentication, UserController.verify);
     }
     deleteRoutes() {
 
diff --git a/src/validators/UserValidators.ts b/src/validators/UserValidators.ts
@@ -25,7 +25,6 @@ export class UserValidators {
     static verifyUser() {
         return [
             body('verification_token', 'Verifiction Token is Required').isNumeric(),
-            body('email', 'Email is required').isEmail()
         ]
     }
 

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class UserRouter {`
`19`	`19`
`20`	`20`
`21`	`21`	`getRoutes() {`
`22`		`- this.router.get('/send/verification/email', UserValidators.resendVerificationEmail(), UserController.resendVerificationEmail);`
	`22`	`+ this.router.get('/send/verification/email', UserValidators.resendVerificationEmail(),GlobalCheckErrorMiddleWare.authentication, UserController.resendVerificationEmail);`
`23`	`23`
`24`	`24`
`25`	`25`	`}`
`@@ -29,7 +29,7 @@ class UserRouter {`
`29`	`29`	`}`
`30`	`30`	`patchRoutes() {`
`31`	`31`
`32`		`- this.router.patch('/signup', UserValidators.verifyUser(), GlobalCheckErrorMiddleWare.checkError, UserController.verify);`
	`32`	`+ this.router.patch('/verify', UserValidators.verifyUser(), GlobalCheckErrorMiddleWare.checkError,GlobalCheckErrorMiddleWare.authentication, UserController.verify);`
`33`	`33`	`}`
`34`	`34`	`deleteRoutes() {`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ export class UserValidators {`
`25`	`25`	`static verifyUser() {`
`26`	`26`	`return [`
`27`	`27`	`body('verification_token', 'Verifiction Token is Required').isNumeric(),`
`28`		`- body('email', 'Email is required').isEmail()`
`29`	`28`	`]`
`30`	`29`	`}`
`31`	`30`