use relative requires and update config

config/env/development.js

@@ -24,7 +24,7 @@ if (fs.existsSync(envFile)) {
  */
 
 module.exports = {
-  db: 'mongodb://localhost/noobjs_dev',
+  db: 'mongodb://localhost/noobjs_dev?replicaSet=rs0',
   facebook: {
     clientID: process.env.FACEBOOK_CLIENTID,
     clientSecret: process.env.FACEBOOK_SECRET,

config/express.js

@@ -20,7 +20,7 @@ const mongoStore = require('connect-mongo')(session);
 const flash = require('connect-flash');
 const winston = require('winston');
 const helpers = require('view-helpers');
-const config = require('config');
+const config = require('./config');
 const pkg = require('../package.json');
 
 const env = process.env.NODE_ENV || 'development';
@@ -40,15 +40,13 @@ module.exports = function (app, passport) {
   app.use(express.static(config.root + '/public'));
 
   // Use winston on production
-  let log;
+  let log = 'dev';
   if (env !== 'development') {
     log = {
       stream: {
         write: message => winston.info(message)
       }
     };
-  } else {
-    log = 'dev';
   }
 
   // Don't log during tests
@@ -77,7 +75,7 @@ module.exports = function (app, passport) {
   // bodyParser should be above methodOverride
   app.use(bodyParser.json());
   app.use(bodyParser.urlencoded({ extended: true }));
-  app.use(multer());
+  app.use(multer().array('image', 1));
   app.use(methodOverride(function (req) {
     if (req.body && typeof req.body === 'object' && '_method' in req.body) {
       // look in urlencoded POST bodies and delete it
@@ -90,15 +88,6 @@ module.exports = function (app, passport) {
   // CookieParser should be above session
   app.use(cookieParser());
   app.use(cookieSession({ secret: 'secret' }));
-  app.use(session({
-    resave: true,
-    saveUninitialized: true,
-    secret: pkg.name,
-    store: new mongoStore({
-      url: config.db,
-      collection : 'sessions'
-    })
-  }));
 
   // use passport session
   app.use(passport.initialize());
@@ -110,8 +99,17 @@ module.exports = function (app, passport) {
   // should be declared after session and flash
   app.use(helpers(pkg.name));
 
-  // adds CSRF support
-  if (process.env.NODE_ENV !== 'test') {
+  if (env !== 'test') {
+    app.use(session({
+      resave: true,
+      saveUninitialized: true,
+      secret: pkg.name,
+      store: new mongoStore({
+        url: config.db,
+        collection : 'sessions'
+      })
+    }));
+
     app.use(csrf());
 
     // This could be moved to view-helpers :-)

config/passport/facebook.js

@@ -6,7 +6,7 @@
 
 const mongoose = require('mongoose');
 const FacebookStrategy = require('passport-facebook').Strategy;
-const config = require('config');
+const config = require('../config');
 const User = mongoose.model('User');
 
 /**

config/passport/github.js

@@ -6,7 +6,7 @@
 
 const mongoose = require('mongoose');
 const GithubStrategy = require('passport-github').Strategy;
-const config = require('config');
+const config = require('../config');
 const User = mongoose.model('User');
 
 /**

config/passport/google.js

@@ -6,7 +6,7 @@
 
 const mongoose = require('mongoose');
 const GoogleStrategy = require('passport-google-oauth').OAuth2Strategy;
-const config = require('config');
+const config = require('../config');
 const User = mongoose.model('User');
 
 /**

config/passport/linkedin.js

@@ -6,7 +6,7 @@
 
 const mongoose = require('mongoose');
 const LinkedinStrategy = require('passport-linkedin').Strategy;
-const config = require('config');
+const config = require('../config');
 const User = mongoose.model('User');
 
 /**

config/passport/local.js

@@ -6,7 +6,7 @@
 
 const mongoose = require('mongoose');
 const LocalStrategy = require('passport-local').Strategy;
-const config = require('config');
+const config = require('../config');
 const User = mongoose.model('User');
 
 /**

config/passport/twitter.js

@@ -6,7 +6,7 @@
 
 const mongoose = require('mongoose');
 const TwitterStrategy = require('passport-twitter').Strategy;
-const config = require('config');
+const config = require('../config');
 const User = mongoose.model('User');
 
 /**

config/routes.js

@@ -7,10 +7,10 @@
 // Note: We can require users, articles and other cotrollers because we have
 // set the NODE_PATH to be ./app/controllers (package.json # scripts # start)
 
-const users = require('users');
-const articles = require('articles');
-const comments = require('comments');
-const tags = require('tags');
+const users = require('../app/controllers/users');
+const articles = require('../app/controllers/articles');
+const comments = require('../app/controllers/comments');
+const tags = require('../app/controllers/tags');
 const auth = require('./middlewares/authorization');
 
 /**
@@ -122,7 +122,14 @@ module.exports = function (app, passport) {
       || (~err.message.indexOf('Cast to ObjectId failed')))) {
       return next();
     }
+
     console.error(err.stack);
+
+    if (err.stack.includes('ValidationError')) {
+      res.status(422).render('422', { error: err.stack });
+      return;
+    }
+
     // error page
     res.status(500).render('500', { error: err.stack });
   });