From 859388fbf0b2c30727dd80b6623018b9a23c98b1 Mon Sep 17 00:00:00 2001
From: Jack Hu <hutufeia2009@sina.com>
Date: Sat, 7 May 2016 22:15:56 +0800
Subject: [PATCH] fix #5

---
 History.md                     | 5 +++++
 package.json                   | 2 +-
 server/auth/github/passport.js | 2 +-
 server/auth/qq/passport.js     | 2 +-
 server/auth/weibo/passport.js  | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/History.md b/History.md
index 20b6706..31c62cf 100644
--- 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
index c8480d1..f083d29 100644
--- 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
index 263c152..3970dbe 100644
--- 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
index 340e194..e9cbf1e 100644
--- 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
index 163758d..d5a7ac5 100644
--- 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();