Test: User controller (#51)

* refactor: user page when no signin

* refactor: user page with data

* refactor: user page(collectTopics, topics, replies)

* refactor: middleware errorPage

* refactor: user page when no signin

* refactor: replace lodash function

* fix: use lodash sortBy

* refactor: move avatar_hostname to default.config

* refactor: inject helper in middleware ctx.locals

* refactor: setting page with session user data

* refactor: user setting post

* fix: setting post failure

* refactor: set auth cookies

* refactor: admin(toggleStar, blockUser, deleteAllReply)

* fix: admin_user_name

* test: user contorller UT 1/2

* refactor: middleware errorPage

* refactor: move avatar_hostname to default.config

* refactor: inject helper in middleware ctx.locals

* refactor: setting page with session user data

* fix: setting post failure

* refactor: set auth cookies

* refactor: admin(toggleStar, blockUser, deleteAllReply)

* fix: admin_user_name

* refactor: user page when no signin

* refactor: middleware errorPage

* refactor: use ctx.user

* refactor: template helper

* refactor: await save()

* refactor: save at ctx.session.is_admin
test: user controller

* test: user controller delete_all

* test: user controller completed

Author: lqs469

app.js

@@ -80,10 +80,4 @@ module.exports = app => {
     }
     return existUser;
   });
-
-  app.passport.serializeUser(async (ctx, user) => {
-    // 默认会注入session.passport.user, 为方便使用改为session.user (?)
-    ctx.session.user = user;
-    return user;
-  });
 };

app/controller/user.js

@@ -46,7 +46,7 @@ class UserController extends Controller {
 
     // 如果用户没有激活，那么管理员可以帮忙激活
     let token = '';
-    if (!user.active && ctx.session.user && ctx.session.user.is_admin) {
+    if (!user.active && ctx.user && ctx.user.is_admin) {
       token = utility.md5(user.email + user.pass + config.session_secret);
     }
 
@@ -180,7 +180,7 @@ class UserController extends Controller {
 
   async showSetting() {
     const { ctx, service } = this;
-    const id = ctx.session.user._id;
+    const id = ctx.user._id;
     const user = await service.user.getUserById(id);
 
     if (!user) {
@@ -226,14 +226,14 @@ class UserController extends Controller {
       const weibo = validator.trim(body.weibo);
       const signature = validator.trim(body.signature);
 
-      const user = await service.user.getUserById(ctx.session.user._id);
+      const user = await service.user.getUserById(ctx.user._id);
       user.url = url;
       user.location = location;
       user.signature = signature;
       user.weibo = weibo;
-      user.save();
+      await user.save();
 
-      ctx.session.user = user.toObject({ virtual: true });
+      ctx.user = user.toObject({ virtual: true });
       return ctx.redirect('/setting?save=success');
     }
 
@@ -244,15 +244,15 @@ class UserController extends Controller {
         return showMessage('旧密码或新密码不得为空');
       }
 
-      const user = await service.user.getUserById(ctx.session.user._id);
+      const user = await service.user.getUserById(ctx.user._id);
       const equal = tools.bcompare(oldPass, user.pass);
       if (!equal) {
         return showMessage('当前密码不正确。', user);
       }
 
       const newPassHash = tools.bhash(newPass);
       user.pass = newPassHash;
-      user.save();
+      await user.save();
       return showMessage('密码已被修改。', user, true);
     }
   }
@@ -269,7 +269,7 @@ class UserController extends Controller {
       return;
     }
     user.is_star = !user.is_star;
-    user.save();
+    await user.save();
 
     ctx.body = { status: 'success' };
   }
@@ -288,11 +288,11 @@ class UserController extends Controller {
 
     if (action === 'set_block') {
       user.is_block = true;
-      user.save();
+      await user.save();
       ctx.body = { status: 'success' };
     } else if (action === 'cancel_block') {
       user.is_block = false;
-      user.save();
+      await user.save();
       ctx.body = { status: 'success' };
     }
   }
@@ -310,185 +310,13 @@ class UserController extends Controller {
     }
 
     // 删除主题
-    ctx.model.Topic.update({ author_id: user._id }, { $set: { deleted: true } }, { multi: true });
+    await ctx.model.Topic.update({ author_id: user._id }, { $set: { deleted: true } }, { multi: true });
     // 删除评论
-    ctx.model.Reply.update({ author_id: user._id }, { $set: { deleted: true } }, { multi: true });
+    await ctx.model.Reply.update({ author_id: user._id }, { $set: { deleted: true } }, { multi: true });
     // 点赞数也全部干掉
-    ctx.model.Reply.update({}, { $pull: { ups: user._id } }, { multi: true });
+    await ctx.model.Reply.update({}, { $pull: { ups: user._id } }, { multi: true });
     ctx.body = { status: 'success' };
   }
 }
 
