fe / yohobuy-node · Commits

Go to a project

Authored by htoooth
Commit 67c2385f998605743228422310c9564b17a8593d 1 parent 9282a3b8

refactor

Inline Side-by-side
Showing 2 changed files with 45 additions and 44 deletions
... ... @@ -33,8 +33,8 @@ const index = (req, res, next) => {
.then(result => {
res.render('back/index', Object.assign({
module: 'passport',
page : 'back-index',
title : '找回密码'
page: 'back-index',
title: '找回密码'
}, result));
})
.catch(next);
... ... @@ -54,7 +54,7 @@ const validateInputAPI = (req, res, next) => {
})
.catch(err => {
res.json({
code : 400,
code: 400,
message: err
});
});
... ... @@ -105,22 +105,22 @@ const sendCodePage = (req, res, next) => {
const saveInSession = (req, res) => {
switch (req.inputInfo.type) {
case 'email':
{
req.session.email = req.inputInfo.phone;
res.redirect(helpers.urlFormat('/passport/back/sendEmail'));
break;
}
{
req.session.email = req.inputInfo.phone;
res.redirect(helpers.urlFormat('/passport/back/sendEmail'));
break;
}
case 'mobile':
{
req.session.mobile = req.inputInfo.phone;
req.session.area = req.inputInfo.area;
res.redirect(helpers.urlFormat('/passport/back/verification'));
break;
}
{
req.session.mobile = req.inputInfo.phone;
req.session.area = req.inputInfo.area;
res.redirect(helpers.urlFormat('/passport/back/verification'));
break;
}
default:
{
res.redirect(helpers.urlFormat('/passport/back/index'));
}
{
res.redirect(helpers.urlFormat('/passport/back/index'));
}
}
};
... ... @@ -168,13 +168,13 @@ const sendEmailPage = (req, res, next) => {
.then(result => {
res.render('back/send-email', Object.assign({
module: 'passport',
page : 'back-send-email-ok',
title : '邮件发送成功'
page: 'back-send-email-ok',
title: '邮件发送成功'
}, {
sendEmail: {
coverHref: result.url,
coverImg : result.img,
email : req.body.emailUrl
coverImg: result.img,
email: req.body.emailUrl
}
}));
})
... ... @@ -207,13 +207,13 @@ const resetPasswordPage = (req, res, next) => {
.then(result => {
res.render('back/reset-pwd', Object.assign({
module: 'passport',
page : 'back-reset-pwd',
title : '重置密码'
page: 'back-reset-pwd',
title: '重置密码'
}, {
resetPwd: Object.assign({
coverHref: result.url,
coverImg : result.img,
code : code
coverImg: result.img,
code: code
}, req.mobileAuth)
}));
})
... ... @@ -233,14 +233,14 @@ const verifyCodeByMobilePage = (req, res, next) => {
.then(result => {
res.render('back/verification', Object.assign({
module: 'passport',
page : 'back-verify-mobile-code',
title : '手机验证'
page: 'back-verify-mobile-code',
title: '手机验证'
}, {
verification: {
coverHref : result.url,
coverImg : result.img,
mobile : req.body.mobile,
area : req.body.area,
coverHref: result.url,
coverImg: result.img,
mobile: req.body.mobile,
area: req.body.area,
verifyCode: req.body.verifyCode
}
}));
... ... @@ -264,12 +264,12 @@ const resetPwdSuccessPage = (req, res, next) => {
.then(result => {
res.render('back/reset-success', Object.assign({
module: 'passport',
page : 'back-index',
title : '重置密码成功'
page: 'back-index',
title: '重置密码成功'
}, {
resetSuccess: {
coverHref: result.url,
coverImg : result.img
coverImg: result.img
}
}));
})
... ... @@ -280,12 +280,13 @@ const verifyCodeByMobileAPI = (req, res) => {
let mobile = req.param('mobile', '');
let area = req.param('area', '86');
let mobileCode = req.param('code', '');
//const session = req.session;
// const session = req.session;
const ERR = {
code : 400,
code: 400,
message: '验证码错误！',
data : helpers.urlFormat('/passport/back/index')
data: helpers.urlFormat('/passport/back/index')
};
// if (!code || mobile !== session.mobile || area !== session.area) {
... ... @@ -324,9 +325,9 @@ const validateCodeByMobilePage = (req, res, next) => {
}
let data = {
mobile : mobile,
area : area,
token : token,
mobile: mobile,
area: area,
token: token,
createdAt: createdAt
};
... ...
... ... @@ -18,7 +18,7 @@ const backHelper = require('./back-helper');
const BACK_LEFT_BANNER_CODE = '3bbaf502c447a2ddad60879042e286d8'; // 找回密码左边的banner
const validateEmailOrMobileAsync = (userInput, areaCode) => {
return new Promise(function(resolve, rejected) {
return new Promise(function (resolve, rejected) {
let result = {type: 'email', area: '', phone: ''};
if (passportHelper.validator.verifyEmail(userInput)) {
... ... @@ -120,9 +120,9 @@ const verifyCodyByMobileAsync = (area, mobile, mobileCode) => {
}
let data = {
mobile : mobile,
area : area,
token : result.data.token,
mobile: mobile,
area: area,
token: result.data.token,
createdAt: moment().unix()
};
... ...