Merge branch 'release-3.0.5'

Conflicts: CHANGELOG.md package.json
GuildWars2Brasil · Feb 6, 2016 · 4e88f68 · 4e88f68
2 parents e4c5c07 + 90a48ff
commit 4e88f68
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+<a name="3.0.5"></a>
+## [3.0.5](https://github.com/GuildWars2Brasil/nodeclube/compare/3.0.3...v3.0.5) (2016-02-06)
+
+
+### Bug Fixes
+
+* **deprecated:** Ref chriso/validator.js/issues/486 ([6e40a88](https://github.com/GuildWars2Brasil/nodeclube/commit/6e40a88))
+
+
+
 <a name="3.0.4"></a>
 ## [3.0.4](https://github.com/GuildWars2Brasil/nodeclube/compare/3.0.3...v3.0.4) (2016-01-28)
 

diff --git a/api/v1/middleware.js b/api/v1/middleware.js
@@ -6,7 +6,7 @@ var auth = function (req, res, next) {
   var ep = new eventproxy();
   ep.fail(next);
 
-  var accessToken = req.body.accesstoken || req.query.accesstoken;
+  var accessToken = req.body.accesstoken || req.query.accesstoken || '';
   accessToken = validator.trim(accessToken);
 
   UserModel.findOne({accessToken: accessToken}, ep.done(function (user) {

diff --git a/controllers/github.js b/controllers/github.js
@@ -57,8 +57,8 @@ exports.create = function (req, res, next) {
   var profile = req.session.profile;
 
   var isnew = req.body.isnew;
-  var loginname = validator.trim(req.body.name).toLowerCase();
-  var password = validator.trim(req.body.pass);
+  var loginname = validator.trim(req.body.name||'').toLowerCase();
+  var password = validator.trim(req.body.pass||'');
   var ep = new eventproxy();
   ep.fail(next);
 

diff --git a/models/index.js b/models/index.js
@@ -3,7 +3,13 @@ var config   = require('../config');
 var logger = require('../common/logger')
 
 mongoose.connect(config.db, {
-  server: {poolSize: 20}
+  server: {
+      poolSize: 20,
+      socketOptions: { keepAlive: 1, connectTimeoutMS: 30000 }
+  },
+  replset: {
+      socketOptions: { keepAlive: 1, connectTimeoutMS : 30000 }
+  }
 }, function (err) {
   if (err) {
     logger.error('connect to %s error: ', config.db, err.message);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodeclube",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "private": false,
   "main": "app.js",
   "description": "A Node.js bbs using MongoDB",
@@ -26,37 +26,37 @@
     "express": "4.13.4",
     "express-session": "1.13.0",
     "helmet": "1.1.0",
-    "ioredis": "1.14.0",
+    "ioredis": "1.15.0",
     "jpush-sdk": "3.2.1",
     "loader": "2.0.0",
     "loader-builder": "1.2.1",
-    "lodash": "4.0.1",
+    "lodash": "4.2.1",
     "log4js": "^0.6.29",
     "markdown-it": "5.1.0",
     "memory-cache": "0.1.4",
     "method-override": "2.3.5",
-    "moment": "2.11.1",
-    "mongoose": "4.3.7",
+    "moment": "2.11.2",
+    "mongoose": "4.4.0",
     "multiline": "1.0.2",
     "node-uuid": "1.4.7",
-    "nodemailer": "2.0.0",
+    "nodemailer": "2.1.0",
     "nodemailer-smtp-transport": "2.0.1",
     "oneapm": "1.2.19",
     "passport": "0.3.2",
-    "passport-github": "1.0.0",
+    "passport-github": "1.1.0",
     "pm2": "1.0.0",
     "qn": "1.1.1",
     "ready": "0.1.1",
     "request": "2.68.0",
     "response-time": "2.3.1",
     "superagent": "1.7.2",
     "utility": "1.6.0",
-    "validator": "4.5.1",
+    "validator": "4.7.1",
     "xmlbuilder": "4.2.1",
     "xss": "0.2.10"
   },
   "devDependencies": {
-    "conventional-github-releaser": "^0.5.1",
+    "conventional-github-releaser": "^1.0.0",
     "conventional-recommended-bump": "0.0.3",
     "coveralls": "2.11.6",
     "errorhandler": "1.4.3",
@@ -75,7 +75,7 @@
     "jsdom": "^3.1.2",
     "loader-connect": "1.0.0",
     "mm": "1.3.5",
-    "mocha": "2.4.3",
+    "mocha": "2.4.5",
     "mocha-jsdom": "^1.0.0",
     "nock": "7.0.1",
     "pedding": "1.0.0",