-// var User         = require('../proxy').User;
-// var Topic        = require('../proxy').Topic;
-// var Reply        = require('../proxy').Reply;
-// var TopicCollect = require('../proxy').TopicCollect;
-// var utility      = require('utility');
-// var util         = require('util');
-// var TopicModel   = require('../models').Topic;
-// var ReplyModel   = require('../models').Reply;
-// var tools        = require('../common/tools');
-// var config       = require('../config');
-// var EventProxy   = require('eventproxy');
-// var validator    = require('validator');
-// var _            = require('lodash');
-
-
-// exports.showSetting = function (req, res, next) {
-//   User.getUserById(req.session.user._id, function (err, user) {
-//     if (err) {
-//       return next(err);
-//     }
-//     if (req.query.save === 'success') {
-//       user.success = '保存成功。';
-//     }
-//     user.error = null;
-//     return res.render('user/setting', user);
-//   });
-// };
-
-// exports.setting = function (req, res, next) {
-//   var ep = new EventProxy();
-//   ep.fail(next);
-
-//   // 显示出错或成功信息
-//   function showMessage(msg, data, isSuccess) {
-//     data = data || req.body;
-//     var data2 = {
-//       loginname: data.loginname,
-//       email: data.email,
-//       url: data.url,
-//       location: data.location,
-//       signature: data.signature,
-//       weibo: data.weibo,
-//       accessToken: data.accessToken,
-//     };
-//     if (isSuccess) {
-//       data2.success = msg;
-//     } else {
-//       data2.error = msg;
-//     }
-//     res.render('user/setting', data2);
-//   }
-
-//   // post
-//   var action = req.body.action;
-//   if (action === 'change_setting') {
-//     var url = validator.trim(req.body.url);
-//     var location = validator.trim(req.body.location);
-//     var weibo = validator.trim(req.body.weibo);
-//     var signature = validator.trim(req.body.signature);
-
-//     User.getUserById(req.session.user._id, ep.done(function (user) {
-//       user.url = url;
-//       user.location = location;
-//       user.signature = signature;
-//       user.weibo = weibo;
-//       user.save(function (err) {
-//         if (err) {
-//           return next(err);
-//         }
-//         req.session.user = user.toObject({virtual: true});
-//         return res.redirect('/setting?save=success');
-//       });
-//     }));
-//   }
-//   if (action === 'change_password') {
-//     var old_pass = validator.trim(req.body.old_pass);
-//     var new_pass = validator.trim(req.body.new_pass);
-//     if (!old_pass || !new_pass) {
-//       return res.send('旧密码或新密码不得为空');
-//     }
-
-//     User.getUserById(req.session.user._id, ep.done(function (user) {
-//       tools.bcompare(old_pass, user.pass, ep.done(function (bool) {
-//         if (!bool) {
-//           return showMessage('当前密码不正确。', user);
-//         }
-
-//         tools.bhash(new_pass, ep.done(function (passhash) {
-//           user.pass = passhash;
-//           user.save(function (err) {
-//             if (err) {
-//               return next(err);
-//             }
-//             return showMessage('密码已被修改。', user, true);
-
-//           });
-//         }));
-//       }));
-//     }));
-//   }
-
-// exports.toggleStar = function (req, res, next) {
-//   var user_id = req.body.user_id;
-//   User.getUserById(user_id, function (err, user) {
-//     if (err) {
-//       return next(err);
-//     }
-//     if (!user) {
-//       return next(new Error('user is not exists'));
-//     }
-//     user.is_star = !user.is_star;
-//     user.save(function (err) {
-//       if (err) {
-//         return next(err);
-//       }
-//       res.json({ status: 'success' });
-//     });
-//   });
-// }
-
-// exports.block = function (req, res, next) {
-//   var loginname = req.params.name;
-//   var action = req.body.action;
-
-//   var ep = EventProxy.create();
-//   ep.fail(next);
-
-//   User.getUserByLoginName(loginname, ep.done(function (user) {
-//     if (!user) {
-//       return next(new Error('user is not exists'));
-//     }
-//     if (action === 'set_block') {
-//       ep.all('block_user',
-//         function (user) {
-//           res.json({status: 'success'});
-//         });
-//       user.is_block = true;
-//       user.save(ep.done('block_user'));
-
-//     } else if (action === 'cancel_block') {
-//       user.is_block = false;
-//       user.save(ep.done(function () {
-
-//         res.json({status: 'success'});
-//       }));
-//     }
-//   }));
-// };
-
-// exports.deleteAll = function (req, res, next) {
-//   var loginname = req.params.name;
-
-//   var ep = EventProxy.create();
-//   ep.fail(next);
-
-//   User.getUserByLoginName(loginname, ep.done(function (user) {
-//     if (!user) {
-//       return next(new Error('user is not exists'));
-//     }
-//     ep.all('del_topics', 'del_replys', 'del_ups',
-//       function () {
-//         res.json({status: 'success'});
-//       });
-//     // 删除主题
-//     TopicModel.update({author_id: user._id}, {$set: {deleted: true}}, {multi: true}, ep.done('del_topics'));
-//     // 删除评论
-//     ReplyModel.update({author_id: user._id}, {$set: {deleted: true}}, {multi: true}, ep.done('del_replys'));
-//     // 点赞数也全部干掉
-//     ReplyModel.update({}, {$pull: {'ups': user._id}}, {multi: true}, ep.done('del_ups'));
-//   }));
-// };
-
 module.exports = UserController;

