Merge pull request #32 from tanmayc07/logout

Logout

app.js

@@ -11,7 +11,9 @@ const PORT = process.env.PORT;
 const { requireAuth } = require("./middleware/authMiddleware");
 const Index  = require("./routes/Index");
 const app = express();
-
+const checkUser = require("./middleware/authMiddleware");
+
+
 app.use(express.static(__dirname + "./public"));
 app.use(express.json());
 app.post("/register",routes);
@@ -24,16 +26,17 @@ app.use(cors());
 app.use(express.static(__dirname + "/public"));
 app.use(bodyParser.urlencoded({ extended: true }));
 app.use(bodyParser.json());
+
 app.use("/auth", authRoutes);
 app.use("/blogs", blogRoutes);
 app.use("/",Index);
 
 app.set("views", "./views");
 app.set("view engine", "ejs");
 
-app.get("/home", requireAuth, (req, res) => {
-  res.json("LOGGED IN");
-}); 
+//app.get("/auth/login", checkUser, (req, res) => {
+//  res.render("register");
+//}); 
 
 app.listen(PORT, () => {
   console.log(`Server started at port ${PORT}`);

controllers/authControllers.js

@@ -2,6 +2,7 @@ var User = require("../models/user/User");
 const conn = require("../config/database");
 const bcrypt = require("bcryptjs");
 const jwt = require("jsonwebtoken");
+const checkUser = require("../middleware/authMiddleware");
 
 const handleErrors =(err) => {
   console.log(err.message);
@@ -28,10 +29,6 @@ const handleErrors =(err) => {
   return errors
 }
 
-const redirect = (req,res)=> {
- res.redirect("/auth/login");
-}  
-
 module.exports.register_get = (req, res) => {
   res.render("register");
 }
@@ -80,3 +77,8 @@ module.exports.login_post = async (req, res) => {
   }
 
 }
+
+module.exports.logout_get = (req, res) => {
+  res.cookie('jwt', '', { maxAge: 1 });
+  res.redirect('/');
+}

middleware/authMiddleware.js

@@ -19,4 +19,19 @@ const requireAuth = (req, res, next) => {
   }
 };
 
+const checkUser = (req,res,next)=> {
+  const token = req.cookies.jwt;
+  if(token)  {
+    res.redirect("/")
+    console.log(token)
+  }
+  else{
+    console.log(token)
+    next();
+
+  }
+
+};
+
+module.exports = { checkUser };
 module.exports = { requireAuth };

models/blogapi/crud.js

@@ -15,6 +15,7 @@ module.exports = {
     userData = new blogTable(inputData);
     userData.save(function (err, data) {
       if (err) throw err;
+
       return callback(data);
     });
   },

models/user/User.js

@@ -1,12 +1,7 @@
 const mongoose = require("mongoose");
-const bcrypt = require("bcryptjs")
+const bcrypt = require("bcryptjs");
+
 
-const blogsSchema = new mongoose.Schema({
-    blogId:{
-        type: String,
-        required: false
-    }
-});
 
 const userSchema = new mongoose.Schema({
     firstname:{
@@ -39,7 +34,7 @@ const userSchema = new mongoose.Schema({
         type: Date,
         required: false
     },
-    Blogs:[blogsSchema]
+    Blogs:[]
 });
 
 //fire a function before doc saved to db

routes/auths/authRoutes.js

@@ -1,11 +1,11 @@
 const routes= require("express").Router();
 const authController = require("../../controllers/authControllers");
-const { requireAuth } = require("../../middleware/authMiddleware");
+const { checkUser }  = require("../../middleware/authMiddleware");
 
 
 routes.route("/login").get(authController.login_get);
-routes.route("/login").post(authController.login_post);
+routes.route("/login").post( authController.login_post);
 routes.route("/register").get(authController.register_get);
 routes.route("/register").post(authController.register_post);
-
+routes.route("/logout").get(authController.logout_get);
 module.exports = routes;

views/landing.ejs

@@ -122,6 +122,7 @@
         <!-- <a href="#" class="brand-logo left-align"
             ><img src="/img/logo.svg" alt="logo" width="100" height="7          0"
           /></a> -->
+
         <a href="#" class="sidenav-trigger" data-target="mobile-menu">
           <i class="material-icons">menu</i>
         </a>