Revert "新用户accessToken缺失；topic展示的边缘条件兼容"

This reverts commit cf0f5ed.

Author: JacksonTian

app.js

@@ -1,5 +1,4 @@
 'use strict';
-var uuid = require('node-uuid');
 
 module.exports = app => {
   if (app.config.debug) {
@@ -47,7 +46,6 @@ module.exports = app => {
       existUser = new ctx.model.User();
       existUser.githubId = profile.id;
       existUser.active = true;
-      existUser.accessToken = uuid.v4();
     }
 
     // 用户存在，更新字段
@@ -63,7 +61,7 @@ module.exports = app => {
       if (ex.message.indexOf('duplicate key error') !== -1) {
         let err;
         if (ex.message.indexOf('email') !== -1) {
-          err = new Error('您 GitHub 账号的 Email 与之前在 CNodejs 注册的 Email 重复了');
+          err = new Error('您 GitHub 账号的 Email 与之前在 CNodejs 注册的用户名重复了');
           err.code = 'duplicate_email';
           throw err;
         }
@@ -125,4 +123,3 @@ module.exports = app => {
     return user;
   });
 };
-

app/controller/topic.js

@@ -31,12 +31,6 @@ class TopicController extends Controller {
 
     const [ topic, author, replies ] = await service.topic.getFullTopic(topic_id);
 
-    if (!topic) {
-      ctx.status = 404;
-      ctx.message = '此话题不存在或已被删除。';
-      return;
-    }
-
     // 增加 visit_count
     topic.visit_count += 1;
     // 写入 DB

app/router.js

@@ -29,7 +29,7 @@ module.exports = app => {
     router.post('/signup', createUserLimit, sign.signup);
   } else {
     // 进行github验证
-    router.redirect('/signup', '/passport/github');
+    router.redirect('/singup', '/auth/github');
   }
 
   const localStrategy = app.passport.authenticate('local', {
@@ -43,9 +43,7 @@ module.exports = app => {
   router.get('/active_account', sign.activeAccount); // 帐号激活
 
   // github oauth
-  const github = app.passport.authenticate('github');
-  app.get('/passport/github', github);
-  app.get('/passport/github/callback', github);
+  app.passport.mount('github');
 
   router.get('/search_pass', sign.showSearchPass); // 找回密码页面
   router.post('/search_pass', sign.updateSearchPass); // 更新密码
@@ -110,4 +108,3 @@ module.exports = app => {
 
   router.get('/search', search.index);
 };
-

app/service/reply.js

@@ -52,23 +52,21 @@ class ReplyService extends Service {
    */
   async getRepliesByTopicId(id) {
     const query = { topic_id: id, deleted: false };
-    let replies = await this.ctx.model.Reply.find(query, '', {
+    const replies = await this.ctx.model.Reply.find(query, '', {
       sort: 'create_at',
     }).exec();
 
     if (replies.length === 0) {
       return [];
     }
 
-    replies = replies.filter(function (item) {
-      return !item.content_is_html
-    })
-
     return Promise.all(
       replies.map(async item => {
         const author = await this.service.user.getUserById(item.author_id);
         item.author = author || { _id: '' };
-
+        if (item.content_is_html) {
+          return;
+        }
         item.content = await this.service.at.linkUsers(item.content);
         return item;
       })

bin/generate_access_token.js

@@ -22,7 +22,6 @@
     "loader-koa": "^2.0.1",
     "lodash": "^4.17.5",
     "markdown-it": "^8.4.1",
-    "node-uuid": "^1.4.8",
     "nodemailer": "^4.6.2",
     "nodemailer-smtp-transport": "^2.7.4",
     "qiniu": "^7.1.3",
@@ -47,7 +46,6 @@
   "scripts": {
     "start": "egg-scripts start --daemon --title=egg-server-cnode",
     "stop": "egg-scripts stop --title=egg-server-cnode",
-    "restart": "npm run stop && npm run start",
     "docker": "egg-scripts start --title=egg-server-cnode",
     "dev": "egg-bin dev",
     "debug": "egg-bin debug",