fix #5

jackhutu · May 7, 2016 · 859388f · 859388f
1 parent 317fe06
commit 859388f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/History.md b/History.md
@@ -1,3 +1,8 @@
+1.1.6 / 2016-05-07
+==================
+
+* 修复第三方登录bug, fix #5
+
 1.1.5 / 2016-04-30
 ==================
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jackblog-api-koa",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "jackblog API koa版",
   "main": "server/app.js",
   "scripts": {

diff --git a/server/auth/github/passport.js b/server/auth/github/passport.js
@@ -30,7 +30,7 @@ exports.setup = function (User,config) {
           status:1
         }
         const checkUserName = yield User.findOne({nickname:newUser.nickname});
-        if(checkUser){
+        if(checkUserName){
           newUser.nickname = tools.randomString();
         }
         const user = yield new User(newUser).save();

diff --git a/server/auth/qq/passport.js b/server/auth/qq/passport.js
@@ -34,7 +34,7 @@ exports.setup = function (User,config) {
           status:1
         }
         const checkUserName = yield User.findOne({nickname:newUser.nickname});
-        if(checkUser){
+        if(checkUserName){
           newUser.nickname = tools.randomString();
         }
         const user = yield new User(newUser).save();

diff --git a/server/auth/weibo/passport.js b/server/auth/weibo/passport.js
@@ -29,7 +29,7 @@ exports.setup = function (User,config) {
           status:1
         }
         const checkUserName = yield User.findOne({nickname:newUser.nickname});
-        if(checkUser){
+        if(checkUserName){
           newUser.nickname = tools.randomString();
         }
         const user = yield new User(newUser).save();