express 4 and other fixes 🌻

Author: Azat Mardanov

ch6/password/app.js

@@ -10,54 +10,59 @@ var express = require('express'),
     users: db.collection('users')
   };
 
+// Express.js Middleware
+var session = require('express-session'),
+  logger = require('morgan'),
+  errorHandler = require('errorhandler'),
+  cookieParser = require('cookie-parser'),
+  bodyParser = require('body-parser'),
+  methodOverride = require('method-override');
 
 var app = express();
-app.locals.appTitle = "blog-express";
+app.locals.appTitle = 'blog-express';
 
+// Expose collections to request handlers
 app.use(function(req, res, next) {
-  if (!collections.articles || ! collections.users) return next(new Error("No collections."))
+  if (!collections.articles || ! collections.users) return next(new Error('No collections.'))
   req.collections = collections;
   return next();
 });
 
-
-
-// all environments
+// Express.js configurations
 app.set('port', process.env.PORT || 3000);
 app.set('views', path.join(__dirname, 'views'));
 app.set('view engine', 'jade');
-app.use(express.favicon());
-app.use(express.logger('dev'));
-app.use(express.json());
-app.use(express.cookieParser('3CCC4ACD-6ED1-4844-9217-82131BDCB239'));
-app.use(express.session({secret: '2C44774A-D649-4D44-9535-46E296EF984F'}))
-app.use(express.urlencoded());
-app.use(express.methodOverride());
+
+// Express.js middleware configuration
+app.use(logger('dev'));
+app.use(bodyParser.json());
+app.use(bodyParser.urlencoded());
+app.use(cookieParser('3CCC4ACD-6ED1-4844-9217-82131BDCB239'));
+app.use(session({secret: '2C44774A-D649-4D44-9535-46E296EF984F'}))
+app.use(methodOverride());
 app.use(require('stylus').middleware(__dirname + '/public'));
 app.use(express.static(path.join(__dirname, 'public')));
 
+// Authentication middleware
 app.use(function(req, res, next) {
   if (req.session && req.session.admin)
     res.locals.admin = true;
   next();
 });
 
-//authorization
+// Authorization Middleware
 var authorize = function(req, res, next) {
   if (req.session && req.session.admin)
     return next();
   else
     return res.send(401);
 };
 
-// development only
 if ('development' == app.get('env')) {
-  app.use(express.errorHandler());
+  app.use(errorHandler());
 }
 
-
-app.use(app.router);
-//PAGES&ROUTES
+// PAGES&ROUTES
 app.get('/', routes.index);
 app.get('/login', routes.user.login);
 app.post('/login', routes.user.authenticate);
@@ -67,7 +72,7 @@ app.get('/post', authorize, routes.article.post);
 app.post('/post', authorize, routes.article.postArticle);
 app.get('/articles/:slug', routes.article.show);
 
-//REST API ROUTES
+// REST API ROUTES
 app.all('/api', authorize);
 app.get('/api/articles', routes.article.list)
 app.post('/api/articles', routes.article.add);
@@ -76,6 +81,7 @@ app.del('/api/articles/:id', routes.article.del);
 
 
 
+
 app.all('*', function(req, res) {
   res.send(404);
 })

ch6/password/package.json

@@ -7,12 +7,21 @@
     "test": "mocha test"
   },
   "dependencies": {
-    "express": "3.4.5",
-    "jade": "*",
-    "mongoskin": "~0.6.1",
-    "stylus": "~0.40.3",
-    "mocha": "~1.16.2",
-    "superagent": "~0.15.7",
-    "expect.js": "~0.2.0"
+    "express": "4.1.2",
+    "jade": "1.3.1",
+    "stylus": "0.44.0",
+    "mongoskin": "1.4.1",
+    "cookie-parser": "1.0.1",
+    "body-parser": "1.0.2",
+    "method-override": "1.0.0",
+    "serve-favicon": "2.0.0",
+    "express-session": "1.0.4",
+    "morgan": "1.0.1",
+    "errorhandler": "1.0.1"
+  },
+  "devDependencies": {
+    "mocha": "1.16.2",
+    "superagent": "0.15.7",
+    "expect.js": "0.2.0"
   }
-}
+}

ch6/password/routes/user.js

@@ -21,7 +21,7 @@ exports.login = function(req, res, next) {
  */
 
 exports.logout = function(req, res, next) {
-  req.session = null;
+  req.session.destroy();
   res.redirect('/');
 };