nikhilgupta2001 · SARVESHKHANDELWAL · Dec 21, 2020 · Dec 22, 2020 · Dec 22, 2020 · Dec 22, 2020
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
 /node_modules
+
+.env
diff --git a/index.js b/index.js
@@ -7,8 +7,8 @@ const app=express();
 const complains=require('./routes/Complains');
 const loged=require('./routes/login');
 const Complain=require('./models/complain');
-const checkAuth=require('./middleware/auth');
 
+const { checkAuth, checkUser } =require('./middleware/auth');
 //built in middleware for serving static files
 app.use(cookieParser());
 app.use(express.static('public'));
@@ -20,6 +20,8 @@ const { use } = require('./routes/Complains');
 
 app.use(bodyParser.urlencoded({ extended: true })); 
 app.use(express.json());
+
+app.get('*', checkUser);
 app.use('/complains',complains);
 
 
@@ -96,4 +98,4 @@ app.get('/signup', (req, res) => {
 
 const port =process.env.PORT || 3000;
 //asynchronous function handles wih callback
-app.listen(port,()=>console.log(`Listening to port ${port}...`));
+app.listen(port,()=>console.log(`Listening to port ${port}...`));
diff --git a/middleware/auth.js b/middleware/auth.js
@@ -1,13 +1,15 @@
 const jwt=require('jsonwebtoken');
 var cookieParser = require('cookie-parser')
 require('dotenv').config()
+const User = require('../models/Users');
 
-module.exports=(req,res,next)=>{
+const checkAuth=(req,res,next)=>{
     try{
         // console.log('hello');
-        console.log(req.cookies.token);
+        const token = req.cookies.token;
+        console.log(token);
         // console.log(process.env.JWT_KEY);
-        jwt.verify(req.cookies.token, process.env.JWT_KEY,(err,decoded)=>{
+        jwt.verify(token, process.env.JWT_KEY,(err,decoded)=>{
             if(err)
             {   console.log("Not Authorized");
                // res.status(500).json({err:"Not Authorized"})
@@ -31,4 +33,32 @@ module.exports=(req,res,next)=>{
 
     }
 
-} 
+}
+
+const checkUser = (req, res, next) => {
+    const token = req.cookies.token;
+
+    // verification of token
+    if(token) {
+        jwt.verify(token, JWT_KEY, async (err, decodedToken) => {
+            if(err) {
+                console.log(err.message);
+                res.locals.user = null;
+                next();
+            } else {
+                //console.log(decodedToken);
+                let user = await User.findById(decodedToken.id);
+                res.locals.user = user;
+                next();
+            }
+        });
+    } else {
+        res.locals.user = null;
+        next();
+    }
+}
+
+module.exports = {
+    checkAuth,
+    checkUser
+}
diff --git a/models/complain.js b/models/complain.js
@@ -31,5 +31,4 @@ const Complain=mongoose.model('complain',new mongoose.Schema({
 
 }));
 
-// exports.Complain=Complain;
 module.exports=Complain;
diff --git a/routes/login.js b/routes/login.js
@@ -143,6 +143,11 @@ router.delete('/:userId',(req,res,next)=>{
    });
 });
 
+router.get((req, res, next) => {
+    // replace existing cookie with fast expiring cookie
+    res.cookie('token', '', { maxAge: 1 });
+    res.redirect('/');
+});
 
 // router.post('/login', (req, res) => {
 //     const email = req.body.email;

diff --git a/views/complaintForm.ejs b/views/complaintForm.ejs
@@ -14,6 +14,10 @@
 </head>
 
 <body>
+    <header class="header">
+        <%- include('partials/header.ejs') %>
+    </header>
+
     <section class="form">
         <div class="container">
             <div style="justify-content: center;" class="row">
@@ -71,6 +75,8 @@
         </div>
     </section>
 
+    <%- include('partials/footer.ejs') %>
+
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/js/bootstrap.bundle.min.js"
         integrity="sha384-ygbV9kiqUc6oa4msXn9868pTtWMgiQaeYH7/t7LECLbyPA2x65Kgf80OJFdroafW" crossorigin="anonymous">
     </script>

diff --git a/views/partials/header.ejs b/views/partials/header.ejs
@@ -15,13 +15,23 @@
                     <li class="nav-item active"><a class="nav-link" href="#footer"><span class="fa fa-address-card fa-lg"></span><b> Contact Us</b></a></li>
                 </ul>
                 <span>
-                    <a href="/login">
-                        <span class="fa fa-sign-in"></span> <b>Log In</b>
-                    </a>
-                    &nbsp;&nbsp;&nbsp;&nbsp;
-                    <a href="/signup">                
-                        <span class="fa fa-user-plus"></span> <b>Sign Up</b>
-                    </a>
+                    <% if(username) { %>
+                        <a href="/login">
+                            <span class="fa fa-sign-in"></span> Log In  
+                        </a>
+                        &nbsp;&nbsp;&nbsp;&nbsp;
+                        <a href="/signup">                
+                            <span class="fa fa-user-plus"></span> Sign Up
+                        </a>
+                    <% } else { %>
+                        <a href="/profile">
+                            <span class="fa fa-sign-in"></span> <% username %> 
+                        </a>
+                        &nbsp;&nbsp;&nbsp;&nbsp;
+                        <a href="/logout">                
+                            <span class="fa fa-user-plus"></span> Log Out
+                        </a>
+                    <% } %>
                 </span>
             </div>
         </div>

diff --git a/views/sign.ejs b/views/sign.ejs
@@ -17,6 +17,8 @@
   </head>
 
   <body>
+
+
     <section class="form">
       <div class="container">
         <div class="row">
@@ -72,6 +74,7 @@
       </div>
     </section>
 
+
     <script
       src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta1/dist/js/bootstrap.bundle.min.js"
       integrity="sha384-ygbV9kiqUc6oa4msXn9868pTtWMgiQaeYH7/t7LECLbyPA2x65Kgf80OJFdroafW"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,5 +31,4 @@ const Complain=mongoose.model('complain',new mongoose.Schema({

		}));

		// exports.Complain=Complain;
		module.exports=Complain;