Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Logout #32

Merged
merged 4 commits into from
Sep 20, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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}`);
Expand Down
10 changes: 6 additions & 4 deletions controllers/authControllers.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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");
}
Expand Down Expand Up @@ -80,3 +77,8 @@ module.exports.login_post = async (req, res) => {
}

}

module.exports.logout_get = (req, res) => {
res.cookie('jwt', '', { maxAge: 1 });
res.redirect('/');
}
15 changes: 15 additions & 0 deletions middleware/authMiddleware.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 };
2 changes: 1 addition & 1 deletion models/blogapi/crud.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ var blogSchema = new mongoose.Schema({
});

var blogTable = mongoose.model("blog", blogSchema);

module.exports = blogTable;
rutu363 marked this conversation as resolved.
Show resolved Hide resolved
module.exports = {
createBlog: function (inputData, callback) {
userData = new blogTable(inputData);
Expand Down
11 changes: 3 additions & 8 deletions models/user/User.js
Original file line number Diff line number Diff line change
@@ -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:{
Expand Down Expand Up @@ -39,7 +34,7 @@ const userSchema = new mongoose.Schema({
type: Date,
required: false
},
Blogs:[blogsSchema]
Blogs:[]
});

//fire a function before doc saved to db
Expand Down
6 changes: 3 additions & 3 deletions routes/auths/authRoutes.js
Original file line number Diff line number Diff line change
@@ -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;
1 change: 1 addition & 0 deletions views/landing.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@
<i class="material-icons">menu</i>
</a>
<ul class="right hide-on-med-and-down">
<li><a href="/auth/logout">Log out</a></li>
<li><a href="#about">About</a></li>
<li><a href="#contact">Contact</a></li>
<!-- <li><a href="#" class="btn right">Join Now</a></li> -->
Expand Down