Merge branch 'passport' of github.com:coralproject/talk into passport

app.js

@@ -89,37 +89,27 @@ app.use((req, res, next) => {
 
 // General error handler. Respond with the message and error if we have it while
 // returning a status code that makes sense.
-if (app.get('env') === 'development') {
-  app.use('/api', (err, req, res, next) => {
-    res.status(err.status || 500);
-    res.json({
-      message: err.message,
-      error: err
-    });
-  });
-
-  app.use('/', (err, req, res, next) => {
-    res.status(err.status || 500);
-    res.render('error', {
-      message: err.message,
-      error: err
-    });
-  });
-}
-
 app.use('/api', (err, req, res, next) => {
+  if (err !== ErrNotFound) {
+    console.error(err);
+  }
+
   res.status(err.status || 500);
   res.json({
     message: err.message,
-    error: {}
+    error: app.get('env') === 'development' ? err : null
   });
 });
 
 app.use('/', (err, req, res, next) => {
+  if (err !== ErrNotFound) {
+    console.error(err);
+  }
+
   res.status(err.status || 500);
   res.render('error', {
     message: err.message,
-    error: {}
+    error: app.get('env') === 'development' ? err : null
   });
 });
 

bin/cli-users

@@ -206,7 +206,7 @@ function listUsers() {
   const mongoose = require('../mongoose');
 
   User
-    .find()
+    .all()
     .then((users) => {
       let table = new Table({
         head: [

models/user.js

@@ -443,3 +443,18 @@ UserService.availabilityCheck = (email) => {
   });
 };
 
+/**
+ * Returns a count of the current users.
+ * @return {Promise}
+ */
+UserService.count = () => {
+  return UserModel.count();
+};
+
+/**
+ * Returns all the users.
+ * @return {Promise}
+ */
+UserService.all = () => {
+  return UserModel.find();
+};

package.json

@@ -16,8 +16,13 @@
   "config": {
     "pre-git": {
       "commit-msg": [],
-      "pre-commit": ["npm run lint", "npm test"],
-      "pre-push": ["npm test"],
+      "pre-commit": [
+        "npm run lint",
+        "npm test"
+      ],
+      "pre-push": [
+        "npm test"
+      ],
       "post-commit": [],
       "post-merge": []
     }
@@ -26,7 +31,12 @@
     "type": "git",
     "url": "git+https://github.com/coralproject/talk.git"
   },
-  "keywords": ["talk", "coral", "coralproject", "ask"],
+  "keywords": [
+    "talk",
+    "coral",
+    "coralproject",
+    "ask"
+  ],
   "author": "",
   "license": "Apache-2.0",
   "bugs": {
@@ -36,6 +46,7 @@
   "dependencies": {
     "bcrypt": "^0.8.7",
     "body-parser": "^1.15.2",
+    "cli-table": "^0.3.1",
     "commander": "^2.9.0",
     "connect-redis": "^3.1.0",
     "debug": "^2.2.0",