app/middleware/admin_required.js

@@ -6,12 +6,12 @@ module.exports = () => {
    */
 
   return async function(ctx, next) {
-    if (!ctx.session.user) {
+    if (!ctx.user) {
       await ctx.render('notify/notify', { error: '你还没有登录。' });
       return;
     }
 
-    if (!ctx.session.user.is_admin) {
+    if (!ctx.session.is_admin) {
       await ctx.render('notify/notify', { error: '需要管理员权限。' });
       return;
     }

app/middleware/auth_user.js

@@ -7,14 +7,14 @@ module.exports = () => {
     ctx.locals.current_user = null;
     if (ctx.app.config.debug && ctx.cookies.get('mock_user')) {
       const mockUser = JSON.parse(ctx.cookies.get('mock_user'));
-      ctx.session.user = new ctx.model.User(mockUser);
+      ctx.user = new ctx.model.User(mockUser);
       if (mockUser.is_admin) {
-        ctx.session.user.is_admin = true;
+        ctx.user.is_admin = true;
       }
       return await next();
     }
 
-    let { user } = ctx.session;
+    let { user } = ctx;
     if (user) {
       const auth_token = ctx.cookies.get(ctx.app.config.auth_cookie_name, {
         signed: true,
@@ -39,8 +39,9 @@ module.exports = () => {
 
     const count = await ctx.service.message.getMessagesCount(user._id);
     user.messages_count = count;
-    ctx.session.user = user;
     ctx.locals.current_user = user;
+    // 这里需要设置is_admin, 因为ctx.user为只读, 所以使用ctx.session.is_admin
+    ctx.session.is_admin = user.is_admin;
     await next();
   };
 };

app/middleware/locals.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const Loader = require('loader');
-const helper = require('../extend/helper');
 
 module.exports = (options, app) => {
   // assets
@@ -25,7 +24,6 @@ module.exports = (options, app) => {
     ctx.locals.Loader = Loader;
     ctx.locals.assets = assets;
     ctx.locals.csrf = ctx.csrf;
-    ctx.locals = Object.assign({}, ctx.locals, helper);
     await next();
   };
 };

app/middleware/user_required.js

@@ -6,8 +6,7 @@ module.exports = () => {
    * 需要登录
    */
   return async function(ctx, next) {
-    const { session } = ctx;
-    if (!session || !session.user || !session.user._id) {
+    if (!ctx.user || !ctx.user._id) {
       ctx.status = 403;
       ctx.body = 'forbidden!';
       return;

app/view/notify/notify.html

@@ -1,4 +1,4 @@
-<%- include ../sidebar.html %>
+<%- include('../sidebar.html') %>
 
 <div id='content'>
   <div class='panel'>

app/view/user/card.html

@@ -3,7 +3,7 @@
 <div class='user_card'>
   <div>
     <a class='user_avatar' href="/user/<%= user.loginname %>">
-      <img src="<%= proxy(user.avatar_url) %>" title="<%= user.loginname %>"/>
+      <img src="<%= helper.proxy(user.avatar_url) %>" title="<%= user.loginname %>"/>
     </a>
     <span class='user_name'><a class='dark' href="/user/<%= user.loginname %>"><%= user.loginname %></a></span>
 
@@ -16,7 +16,7 @@
     <span class="signature">
         “
         <% if (user.signature) {%>
-            <%-escapeSignature(user.signature)%>
+            <%-helper.escapeSignature(user.signature)%>
         <%} else {%>
             这家伙很懒，什么个性签名都没有留下。
         <%}%>
@@ -53,4 +53,4 @@
     });
   });
 </script>
-<% } %>
+<% } %>

app/view/user/collect_topics.html

@@ -10,8 +10,12 @@
     </div>
     <div class='inner no-padding'>
       <% if (topics.length > 0) { %>
-        <%- include('../topic/list.html', { topics: topics, pages: pages, current_pages: current_page, base: '/user/' +
-          user.loginname + '/collections' }) %>
+        <%- include('../topic/list.html', {
+          topics,
+          pages,
+          current_pages,
+          base: `/user/${user.loginname}/collections`
+        }) %>
       <% } else { %>
         <p>找不到话题 (T_T)</p>
       <% } %>