Refactor middleware in YelpCamp project

Author: anku255

YelpCamp/middleware/index.js

@@ -0,0 +1,53 @@
+var Campground = require("../models/campground");
+var Comment    = require("../models/comment");
+
+var middlewareObj = {};
+
+middlewareObj.checkCampgroundOwnership = function(req, res, next) {
+  if(req.isAuthenticated()) {
+    Campground.findById(req.params.id, function(err, foundCampground) {
+      if(err) {
+        res.redirect("/campgrounds");
+      } else {
+        // does user own the camground?
+        if(foundCampground.author.id.equals(req.user._id)) {
+          next();
+        } else {
+          res.redirect("back");
+        }
+      }
+    });
+  } else {
+    res.redirect("back");
+  }
+}
+
+middlewareObj.checkCommentOwnership = function(req, res, next) {
+  if(req.isAuthenticated()) {
+    Comment.findById(req.params.comment_id, function(err, foundComment) {
+      if(err) {
+        res.redirect("back");
+      } else {
+        // does user own the comment?
+        if(foundComment.author.id.equals(req.user._id)) {
+          next();
+        } else {
+          res.redirect("back");
+        }
+      }
+    });
+  } else {
+    res.redirect("back");
+  }
+}
+
+middlewareObj.isLoggedIn = function(req, res, next){
+  if(req.isAuthenticated()){
+    return next();
+  }
+  res.redirect("/login");
+}
+
+
+
+module.exports = middlewareObj;

YelpCamp/routes/campgrounds.js

@@ -1,6 +1,7 @@
 var express = require('express');
 var router  = express.Router();
 var Campground = require("../models/campground");
+var middleware = require("../middleware");
 
 // INDEX - show all campgrounds
 router.get("/", function(req, res) {
@@ -16,7 +17,7 @@ router.get("/", function(req, res) {
 });
 
 // NEW - show form to create new campground
-router.get("/new", isLoggedIn, function(req, res) {
+router.get("/new", middleware.isLoggedIn, function(req, res) {
   res.render("campgrounds/new")
 });
 
@@ -35,7 +36,7 @@ router.get("/:id", function(req, res) {
 });
 
 // CREATE - add new campground to DB
-router.post("/", isLoggedIn, function(req, res) {
+router.post("/", middleware.isLoggedIn, function(req, res) {
   // get data from form and add to campgrounds array
   var name = req.body.name;
   var image = req.body.image;
@@ -62,14 +63,14 @@ router.post("/", isLoggedIn, function(req, res) {
 });
 
 // EDIT Campground route
-router.get("/:id/edit", checkCampgroundOwnership, function(req, res) {
+router.get("/:id/edit", middleware.checkCampgroundOwnership, function(req, res) {
   Campground.findById(req.params.id, function(err, foundCampground) {
     res.render("campgrounds/edit", {campground: foundCampground});
   });
 });
 
 // UPDATE Campground route
-router.put("/:id", checkCampgroundOwnership, function(req, res) {
+router.put("/:id", middleware.checkCampgroundOwnership, function(req, res) {
   // find and update the correct campground
   Campground.findByIdAndUpdate(req.params.id, req.body.campground, function(err, updatedCamground) {
     if(err) {
@@ -82,7 +83,7 @@ router.put("/:id", checkCampgroundOwnership, function(req, res) {
 });
 
 // DESTROY Campground Route
-router.delete("/:id/", checkCampgroundOwnership, function(req, res) {
+router.delete("/:id/", middleware.checkCampgroundOwnership, function(req, res) {
   Campground.findByIdAndRemove(req.params.id, function(err) {
     if(err) {
       res.redirect("/campgrounds");
@@ -92,32 +93,4 @@ router.delete("/:id/", checkCampgroundOwnership, function(req, res) {
   });
 });
 
-// middleware
-function checkCampgroundOwnership(req, res, next) {
-  if(req.isAuthenticated()) {
-    Campground.findById(req.params.id, function(err, foundCampground) {
-      if(err) {
-        res.redirect("/campgrounds");
-      } else {
-        // does user own the camground?
-        if(foundCampground.author.id.equals(req.user._id)) {
-          next();
-        } else {
-          res.redirect("back");
-        }
-      }
-    });
-  } else {
-    res.redirect("back");
-  }
-}
-
-// middleware
-function isLoggedIn(req, res, next){
-  if(req.isAuthenticated()){
-    return next();
-  }
-  res.redirect("/login");
-}
-
 module.exports = router;

YelpCamp/routes/comments.js

@@ -2,9 +2,10 @@ var express    = require('express');
 var router     = express.Router({mergeParams: true}); // mergeParams will pass req.params in this file
 var Campground = require("../models/campground");
 var Comment    = require("../models/comment");
+var middleware = require("../middleware");
 
 // Comments New
-router.get("/new", isLoggedIn, function(req, res) {
+router.get("/new", middleware.isLoggedIn, function(req, res) {
   // Find campground by ID
   Campground.findById(req.params.id, function(err, campground) {
     if(err) {
@@ -16,7 +17,7 @@ router.get("/new", isLoggedIn, function(req, res) {
 });
 
 // Comments Create
-router.post("/", isLoggedIn, function(req, res) {
+router.post("/", middleware.isLoggedIn, function(req, res) {
   // lookup campgroud using ID
   Campground.findById(req.params.id, function(err, campground) {
     if(err) {
@@ -45,7 +46,7 @@ router.post("/", isLoggedIn, function(req, res) {
 });
 
 // Show edit form for Comment
-router.get("/:comment_id/edit", checkCommentOwnership, function(req, res) {
+router.get("/:comment_id/edit", middleware.checkCommentOwnership, function(req, res) {
   Comment.findById(req.params.comment_id, function(err, foundComment) {
     if(err) {
       res.redirect("back");
@@ -56,7 +57,7 @@ router.get("/:comment_id/edit", checkCommentOwnership, function(req, res) {
 });
 
 // UPDATE comment
-router.put("/:comment_id", checkCommentOwnership, function(req, res) {
+router.put("/:comment_id", middleware.checkCommentOwnership, function(req, res) {
   Comment.findByIdAndUpdate(req.params.comment_id, req.body.comment, function(err, updatedComment){
     if(err) {
       res.redirect("back");
@@ -67,7 +68,7 @@ router.put("/:comment_id", checkCommentOwnership, function(req, res) {
 });
 
 // DESTROY comment route
-router.delete("/:comment_id", checkCommentOwnership, function(req, res) {
+router.delete("/:comment_id", middleware.checkCommentOwnership, function(req, res) {
   Comment.findByIdAndRemove(req.params.comment_id, function(err) {
     if(err) {
       res.redirect("back");
@@ -77,32 +78,4 @@ router.delete("/:comment_id", checkCommentOwnership, function(req, res) {
   });
 });
 
-// middleware
-function checkCommentOwnership(req, res, next) {
-  if(req.isAuthenticated()) {
-    Comment.findById(req.params.comment_id, function(err, foundComment) {
-      if(err) {
-        res.redirect("back");
-      } else {
-        // does user own the comment?
-        if(foundComment.author.id.equals(req.user._id)) {
-          next();
-        } else {
-          res.redirect("back");
-        }
-      }
-    });
-  } else {
-    res.redirect("back");
-  }
-}
-
-// middleware
-function isLoggedIn(req, res, next){
-  if(req.isAuthenticated()){
-    return next();
-  }
-  res.redirect("/login");
-}
-
 module.exports = router;