diff --git a/app.json b/app.json index e76cd024..36ae03d7 100644 --- a/app.json +++ b/app.json @@ -28,5 +28,10 @@ "description": "Which mail service/API you will be using (i.e. SparkPost, Mandrill, etc)", "value": "SendGrid" } - } + }, + "buildpacks": [ + { + "url": "https://github.com/heroku/heroku-buildpack-nodejs#v111" + } + ] } diff --git a/app/models/user.server.model.js b/app/models/user.server.model.js index ab1d35b0..15ac755e 100755 --- a/app/models/user.server.model.js +++ b/app/models/user.server.model.js @@ -9,19 +9,7 @@ var mongoose = require('mongoose'), config = require('../../config/config'), timeStampPlugin = require('../libs/timestamp.server.plugin'), path = require('path'), - querystring = require('querystring'), - nodemailer = require('nodemailer'); - -var smtpTransport = nodemailer.createTransport(config.mailer.options); - -// verify connection configuration on startup -smtpTransport.verify(function(error, success) { - if (error) { - console.log('Your mail configuration is incorrect', error); - } else { - console.log('Mail server is ready to take our messages'); - } -}); + querystring = require('querystring'); /** * User Schema diff --git a/package-lock.json b/package-lock.json index 25d97ec8..b62f021a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3129,13 +3129,10 @@ } }, "connect-mongo": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/connect-mongo/-/connect-mongo-0.8.2.tgz", - "integrity": "sha1-ySh47sDFpaZiW3mgwhTzf4YfxuA=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/connect-mongo/-/connect-mongo-2.0.0.tgz", + "integrity": "sha512-2Nj5d4XO55AXSy1GOXDZteSEEUObGm/kvJaXyEQCa8cCHsCiZH+V/+sjk3b+khc4V8oyVi34rCtUxor4TfETLA==", "requires": { - "debug": "3.1.0", - "depd": "1.1.1", - "lodash": "4.17.4", "mongodb": "2.0.55" } }, diff --git a/package.json b/package.json index 343b7053..5ceffa0a 100644 --- a/package.json +++ b/package.json @@ -21,8 +21,7 @@ "generate": "all-contributors generate", "start": "grunt", "test": "grunt test", - "travis": "grunt test:travis", - "postinstall": "bower install --config.interactive=false; grunt build;", + "postinstall": "bower install --config.interactive=false", "init": "node scripts/setup.js" }, "dependencies": { @@ -32,7 +31,7 @@ "chalk": "^1.1.3", "compression": "~1.6.0", "connect": "^3.4.1", - "connect-mongo": "~0.8.2", + "connect-mongo": "^2.0.0", "consolidate": "~0.14.5", "cookie-parser": "~1.4.0", "deep-diff": "^0.3.4", diff --git a/public/modules/core/config/core.client.routes.js b/public/modules/core/config/core.client.routes.js index 9616c61a..b7d49fa7 100755 --- a/public/modules/core/config/core.client.routes.js +++ b/public/modules/core/config/core.client.routes.js @@ -2,7 +2,7 @@ // Setting up route angular.module('core').config(['$stateProvider', '$urlRouterProvider', - function($stateProvider, $urlRouterProvider, Authorization) { + function($stateProvider, $urlRouterProvider) { // Redirect to home view when route not found $urlRouterProvider.otherwise('/forms'); } diff --git a/scripts/setup.js b/scripts/setup.js index 551dc026..d8e5350c 100644 --- a/scripts/setup.js +++ b/scripts/setup.js @@ -5,7 +5,7 @@ */ process.env.NODE_ENV = 'production'; -var config = require('../config/config'), +var config = require('../config/config'), mongoose = require('mongoose'), inquirer = require('inquirer'), envfile = require('envfile'), diff --git a/server.js b/server.js index afc2cf73..725a6842 100755 --- a/server.js +++ b/server.js @@ -17,7 +17,8 @@ require('events').EventEmitter.prototype._maxListeners = 0; var config = require('./config/config'), mongoose = require('mongoose'), - chalk = require('chalk'); + chalk = require('chalk'), + nodemailer = require('nodemailer'); /** * Main application entry file. @@ -36,6 +37,16 @@ mongoose.connection.on('error', function (err) { process.exit(-1); }); +const smtpTransport = nodemailer.createTransport(config.mailer.options); + +// verify connection configuration on startup +smtpTransport.verify(function(error, success) { + if (error) { + console.error(chalk.red('Your mail configuration is incorrect: ' + error)); + process.exit(-1); + } +}); + // Init the express application var app = require('./config/express')(db);