add refactor

@@ -15,7 +15,7 @@ const DoubanStrategy = require('passport-douban').Strategy;
 const RenrenStrategy = require('passport-renren').Strategy;
 const AlipayStrategy = require('./models/passport-alipay').Strategy;
 
-const LoginApi = require('./models/login-api');
+const LoginApi = require('./models/login-service');
 
 const config = global.yoho.config;
 const helpers = global.yoho.helpers;

@@ -10,7 +10,7 @@ const _ = require('lodash');
 const helpers = global.yoho.helpers;
 const PassportHelper = require('../models/passport-helper');
 const BindService = require('../models/bind-service');
-const loginService = require('../models/login-api');
+const loginService = require('../models/login-service');
 
 // const UserService = require('../models/user-service');
 const simpleHeaderModel = require('../../../doraemon/models/simple-header');

@@ -17,7 +17,7 @@ const helpers = global.yoho.helpers;
 const log = global.yoho.logger;
 const config = global.yoho.config;
 const cache = global.yoho.cache;
-const loginService = require('../models/login-api');
+const loginService = require('../models/login-service');
 const PassportHelper = require('../models/passport-helper');
 const simpleHeaderModel = require('../../../doraemon/models/simple-header');
 const loginPage = `${config.siteUrl}/signin.html`;

@@ -7,7 +7,7 @@ const Promise = require('bluebird');
 const passportHelper = require('../models/passport-helper');
 const regService = require('../models/reg-service');
 const userService = require('../models/user-service');
-const loginService = require('../models/login-api');
+const loginService = require('../models/login-service');
 const config = require('../../../config/common');
 const simpleHeaderModel = require('../../../doraemon/models/simple-header');
 let helpers = global.yoho.helpers;

