Use error handling package

app/app.js

@@ -12,7 +12,7 @@ let bodyParser = require('body-parser');
 let compression = require('compression');
 let serveStatic = require('serve-static');
 let cookieParser = require('cookie-parser');
-let errorMiddleware = require('meanie-express-error-middleware');
+let errors = require('meanie-express-error-handling');
 let jwt = require('meanie-express-jwt-service');
 let router = require('./services/router');
 let db = require('./services/db');
@@ -120,8 +120,8 @@ module.exports = function() {
   router(app);
 
   //Create error handling middleware stack
-  errorMiddleware
-    .load(ERROR_MIDDLEWARE.concat(['auth-clear-cookie', 'send']))
+  errors
+    .middleware(ERROR_MIDDLEWARE.concat(['auth-clear-cookie', 'send']))
     .forEach(handler => app.use(handler));
 
   //Return express server instance

app/components/auth/auth.ctrl.js

@@ -6,10 +6,10 @@
 let passport = require('passport');
 let moment = require('moment');
 let jwt = require('meanie-express-jwt-service');
-let types = require('meanie-express-error-types');
-let NotAuthenticatedError = types.NotAuthenticatedError;
-let NotAuthorizedError = types.NotAuthorizedError;
-let UserSuspendedError = types.UserSuspendedError;
+let errors = require('meanie-express-error-handling');
+let NotAuthenticatedError = errors.NotAuthenticatedError;
+let NotAuthorizedError = errors.NotAuthorizedError;
+let UserSuspendedError = errors.UserSuspendedError;
 
 /**
  * To camel case

app/components/error/error.ctrl.js

@@ -3,8 +3,8 @@
 /**
  * Dependencies
  */
-let types = require('meanie-express-error-types');
-let ReportedError = types.ReportedError;
+let errors = require('meanie-express-error-handling');
+let ReportedError = errors.ReportedError;
 
 /**
  * Error controller

app/components/file/file.ctrl.js

@@ -5,10 +5,9 @@
  */
 let multer = require('multer');
 let mimeTypesFilter = require('meanie-multer-mime-types-filter');
-let types = require('meanie-express-error-types');
-let BadRequestError = types.BadRequestError;
-let FileTooLargeError = types.FileTooLargeError;
-let errorHandler = require('../error/handler');
+let errors = require('meanie-express-error-handling');
+let BadRequestError = errors.BadRequestError;
+let FileTooLargeError = errors.FileTooLargeError;
 let gcloud = require('../../services/gcloud');
 let gcs = gcloud.storage();
 
@@ -131,7 +130,7 @@ module.exports = {
     //Delete the file (allow failures but log errors)
     gcsFile.delete(error => {
       if (error) {
-        errorHandler(error, req);
+        errors.handler(error, req);
       }
       next();
     });

app/components/user/avatar.ctrl.js

@@ -5,7 +5,8 @@
  */
 let multer = require('multer');
 let mimeTypesFilter = require('meanie-multer-mime-types-filter');
-let NotFoundError = require('meanie-express-error-types').NotFoundError;
+let errors = require('meanie-express-error-handling');
+let NotFoundError = errors.NotFoundError;
 
 /**
  * Avatar URL generator

app/components/user/user.ctrl.js

@@ -5,11 +5,10 @@
  */
 let mongoose = require('mongoose');
 let jwt = require('meanie-express-jwt-service');
-let types = require('meanie-express-error-types');
-let NotFoundError = types.NotFoundError;
-let BadRequestError = types.BadRequestError;
-let InvalidTokenError = types.InvalidTokenError;
-let errorHandler = require('../error/handler');
+let errors = require('meanie-express-error-handling');
+let NotFoundError = errors.NotFoundError;
+let BadRequestError = errors.BadRequestError;
+let InvalidTokenError = errors.InvalidTokenError;
 let mailer = require('../../services/mailer');
 
 /**
@@ -50,7 +49,7 @@ module.exports = {
       .then(user => {
         verifyEmailAddressEmail(user)
           .then(email => mailer.send(email))
-          .catch(error => errorHandler(error, req));
+          .catch(error => errors.handler(error, req));
         return (req.user = user);
       })
       .then(user => {
@@ -85,7 +84,7 @@ module.exports = {
         if (isEmailChanged) {
           verifyEmailAddressEmail(user)
           .then(email => mailer.send(email))
-          .catch(error => errorHandler(error, req));
+          .catch(error => errors.handler(error, req));
         }
         return (req.user = user);
       })
@@ -111,7 +110,7 @@ module.exports = {
       .then(user => {
         passwordHasChangedEmail(user)
           .then(email => mailer.send(email))
-          .catch(error => errorHandler(error, req));
+          .catch(error => errors.handler(error, req));
         res.end();
       })
       .catch(next);
@@ -183,7 +182,7 @@ module.exports = {
       .then(user => {
         passwordHasChangedEmail(user)
           .then(email => mailer.send(email))
-          .catch(error => errorHandler(error, req));
+          .catch(error => errors.handler(error, req));
         res.end();
       })
       .catch(next);

app/components/user/user.service.js

@@ -4,8 +4,8 @@
  * Dependencies
  */
 let mongoose = require('mongoose');
-let types = require('meanie-express-error-types');
-let InvalidTokenError = types.InvalidTokenError;
+let errors = require('meanie-express-error-handling');
+let InvalidTokenError = errors.InvalidTokenError;
 
 /**
  * Models

app/services/mailer.js

@@ -7,9 +7,9 @@ let fs = require('fs');
 let path = require('path');
 let Promise = require('bluebird');
 let sendgrid = require('sendgrid');
-let types = require('meanie-express-error-types');
+let errors = require('meanie-express-error-handling');
 let readFile = Promise.promisify(fs.readFile);
-let SendMailError = types.SendMailError;
+let SendMailError = errors.SendMailError;
 let config = require('../config');
 
 /**

package.json

@@ -56,11 +56,10 @@
     "entities": "^1.1.1",
     "express": "^4.13.4",
     "gcloud": "^0.34.0",
-    "github": "^1.1.2",
     "glob": "^7.0.3",
     "i18n": "^0.6.0",
-    "meanie-express-error-middleware": "^1.0.2",
-    "meanie-express-error-types": "^1.0.6",
+    "meanie-express-error-handling": "^1.0.3",
+    "meanie-express-github-service": "^1.0.0",
     "meanie-express-jwt-service": "^1.0.0",
     "meanie-mongoose-only-id": "^1.0.0",
     "meanie-mongoose-to-json": "^1.0.1",