fix: add githubId into user model

* fix: login with github

* fix: add githubId into user model

Author: JacksonTian

app.js

@@ -44,6 +44,7 @@ module.exports = app => {
     // 用户不存在则创建
     if (!existUser) {
       existUser = new ctx.model.User();
+      existUser.githubId = profile.id;
       existUser.active = true;
     }
 
@@ -53,7 +54,26 @@ module.exports = app => {
     existUser.avatar = profile._json.avatar_url;
     existUser.githubUsername = profile.username;
     existUser.githubAccessToken = profile.accessToken;
-    await existUser.save();
+
+    try {
+      await existUser.save();
+    } catch (ex) {
+      if (ex.message.indexOf('duplicate key error') !== -1) {
+        let err;
+        if (ex.message.indexOf('email') !== -1) {
+          err = new Error('您 GitHub 账号的 Email 与之前在 CNodejs 注册的用户名重复了');
+          err.code = 'duplicate_email';
+          throw err;
+        }
+
+        if (ex.message.indexOf('loginname') !== -1) {
+          err = new Error('您 GitHub 账号的用户名与之前在 CNodejs 注册的用户名重复了');
+          err.code = 'duplicate_loginname';
+          throw err;
+        }
+      }
+      throw ex;
+    }
 
     return existUser;
   };

app/middleware/create_user_limit.js

@@ -2,7 +2,7 @@
 
 const moment = require('moment');
 
-module.exports = limitCount => {
+module.exports = limit => {
 
   return async function createUserLimit(ctx, next) {
     const { service } = ctx;
@@ -11,12 +11,12 @@ module.exports = limitCount => {
     const YYYYMMDD = moment().format('YYYYMMDD');
     const key = `user_count_${realIP}_${YYYYMMDD}`;
 
-    let todayTopicsCount = (await service.cache.get(key)) || 0;
-    if (todayTopicsCount >= limitCount) {
+    let count = (await service.cache.get(key)) || 0;
+    if (count >= limit) {
       ctx.status = 403;
       ctx.body = {
         success: false,
-        error_msg: '频率限制：当前操作每天可以进行 ' + limitCount + ' 次',
+        error_msg: '频率限制：当前操作每天可以进行 ' + limit + ' 次',
       };
       return;
     }
@@ -25,10 +25,10 @@ module.exports = limitCount => {
 
     if (ctx.status === 302) {
       // 新建话题成功
-      todayTopicsCount += 1;
+      count += 1;
       await service.cache.incr(key, 60 * 60 * 24);
-      ctx.set('X-RateLimit-Limit', limitCount);
-      ctx.set('X-RateLimit-Remaining', limitCount - todayTopicsCount);
+      ctx.set('X-RateLimit-Limit', limit);
+      ctx.set('X-RateLimit-Remaining', limit - count);
     }
   };
 };

app/router.js

@@ -64,12 +64,12 @@ module.exports = app => {
   router.post('/user/:name/block', adminRequired, user.block); // 禁言某用户
   router.post('/user/:name/delete_all', adminRequired, user.deleteAll); // 删除某用户所有发言
 
-  // // message controler
+  // message controler
   router.get('/my/messages', userRequired, message.index); // 用户个人的所有消息页
 
   // topic
 
-  // // 新建文章界面
+  // 新建文章界面
   router.get('/topic/create', userRequired, topic.create);
 
   router.get('/topic/:tid', topic.index); // 显示某个话题
@@ -80,14 +80,14 @@ module.exports = app => {
 
   router.post('/topic/:tid/delete', userRequired, topic.delete);
 
-  // // 保存新建的文章
+  // 保存新建的文章
   router.post('/topic/create', userRequired, createTopicLimit, topic.put);
 
   router.post('/topic/:tid/edit', userRequired, topic.update);
   router.post('/topic/collect', userRequired, topic.collect); // 关注某话题
   router.post('/topic/de_collect', userRequired, topic.de_collect); // 取消关注某话题
 
-  // // reply controller
+  // reply controller
   router.post('/:topic_id/reply', userRequired,
     // limit.peruserperday('create_reply', config.create_reply_per_day, { showJson: false }),
     reply.add); // 提交一级回复