@@ -57,7 +57,7 @@ const findUserAsync = (type, phone, area) => {
 
         const findBy = {
             email: userService.findByEmailAsync,
-            mobile: (phone1, area1) => userService.findByMobileAsync(area1, phone1) // 交换参数
+            mobile: _.rearg(userService.findByMobileAsync, [1, 0]) // 交换参数
         };
 
         const OK = {code: 200, message: MESSAGE.ok};

-'use strict';
+/**
+ * Created by TaoHuang on 2016/10/21.
+ */
 
-const md5 = require('md5');
+'use strict';
 
 const aes = require('./aes-pwd');
-const cache = global.yoho.cache;
-const sign = global.yoho.sign;
 const api = global.yoho.API;
-const cookie = global.yoho.cookie;
-const _ = require('lodash');
-
-const Promise = require('bluebird');
-
-const cartService = require('./cart-service');
-
-const Auth = {
-    signin(type, area, profile, password, shoppingKey) {
-        let _that = this;
-        let loginBy = {
-            password: _that.signinByPasswordWithAes,
-            sms: _that.signinBySMS,
-            qrcode: _that.signinByQrCode
-        };
-
-        return loginBy[type](area, profile, password, shoppingKey);
-    },
-    signinByPasswordWithAes(area, profile, password, shoppingKey) {
-        let param = {
-            method: 'app.passport.signinAES',
-            area: area,
-            profile: profile,
-            password: aes.aesPwd(password)
-        };
-
-        if (shoppingKey) {
-            param.shopping_key = shoppingKey;
-        }
-
-        return api.post('', param);
-    },
-    signinBySMS(area, mobile, token, shoppingKey) {
-        let param = {
-            method: 'app.passport.autoSignin',
-            area: area,
-            profile: mobile,
-            code: token
-        };
-
-        if (shoppingKey) {
-            param.shopping_key = shoppingKey;
-        }
-
-        return api.post('', param);
-    },
-    signinByQrCode(__1, __2, code, shoppingKey) { // eslint-disable-line
-        let param = {
-            method: 'app.twoDimen.qrCodeLogin',
-            code: code.substring(code.indexOf('=') + 1)
-        };
-
-        if (shoppingKey) {
-            param.shopping_key = shoppingKey;
-        }
-
-        return api.post('', param);
-    },
-    fetchByQrCode() {
-        let param = {
-            method: 'app.twoDimen.getCode'
-        };
-
-        return api.post('', param);
-    },
-    checkByQrCode(code) {
-        let param = {
-            method: 'app.twoDimen.loginCheck',
-            code: code
-        };
-
-        return api.post('', param);
-    },
-    sendPasswordBySMS(area, mobile) {
-        let param = {
-            method: 'app.message.sendSms',
-            area: area,
-            mobile: mobile,
-            type: 1 // 手机快捷登录短信验证码
-        };
-
-        return api.get('', param);
-    },
-    checkUserExitBySMS(area, mobile) {
-        return api.get('', {
-            method: 'app.passport.checkUserExist',
-            area: area,
-            mobile: mobile
-        });
-    },
-    verifyPasswordBySMS(area, mobile, code) {
-        return api.get('', {
-            method: 'app.message.verifySmsCode',
-            area: area,
-            mobile: mobile,
-            code: code,
-            type: 1 // 手机快捷登录短信验证码
-        });
-    },
-    signinByOpenID(nickname, openId, sourceType, shoppingKey) {
-        let param = {
-            nickname: nickname,
-            openId: openId,
-            source_type: sourceType,
-            method: 'app.passport.signinByOpenID'
-        };
-
-        if (shoppingKey) {
-            param.shopping_key = shoppingKey;
-        }
-
-        return api.get('', param);
-    },
-    signinByWechat(nickname, openId, unionId, sourceType, shoppingKey) {
-        let param = {
-            nickname: nickname,
-            openId: openId,
-            unionId: unionId,
-            source_type: sourceType,
-            method: 'app.passport.signinByWechat'
-        };
-
-        if (shoppingKey) {
-            param.shopping_key = shoppingKey;
-        }
-
-        return api.get('', param);
-    },
-    profile(uid) {
-        let param = {
-            uid: uid,
-            method: 'app.passport.profile'
-        };
-
-        return api.get('', param);
-    },
-    syncUserSession(uid, req, res) {
-        return Promise.all([Auth.profile(uid), cartService.goodsCount(uid)]).spread((userInfo, count) => {
-            let token = sign.makeToken(uid);
-            let data = userInfo.data;
-            let encryptionUid = aes.encryptionUid(data.uid);
-
-            if (data) {
-                let uidCookie = `${data.profile_name}::${encryptionUid}::${data.vip_info.title}::${token}`;
-                let isStudent = data.vip_info.is_student || 0;
-
-                req.session._TOKEN = token;
-                req.session._LOGIN_UID = uid;
-
-                res.cookie('_UID', uidCookie, {
-                    domain: 'yohobuy.com'
-                });
-                res.cookie('isStudent', isStudent, {
-                    domain: 'yohobuy.com'
-                });
-
-                // 购物车中商品的数量
-                res.cookie('_g', JSON.stringify({
-                    _k: cookie.getShoppingKey(req),
-                    _nac: count,
-                    _ac: 0,
-                    _c: 1
-                }), {
-                    domain: 'yohobuy.com'
-                });
-            }
-            req.session._TOKEN = token; // esline-disable-line
-            req.session._LOGIN_UID = uid; // esline-disable-line
-            res.cookie('_TOKEN', token, {
-                domain: 'yohobuy.com'
-            }); // esline-disable-line
-        }).catch(console.log);
-    },
-    rememberAccount(accountInfo, req, res) {
-        let aWeek = (new Date()).getTime() / 1000 + 504000; // 504000-一周
-        let rememKey = md5(md5(accountInfo.account + accountInfo.password + accountInfo.area));
-
-        res.cookie('isRemember', true, aWeek);
-        res.cookie('remem', rememKey, aWeek);
-        if (!cache.get(rememKey)) {
-            cache.set(rememKey, accountInfo, aWeek);
-        }
+
+const signinByPasswordWithAes = (area, profile, password, shoppingKey) => {
+    let param = {
+        method: 'app.passport.signinAES',
+        area: area,
+        profile: profile,
+        password: aes.aesPwd(password)
+    };
+
+    if (shoppingKey) {
+        param.shopping_key = shoppingKey;
+    }
+
+    return api.post('', param);
+};
+
+const signinBySMS = (area, mobile, token, shoppingKey) => {
+    let param = {
+        method: 'app.passport.autoSignin',
+        area: area,
+        profile: mobile,
+        code: token
+    };
+
+    if (shoppingKey) {
+        param.shopping_key = shoppingKey;
+    }
+
+    return api.post('', param);
+};
+
+const signinByQrCode = (__1, __2, code, shoppingKey) => { // eslint-disable-line
+    let param = {
+        method: 'app.twoDimen.qrCodeLogin',
+        code: code.substring(code.indexOf('=') + 1)
+    };
+
+    if (shoppingKey) {
+        param.shopping_key = shoppingKey;
+    }
+
+    return api.post('', param);
+};
+
+const fetchByQrCode = () => {
+    let param = {
+        method: 'app.twoDimen.getCode'
+    };
+
+    return api.post('', param);
+};
+
+const checkByQrCode = (code) => {
+    let param = {
+        method: 'app.twoDimen.loginCheck',
+        code: code
+    };
+
+    return api.post('', param);
+};
+
+const sendPasswordBySMS = (area, mobile) => {
+    let param = {
+        method: 'app.message.sendSms',
+        area: area,
+        mobile: mobile,
+        type: 1 // 手机快捷登录短信验证码
+    };
+
+    return api.get('', param);
+};
+
+const checkUserExitBySMS = (area, mobile) => {
+    return api.get('', {
+        method: 'app.passport.checkUserExist',
+        area: area,
+        mobile: mobile
+    });
+};
+
+const verifyPasswordBySMS = (area, mobile, code) => {
+    return api.get('', {
+        method: 'app.message.verifySmsCode',
+        area: area,
+        mobile: mobile,
+        code: code,
+        type: 1 // 手机快捷登录短信验证码
+    });
+};
+
+const signinByOpenID = (nickname, openId, sourceType, shoppingKey) => {
+    let param = {
+        nickname: nickname,
+        openId: openId,
+        source_type: sourceType,
+        method: 'app.passport.signinByOpenID'
+    };
+
+    if (shoppingKey) {
+        param.shopping_key = shoppingKey;
     }
+
+    return api.get('', param);
 };
 
-module.exports = Auth;
+module.exports = {
+    signinByPasswordWithAes,
+    signinBySMS,
+    signinByQrCode,
+    fetchByQrCode,
+    checkByQrCode,
+    sendPasswordBySMS,
+    checkUserExitBySMS,
+    verifyPasswordBySMS,
+    signinByOpenID
+};

+'use strict';
+
+const md5 = require('md5');
+
+const aes = require('./aes-pwd');
+const cache = global.yoho.cache;
+const sign = global.yoho.sign;
+const cookie = global.yoho.cookie;
+
+const Promise = require('bluebird');
+
+const cartService = require('./cart-service');
+const userService = require('./user-service');
+const api = require('./login-api');
+
+const signin = (type, area, profile, password, shoppingKey) => {
+    let loginBy = {
+        password: api.signinByPasswordWithAes,
+        sms: api.signinBySMS,
+        qrcode: api.signinByQrCode
+    };
+
+    return loginBy[type](area, profile, password, shoppingKey);
+};
+
+const syncUserSession = (uid, req, res) => {
+    return Promise.all([userService.profile(uid), cartService.goodsCount(uid)]).spread((userInfo, count) => {
+        let token = sign.makeToken(uid);
+        let data = userInfo.data;
+        let encryptionUid = aes.encryptionUid(data.uid);
+
+        if (data) {
+            let uidCookie = `${data.profile_name}::${encryptionUid}::${data.vip_info.title}::${token}`;
+            let isStudent = data.vip_info.is_student || 0;
+
+            req.session._TOKEN = token;
+            req.session._LOGIN_UID = uid;
+
+            res.cookie('_UID', uidCookie, {
+                domain: 'yohobuy.com'
+            });
+            res.cookie('isStudent', isStudent, {
+                domain: 'yohobuy.com'
+            });
+
+            // 购物车中商品的数量
+            res.cookie('_g', JSON.stringify({
+                _k: cookie.getShoppingKey(req),
+                _nac: count,
+                _ac: 0,
+                _c: 1
+            }), {
+                domain: 'yohobuy.com'
+            });
+        }
+        req.session._TOKEN = token; // esline-disable-line
+        req.session._LOGIN_UID = uid; // esline-disable-line
+        res.cookie('_TOKEN', token, {
+            domain: 'yohobuy.com'
+        }); // esline-disable-line
+    }).catch(console.log);
+};
+
+const rememberAccount = (accountInfo, req, res) => {
+    let aWeek = (new Date()).getTime() / 1000 + 504000; // 504000-一周
+    let rememKey = md5(md5(accountInfo.account + accountInfo.password + accountInfo.area));
+
+    res.cookie('isRemember', true, aWeek);
+    res.cookie('remem', rememKey, aWeek);
+    if (!cache.get(rememKey)) {
+        cache.set(rememKey, accountInfo, aWeek);
+    }
+};
+
+module.exports = {
+    signin,
+    syncUserSession,
+    rememberAccount,
+    fetchByQrCode: api.fetchByQrCode,
+    checkByQrCode: api.checkByQrCode,
+    sendPasswordBySMS: api.sendPasswordBySMS,
+    checkUserExitBySMS: api.checkUserExitBySMS,
+    verifyPasswordBySMS: api.verifyPasswordBySMS,
+    signinByOpenID: api.signinByOpenID
+};

@@ -34,21 +34,30 @@ const findByEmailAsync = (email) => {
     return api.get('', {
         email: email,
         method: 'app.passport.getProfileByEmail'
-    })
-        .then(result => {
-            if (!result.code || result.code !== 200 || !result.data || _.isEmpty(result.data)) {
-                return EMPTY;
-            }
+    }).then(result => {
+        if (!result.code || result.code !== 200 || !result.data || _.isEmpty(result.data)) {
+            return EMPTY;
+        }
 
-            return result.data;
+        return result.data;
 
-        })
-        .catch(() => {
-            return EMPTY;
-        });
+    }).catch(() => {
+        return EMPTY;
+    });
+};
+
+const profile = (uid) => {
+    let param = {
+        uid: uid,
+        method: 'app.passport.profile'
+    };
+
+    return api.get('', param);
 };
 
+
 module.exports = {
     findByMobileAsync,
-    findByEmailAsync
+    findByEmailAsync,
+    profile
 };