diff --git a/src/modules/sign/sign.controller.js b/src/modules/sign/sign.controller.js index 66f1584..5da0d7e 100644 --- a/src/modules/sign/sign.controller.js +++ b/src/modules/sign/sign.controller.js @@ -64,6 +64,49 @@ module.exports = { } }; }), + signUpReqInviter: inject(function(SysConfig) { + const { JWT_SECRET, PWD_HASH_SALT } = SysConfig; + return async (req, res) => { + let { phone, code, inviter, password } = req.body; + if (!phone || !code || !password || !inviter) return res.json({ + code: 1, + msg: 'Missing required parameters' + }); + const isCodeValid = await Code.verifyCode({ id: phone, code, type: CODE_TYPE['signUp'] }); + password = Crypto.hash(password, { salt: PWD_HASH_SALT }); + if (isCodeValid) { + await createNewUser({ + phone, + inviter, + password + }).then(user => { + const token = createToken({ + userId: user.id + }, JWT_SECRET, {}); + res.json({ + code: 0, + msg: 'success', + data: { + //刚注册,需要返回的应该只有token,其他的没意义 + token + } + }); + }) + .catch(err => { + mylog.error(err); + res.json({ + code: 3, + msg: JSON.stringify(err), + }); + }); + } else { + res.json({ + code: 2, + msg: 'Invalid code', + }); + } + }; + }), signUp: inject(function(SysConfig) { const { JWT_SECRET, PWD_HASH_SALT } = SysConfig; return async (req, res) => { diff --git a/src/modules/user/user.controller.js b/src/modules/user/user.controller.js index 37bf8c8..a51b2c8 100644 --- a/src/modules/user/user.controller.js +++ b/src/modules/user/user.controller.js @@ -6,11 +6,9 @@ module.exports = { changePwd, async createNewUser (data) { let { phone, inviter = '', password } = data; - await (new User({ phone, inviter, password })).save().then(user => { - return user; - }).catch(err => { + return await (new User({ phone, inviter, password })).save().then(user => user).catch(err => { mylog.error('创建新用户失败', err); - throw new Error('创建新用户失败', err); + throw new Error('创建新用户失败', err.errmsg); }); }, async getUserInfo (req, res) {