登录注册密码加密

@@ -56,7 +56,7 @@ passport.use(new LocalStrategy({
 
 
     let shoppingKey = cookie.getShoppingKey(req);
     let shoppingKey = cookie.getShoppingKey(req);
 
 
-    AuthHelper.signin(area, username, password, shoppingKey).then((result) => {
+    AuthHelper.signinAes(area, username, password, shoppingKey).then((result) => {
         if (result.code && result.code === 200 && result.data.uid) {
         if (result.code && result.code === 200 && result.data.uid) {
             done(null, result.data);
             done(null, result.data);
         } else {
         } else {

@@ -120,7 +120,7 @@ const setNewPasswordByEmailAPI = (req, res) => {
         data: SIGN_IN
         data: SIGN_IN
     };
     };
 
 
-    service.modifyPasswordByEmailAsync(pwd, code)
+    service.modifyPasswordByEmailAsyncAes(pwd, code)
         .then(result => {
         .then(result => {
             if (result.includes('history.back')) {
             if (result.includes('history.back')) {
                 data.code = 400;
                 data.code = 400;
@@ -281,7 +281,7 @@ const setNewPasswordByMobileAPI = (req, res, next) => {
     let areaCode = req.body.areaCode || '86';
     let areaCode = req.body.areaCode || '86';
     let newPwd = req.body.password || '';
     let newPwd = req.body.password || '';
 
 
-    service.modifyPasswordByMobileAsync(phoneNum, token, newPwd, areaCode)
+    service.modifyPasswordByMobileAsyncAes(phoneNum, token, newPwd, areaCode)
         .then(result => {
         .then(result => {
             if (result.code === 200) {
             if (result.code === 200) {
                 res.json({
                 res.json({

@@ -168,12 +168,16 @@ const bind = {
             }).then(result => {
             }).then(result => {
                 let refer = req.cookies.refer;
                 let refer = req.cookies.refer;
 
 
-                refer = refer ? decodeURI(refer) : helpers.urlFormat('/passport/bind/success');
+                refer = refer ? decodeURI(refer) : helpers.urlFormat('/passport/bind/success?type=bind');
                 if (result && result.code && result.code === 200 && result.data.uid) {
                 if (result && result.code && result.code === 200 && result.data.uid) {
-                    AuthHelper.syncUserSession(result.data.uid, req, res);
-                    result.data.refer = refer;
+                    return AuthHelper.syncUserSession(result.data.uid, req, res).then(() => {
+                        result.data.refer = refer;
+                        return result;
+                    });                    
+                } else {
+                    return { code: 400, message: '绑定失败', data: '' };
                 }
                 }
-                return result;
+                
             }).then(result => {
             }).then(result => {
                 res.json(result);
                 res.json(result);
             }).catch(next);
             }).catch(next);
@@ -205,7 +209,7 @@ const bind = {
                         return result;
                         return result;
                     });
                     });
                 } else {
                 } else {
-                    return { code: 400, message: '绑定失败', data: '' };
+                    return { code: 400, message: '关联失败', data: '' };
                 }
                 }
 
 
             }).then(result => {
             }).then(result => {
@@ -240,12 +244,13 @@ const bind = {
 
 
     successPage: (req, res) => {
     successPage: (req, res) => {
         let refer = req.cookies.refer;
         let refer = req.cookies.refer;
+        let type = req.query.type;
 
 
         refer = refer ? decodeURI(refer) : helpers.urlFormat('/?go=1');
         refer = refer ? decodeURI(refer) : helpers.urlFormat('/?go=1');
 
 
         res.render('bind/success', {
         res.render('bind/success', {
             isPassportPage: true,
             isPassportPage: true,
-            successTip: '恭喜您，第三方账号关联手机号码成功！',
+            successTip: type === 'bind' ? '恭喜您，第三方账号绑定手机号码成功！' : '恭喜您，第三方账号关联手机号码成功！',
             goUrl: refer,
             goUrl: refer,
             module: 'passport',
             module: 'passport',
             page: 'bind-success',
             page: 'bind-success',

@@ -235,7 +235,7 @@ let setPassword = (req, res, next) => {
     let shoppingKey = cookie.getShoppingKey(req);
     let shoppingKey = cookie.getShoppingKey(req);
 
 
     // 验证注册的标识码是否有效
     // 验证注册的标识码是否有效
-    RegService.regMobile(area, mobile, password, shoppingKey).then((result) => {
+    RegService.regMobileAes(area, mobile, password, shoppingKey).then((result) => {
         if (!result.code || result.code !== 200) {
         if (!result.code || result.code !== 200) {
             return Promise.reject(result);
             return Promise.reject(result);
         }
         }

@@ -67,6 +67,20 @@ const modifyPasswordByEmailAsync = (pwd, code) => {
 };
 };
 
 
 /**
 /**
+ * 根据邮箱验证码修改密码(调用新接口 采用AES密码加密)
+ *
+ * @param  string  pwd       新密码
+ * @param  string  code    邮箱验证码
+ */
+const modifyPasswordByEmailAsyncAes = (pwd, code) => {
+    return api.get('', {
+        code: code,
+        newPwd: aes.aesPwd(pwd),
+        method: 'app.register.resetPwdByCodeAES'
+    });
+};
+
+/**
  * 通过手机找回密码
  * 通过手机找回密码
  *
  *
  * @param  string  mobile 手机号
  * @param  string  mobile 手机号
@@ -128,8 +142,10 @@ module.exports = {
     getAreaDataAsync,
     getAreaDataAsync,
     sendCodeToEmailAsync,
     sendCodeToEmailAsync,
     modifyPasswordByEmailAsync,
     modifyPasswordByEmailAsync,
+    modifyPasswordByEmailAsyncAes,
     sendCodeToMobileAsync,
     sendCodeToMobileAsync,
     validateMobileCodeAsync,
     validateMobileCodeAsync,
-    modifyPasswordByMobileAsync
+    modifyPasswordByMobileAsync,
+    modifyPasswordByMobileAsyncAes
 };
 };
 
 

@@ -97,7 +97,6 @@ AlipayStrategy.prototype.authenticate = function(req, options) {
             params.sign_type = 'MD5';
             params.sign_type = 'MD5';
         }
         }
 
 
-        console.log(paramsToRaw(params));
         this.redirect(ALIPAY_URL + '?' + paramsToRaw(params));
         this.redirect(ALIPAY_URL + '?' + paramsToRaw(params));
     }
     }
 };
 };

@@ -96,7 +96,7 @@ const RegService = {
 
 
         return api.post('', params);
         return api.post('', params);
     },
     },
-    regMobileEas(area, mobile, password, shoppingKey) {
+    regMobileAes(area, mobile, password, shoppingKey) {
         let params = {
         let params = {
             method: 'app.passport.registerAES',
             method: 'app.passport.registerAES',
             area: area,
             area: area,