archive-gh-me/nodeclub
1
0
Fork 0
mirror of https://github.com/cnodejs/nodeclub.git synced 2025-12-08 19:55:55 +00:00
Code Issues Projects Releases Wiki Activity

Route methods use lowerCamelCase style

Browse Source
This commit is contained in:
Jason Lee 2015-05-25 11:14:14 +08:00
parent d34bd0cf9d
commit 43d9de28e5
4 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
controllers/sign.js
View File

@ -15,9 +15,9 @@ exports.showSignup = function (req, res) {
exports.signup = function (req, res, next) {
var loginname = validator.trim(req.body.loginname).toLowerCase();
var email = validator.trim(req.body.email).toLowerCase();
var pass = validator.trim(req.body.pass);
var rePass = validator.trim(req.body.re_pass);
var email = validator.trim(req.body.email).toLowerCase();
var pass = validator.trim(req.body.pass);
var rePass = validator.trim(req.body.re_pass);
var ep = new eventproxy();
ep.fail(next);
@ -108,8 +108,9 @@ var notJump = [
*/
exports.login = function (req, res, next) {
var loginname = validator.trim(req.body.name).toLowerCase();
var pass = validator.trim(req.body.pass);
var ep = new eventproxy();
var pass = validator.trim(req.body.pass);
var ep = new eventproxy();
ep.fail(next);
if (!loginname || !pass) {
@ -169,8 +170,8 @@ exports.signout = function (req, res, next) {
res.redirect('/');
};
exports.active_account = function (req, res, next) {
var key = validator.trim(req.query.key);
exports.activeAccount = function (req, res, next) {
var key = validator.trim(req.query.key);
var name = validator.trim(req.query.name);
User.getUserByLoginName(name, function (err, user) {
@ -208,8 +209,9 @@ exports.updateSearchPass = function (req, res, next) {
}
// 动态生成retrive_key和timestamp到users collection,之后重置密码进行验证
var retrieveKey = uuid.v4();
var retrieveKey = uuid.v4();
var retrieveTime = new Date().getTime();
User.getUserByMail(email, function (err, user) {
if (!user) {
res.render('sign/search_pass', {error: '没有这个电子邮箱。', email: email});
@ -236,9 +238,10 @@ exports.updateSearchPass = function (req, res, next) {
* @param {http.res} res
* @param {Function} next
*/
exports.reset_pass = function (req, res, next) {
var key = validator.trim(req.query.key);
exports.resetPass = function (req, res, next) {
var key = validator.trim(req.query.key);
var name = validator.trim(req.query.name);
User.getUserByNameAndKey(name, key, function (err, user) {
if (!user) {
res.status(403);
@ -254,11 +257,12 @@ exports.reset_pass = function (req, res, next) {
});
};
exports.update_pass = function (req, res, next) {
var psw = validator.trim(req.body.psw) || '';
exports.updatePass = function (req, res, next) {
var psw = validator.trim(req.body.psw) || '';
var repsw = validator.trim(req.body.repsw) || '';
var key = validator.trim(req.body.key) || '';
var name = validator.trim(req.body.name) || '';
var key = validator.trim(req.body.key) || '';
var name = validator.trim(req.body.name) || '';
var ep = new eventproxy();
ep.fail(next);
@ -270,10 +274,11 @@ exports.update_pass = function (req, res, next) {
return res.render('notify/notify', {error: '错误的激活链接'});
}
tools.bhash(psw, ep.done(function (passhash) {
user.pass = passhash;
user.retrieve_key = null;
user.pass = passhash;
user.retrieve_key = null;
user.retrieve_time = null;
user.active = true; // 用户激活
user.active = true; // 用户激活
user.save(function (err) {
if (err) {
return next(err);

10
controllers/user.js
View File

@ -68,7 +68,7 @@ exports.index = function (req, res, next) {
});
};
exports.show_stars = function (req, res, next) {
exports.listStars = function (req, res, next) {
User.getUsersByQuery({is_star: true}, {}, function (err, stars) {
if (err) {
return next(err);
@ -168,7 +168,7 @@ exports.setting = function (req, res, next) {
}
};
exports.toggle_star = function (req, res, next) {
exports.toggleStar = function (req, res, next) {
var user_id = req.body.user_id;
User.getUserById(user_id, function (err, user) {
if (err) {
@ -187,7 +187,7 @@ exports.toggle_star = function (req, res, next) {
});
};
exports.get_collect_topics = function (req, res, next) {
exports.listCollectedTopics = function (req, res, next) {
var name = req.params.name;
User.getUserByLoginName(name, function (err, user) {
if (err || !user) {
@ -245,7 +245,7 @@ exports.top100 = function (req, res, next) {
});
};
exports.list_topics = function (req, res, next) {
exports.listTopics = function (req, res, next) {
var user_name = req.params.name;
var page = Number(req.query.page) || 1;
var limit = config.list_topic_count;
@ -280,7 +280,7 @@ exports.list_topics = function (req, res, next) {
});
};
exports.list_replies = function (req, res, next) {
exports.listReplies = function (req, res, next) {
var user_name = req.params.name;
var page = Number(req.query.page) || 1;
var limit = 50;

8
test/controllers/user.test.js
View File

@ -49,7 +49,7 @@ describe('test/controllers/user.test.js', function () {
});
});
describe('#show_stars', function () {
describe('#listStars', function () {
it('should show star uses', function (done) {
request.get('/stars')
.expect(200, function (err, res) {
@ -136,7 +136,7 @@ describe('test/controllers/user.test.js', function () {
});
});
describe('#toggle_star', function () {
describe('#toggleStar', function () {
it('should not set star user when no user_id', function (done) {
request.post('/user/set_star')
.set('Cookie', support.adminUserCookie)
@ -179,7 +179,7 @@ describe('test/controllers/user.test.js', function () {
});
});
describe('#get_collect_topics', function () {
describe('#getCollectTopics', function () {
it('should get /user/:name/collections ok', function (done) {
request.get('/user/' + support.normalUser.loginname + '/collections')
.expect(200, function (err, res) {
@ -209,7 +209,7 @@ describe('test/controllers/user.test.js', function () {
});
});
describe('#list_replies', function () {
describe('#listReplies', function () {
it('should get /user/:name/replies ok', function (done) {
request.get('/user/' + support.normalUser.loginname + '/replies')
.expect(200, function (err, res) {

18
web_router.js
View File

@ -44,24 +44,24 @@ if (config.allow_sign_up) {
router.post('/signout', sign.signout); // 登出
router.get('/signin', sign.showLogin); // 进入登录页面
router.post('/signin', sign.login); // 登录校验
router.get('/active_account', sign.active_account); //帐号激活
router.get('/active_account', sign.activeAccount); //帐号激活
router.get('/search_pass', sign.showSearchPass); // 找回密码页面
router.post('/search_pass', sign.updateSearchPass); // 更新密码
router.get('/reset_pass', sign.reset_pass); // 进入重置密码页面
router.post('/reset_pass', sign.update_pass); // 更新密码
router.get('/reset_pass', sign.resetPass); // 进入重置密码页面
router.post('/reset_pass', sign.updatePass); // 更新密码
// user controller
router.get('/user/:name', user.index); // 用户个人主页
router.get('/setting', auth.userRequired, user.showSetting); // 用户个人设置页
router.post('/setting', auth.userRequired, user.setting); // 提交个人信息设置
router.get('/stars', user.show_stars); // 显示所有达人列表页
router.get('/stars', user.listStars); // 显示所有达人列表页
router.get('/users/top100', user.top100); // 显示积分前一百用户页
router.get('/user/:name/collections', user.get_collect_topics); // 用户收藏的所有话题页
router.get('/user/:name/topics', user.list_topics); // 用户发布的所有话题页
router.get('/user/:name/replies', user.list_replies); // 用户参与的所有回复页
router.post('/user/set_star', auth.adminRequired, user.toggle_star); // 把某用户设为达人
router.post('/user/cancel_star', auth.adminRequired, user.toggle_star); // 取消某用户的达人身份
router.get('/user/:name/collections', user.listCollectedTopics); // 用户收藏的所有话题页
router.get('/user/:name/topics', user.listTopics); // 用户发布的所有话题页
router.get('/user/:name/replies', user.listReplies); // 用户参与的所有回复页
router.post('/user/set_star', auth.adminRequired, user.toggleStar); // 把某用户设为达人
router.post('/user/cancel_star', auth.adminRequired, user.toggleStar); // 取消某用户的达人身份
router.post('/user/:name/block', auth.adminRequired, user.block); // 禁言某用户
router.post('/user/:name/delete_all', auth.adminRequired, user.deleteAll); // 删除某用户所有发言