From 488547c0ddf80c23ccfe14fd9bd26a7024286e97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?VK=E4=BA=91=E6=A1=8C=E9=9D=A2?= <370725567@qq.com> Date: Wed, 21 Jun 2023 17:31:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=8E=A5=E5=8F=A3=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E5=8E=BB=E9=99=A4=E5=89=8D=E7=AB=AF=E7=9A=84role?= =?UTF-8?q?=E5=8F=82=E6=95=B0=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=8F=91=E7=94=9F?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=80=A7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../router/service/user/pub/loginByAlipay.js | 13 +++++- .../router/service/user/pub/loginByEmail.js | 9 ++--- .../router/service/user/pub/loginByQQ.js | 15 ++++++- .../router/service/user/pub/loginBySms.js | 14 +++++-- .../service/user/pub/loginByUniverify.js | 19 ++++++++- .../router/service/user/pub/register.js | 40 +++++++++++-------- .../router/service/user/pub/sendEmailCode.js | 3 ++ 7 files changed, 84 insertions(+), 29 deletions(-) diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginByAlipay.js b/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginByAlipay.js index 9af94e1..d255f0f 100644 --- a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginByAlipay.js +++ b/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginByAlipay.js @@ -18,7 +18,18 @@ module.exports = { let { uid } = data; let res = {}; // 业务逻辑开始----------------------------------------------------------- - res = await uniID.loginByAlipay(data); + let { + code, + type, + myInviteCode, + needPermission + } = data; + res = await uniID.loginByAlipay({ + code, + type, + myInviteCode, + needPermission + }); if (res.token) { if (!res.msg) { res.msg = res.type === "register" ? "注册成功" : "登录成功"; diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginByEmail.js b/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginByEmail.js index 65e9e3e..8d63ef4 100644 --- a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginByEmail.js +++ b/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginByEmail.js @@ -1,8 +1,7 @@ module.exports = { /** - * 用户登录(支付宝授权) + * 用户登录（邮箱+验证码登录） * @url user/pub/loginByEmail 前端调用的url参数地址 - * @description 用户登录(支付宝授权) * data 请求参数 说明 * @param {String} email 邮箱 * @param {String} code 邮箱收到的验证码 @@ -10,7 +9,6 @@ module.exports = { * @param {String} password 密码，当前用户为新注册时生效 * @param {String} myInviteCode 设置当前注册用户自己的邀请码，当前用户为新注册时生效（不传会自动生成） * @param {Boolean} needPermission 设置为true时会在checkToken时返回用户权限（permission），如果是在admin端，需传true - * @param {Array} role 设定用户角色，当前用户为新注册时生效 * res 返回参数说明 * @param {Number} code 错误码，0表示成功 * @param {String} msg 详细信息 @@ -23,15 +21,14 @@ module.exports = { let { uid } = data; let res = {}; // 业务逻辑开始----------------------------------------------------------- - let { email, code, type, password, needPermission, myInviteCode, role } = data; + let { email, code, type, password, needPermission, myInviteCode } = data; res = await uniID.loginByEmail({ email, code, type, password, myInviteCode, - needPermission, - role + needPermission }); if (res.token) { if (!res.msg) { diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginByQQ.js b/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginByQQ.js index 2b04066..56d0403 100644 --- a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginByQQ.js +++ b/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginByQQ.js @@ -18,7 +18,20 @@ module.exports = { let { uid } = data; let res = {}; // 业务逻辑开始----------------------------------------------------------- - res = await uniID.loginByQQ(data); + let { + code, + accessToken, + type, + myInviteCode, + needPermission + } = data; + res = await uniID.loginByQQ({ + code, + accessToken, + type, + myInviteCode, + needPermission + }); if (res.token) { if (!res.msg) { res.msg = res.type === "register" ? "注册成功" : "登录成功"; diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginBySms.js b/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginBySms.js index e9e3176..ff07353 100644 --- a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginBySms.js +++ b/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginBySms.js @@ -11,7 +11,6 @@ module.exports = { * @param {String} inviteCode 邀请人的邀请码，当前用户为新注册时生效 * @param {String} myInviteCode 设置当前注册用户自己的邀请码，当前用户为新注册时生效（不传会自动生成） * @param {Boolean} needPermission 设置为true时会在checkToken时返回用户权限（permission），如果是在admin端，需传true - * @param {Array} role 设定用户角色，当前用户为新注册时生效 * res 返回参数说明 * @param {Number} code 错误码，0表示成功 * @param {String} msg 详细信息 @@ -24,7 +23,15 @@ module.exports = { let { uid } = data; let res = {}; // 业务逻辑开始----------------------------------------------------------- - let { mobile, code, password, inviteCode, myInviteCode, needPermission, role, type } = data; + let { + mobile, + code, + type, + password, + inviteCode, + myInviteCode, + needPermission + } = data; res = await uniID.loginBySms({ mobile, code, @@ -32,8 +39,7 @@ module.exports = { password, inviteCode, myInviteCode, - needPermission, - role + needPermission }); // 修改用户昵称为:手机尾号xxxx用户 if (res.token) { diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginByUniverify.js b/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginByUniverify.js index 5fc9ad4..3022718 100644 --- a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginByUniverify.js +++ b/uniCloud-aliyun/cloudfunctions/router/service/user/pub/loginByUniverify.js @@ -25,7 +25,24 @@ module.exports = { let { uid } = data; let res = { code: 0, msg: '' }; // 业务逻辑开始----------------------------------------------------------- - res = await uniID.loginByUniverify(data); + let { + access_token, + openid, + type, + password, + inviteCode, + myInviteCode, + needPermission + } = data; + res = await uniID.loginByUniverify({ + access_token, + openid, + type, + password, + inviteCode, + myInviteCode, + needPermission + }); if (res.token) { if (!res.msg) { res.msg = res.type === "register" ? "注册成功" : "登录成功"; diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/register.js b/uniCloud-aliyun/cloudfunctions/router/service/user/pub/register.js index efed87f..d8e2b67 100644 --- a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/register.js +++ b/uniCloud-aliyun/cloudfunctions/router/service/user/pub/register.js @@ -1,8 +1,8 @@ module.exports = { - /** - * 用户注册(账号+密码) - * @url user/pub/register 前端调用的url参数地址 - * @description 用户注册(账号+密码) + /** + * 用户注册(账号+密码) + * @url user/pub/register 前端调用的url参数地址 + * @description 用户注册(账号+密码) * data 请求参数 说明 * @param {String} username 用户名，唯一 * @param {String} password 密码 @@ -12,26 +12,34 @@ module.exports = { * @param {String} token 注册完成自动登录之后返回的token信息 * @param {String} tokenExpired token过期时间 * @param {Object} userInfo 用户信息 - */ + */ main: async (event) => { let { data = {}, userInfo, util, originalParam } = event; - let { uniID, config, pubFun, vk , db, _ } = util; + let { uniID, config, pubFun, vk, db, _ } = util; let { uid } = data; - let res = { code : -1, msg : '' }; + let res = { code: -1, msg: '' }; // 业务逻辑开始----------------------------------------------------------- - let { username, password, needPermission } = data; + let { + username, + password, + needPermission, + myInviteCode + } = data; // username必须以字母开头，长度在6~18之间，只能包含字母、数字和下划线 - if(!vk.pubfn.test(username,"username")){ - return { code : -1, msg : "账号必须以字母开头，长度在6~18之间，只能包含字母、数字和下划线" }; + if (!vk.pubfn.test(username, "username")) { + return { code: -1, msg: "账号必须以字母开头，长度在6~18之间，只能包含字母、数字和下划线" }; } // password 长度在6~18之间，只能包含字母、数字和下划线 - if(!vk.pubfn.test(password,"pwd")){ - return { code : -1, msg : "密码长度在6~18之间，只能包含字母、数字和下划线" }; + if (!vk.pubfn.test(password, "pwd")) { + return { code: -1, msg: "密码长度在6~18之间，只能包含字母、数字和下划线" }; } - res = await uniID.register({ - username, password, needPermission - }); + res = await uniID.register({ + username, + password, + needPermission, + myInviteCode + }); // 业务逻辑结束----------------------------------------------------------- return res; } -} +} \ No newline at end of file diff --git a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/sendEmailCode.js b/uniCloud-aliyun/cloudfunctions/router/service/user/pub/sendEmailCode.js index 77b6d5e..4f0912f 100644 --- a/uniCloud-aliyun/cloudfunctions/router/service/user/pub/sendEmailCode.js +++ b/uniCloud-aliyun/cloudfunctions/router/service/user/pub/sendEmailCode.js @@ -29,6 +29,9 @@ module.exports = { } = data; let res = { code: 0, msg: 'ok' }; // 业务逻辑开始----------------------------------------------------------- + if (!vkmail) { + return { code: -1, msg: "请先添加公共模块：vk-mail（右键对应的云函数，点击管理公共模块或扩展库依赖，勾选vk-mail依赖）" }; + } let code = vk.pubfn.random(6, "0123456789"); let param = { code, -- GitLab