refactor: move tools to helper (#72)

Author: thonatos

app.js

@@ -1,7 +1,5 @@
 'use strict';
 
-const tools = require('./app/common/tools');
-
 module.exports = app => {
   if (app.config.debug) {
     app.config.coreMiddleware.unshift('less');
@@ -23,7 +21,7 @@ module.exports = app => {
 
     const passhash = existUser.pass;
     // TODO: change to async compare
-    const equal = tools.bcompare(password, passhash);
+    const equal = ctx.helper.bcompare(password, passhash);
     // 密码不匹配
     if (!equal) {
       return null;

app/common/tools.js

@@ -5,8 +5,6 @@ const utility = require('utility');
 const uuid = require('uuid');
 const Controller = require('egg').Controller;
 
-const tools = require('../common/tools');
-
 class SignController extends Controller {
   async showLogin() {
     const { ctx } = this;
@@ -34,7 +32,7 @@ class SignController extends Controller {
       msg = '信息不完整。';
     } else if (loginname.length < 5) {
       msg = '用户名至少需要5个字符。';
-    } else if (!tools.validateId(loginname)) {
+    } else if (!ctx.helper.validateId(loginname)) {
       msg = '用户名不合法。';
     } else if (!validator.isEmail(email)) {
       msg = '邮箱不合法。';
@@ -68,7 +66,7 @@ class SignController extends Controller {
       return;
     }
 
-    const passhash = tools.bhash(pass);
+    const passhash = ctx.helper.bhash(pass);
 
     // create gravatar
     const avatarUrl = service.user.makeGravatar(email);
@@ -203,7 +201,7 @@ class SignController extends Controller {
       });
       return;
     }
-    const passhash = tools.bhash(psw);
+    const passhash = ctx.helper.bhash(psw);
     user.pass = passhash;
     user.retrieve_key = null;
     user.retrieve_time = null;

app/controller/sign.js

@@ -2,7 +2,6 @@
 
 const _ = require('lodash');
 const utility = require('utility');
-const tools = require('../common/tools');
 const validator = require('validator');
 const Controller = require('egg').Controller;
 
@@ -236,12 +235,12 @@ class UserController extends Controller {
       }
 
       const user = await service.user.getUserById(ctx.user._id);
-      const equal = tools.bcompare(oldPass, user.pass);
+      const equal = ctx.helper.bcompare(oldPass, user.pass);
       if (!equal) {
         return showMessage('当前密码不正确。', user);
       }
 
-      const newPassHash = tools.bhash(newPass);
+      const newPassHash = ctx.helper.bhash(newPass);
       user.pass = newPassHash;
       await user.save();
       return showMessage('密码已被修改。', user, true);

app/controller/user.js

@@ -4,6 +4,7 @@ const MarkdownIt = require('markdown-it');
 const validator = require('validator');
 const jsxss = require('xss');
 const moment = require('moment');
+const bcrypt = require('bcryptjs');
 
 moment.locale('zh-cn'); // 使用中文
 
@@ -99,3 +100,15 @@ exports.ago = function(date) {
 
   return date.fromNow();
 };
+
+exports.validateId = str => {
+  return /^[a-zA-Z0-9\-_]+$/i.test(str);
+};
+
+exports.bhash = str => {
+  return bcrypt.hashSync(str, 10);
+};
+
+exports.bcompare = (str, hash) => {
+  return bcrypt.compareSync(str, hash);
+};

app/extend/helper.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const tools = require('../../../app/common/tools');
 const { app, assert } = require('egg-mock/bootstrap');
 
 describe('test/app/controller/user.test.js', () => {
@@ -13,7 +12,7 @@ describe('test/app/controller/user.test.js', () => {
     ctx = app.mockContext();
     loginname = `user_loginname_${Date.now()}`;
     email = `${loginname}@test.com`;
-    user = await ctx.service.user.newAndSave('name', loginname, tools.bhash('pass'), email, 'avatar_url', 'active');
+    user = await ctx.service.user.newAndSave('name', loginname, ctx.helper.bhash('pass'), email, 'avatar_url', 'active');
     assert(user.loginname === loginname);
   });
 
@@ -111,7 +110,7 @@ describe('test/app/controller/user.test.js', () => {
       assert(res3.status === 200);
 
       const savedUser = await ctx.service.user.getUserById(user._id);
-      const equal = tools.bcompare('newpass', savedUser.pass);
+      const equal = ctx.helper.bcompare('newpass', savedUser.pass);
       assert(equal === true);
     });
   });