合并jrp写的邮箱注册&找回密码的云对象

uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/constants.js

@@ -36,7 +36,9 @@ const CAPTCHA_SCENE = {
   LOGIN_BY_PWD: 'login-by-pwd',
   LOGIN_BY_SMS: 'login-by-sms',
   RESET_PWD_BY_SMS: 'reset-pwd-by-sms',
+  RESET_PWD_BY_EMAIL: 'reset-pwd-by-email',
   SEND_SMS_CODE: 'send-sms-code',
+  SEND_EMAIL_CODE: 'send-email-code',
   BIND_MOBILE_BY_SMS: 'bind-mobile-by-sms'
 }
 
@@ -45,6 +47,7 @@ const LOG_TYPE = {
   LOGIN: 'login',
   REGISTER: 'register',
   RESET_PWD_BY_SMS: 'reset-pwd',
+  RESET_PWD_BY_EMAIL: 'reset-pwd',
   BIND_MOBILE: 'bind-mobile',
   BIND_WEIXIN: 'bind-weixin',
   BIND_QQ: 'bind-qq',
@@ -58,6 +61,13 @@ const SMS_SCENE = {
   BIND_MOBILE_BY_SMS: 'bind-mobile-by-sms'
 }
 
+const EMAIL_SCENE = {
+  REGISTER: 'register',
+  LOGIN_BY_EMAIL: 'login-by-email',
+  RESET_PWD_BY_EMAIL: 'reset-pwd-by-email',
+  BIND_EMAIL: 'bind-email'
+}
+
 module.exports = {
   db,
   dbCmd,
@@ -68,5 +78,6 @@ module.exports = {
   USER_STATUS,
   CAPTCHA_SCENE,
   LOG_TYPE,
-  SMS_SCENE
+  SMS_SCENE,
+  EMAIL_SCENE
 }

uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/index.obj.js

@@ -15,7 +15,8 @@ const middleware = require('./middleware/index')
 
 const {
   registerAdmin,
-  registerUser
+  registerUser,
+  registerUserByEmail
 } = require('./module/register/index')
 const {
   addUser,
@@ -45,13 +46,15 @@ const {
 const {
   updatePwd,
   resetPwdBySms,
+  resetPwdByEmail,
   closeAccount,
   getAccountInfo
 } = require('./module/account/index')
 const {
   createCaptcha,
   refreshCaptcha,
-  sendSmsCode
+  sendSmsCode,
+  sendEmailCode
 } = require('./module/verify/index')
 const {
   refreshToken,
@@ -273,6 +276,17 @@ module.exports = {
    * @returns
    */
   registerUser,
+  /**
+   * 通过邮箱+验证码注册用户
+   * @param {Object} params
+   * @param {String} params.email    邮箱
+   * @param {String} params.password      密码
+   * @param {String} params.nickname    昵称
+   * @param {String} params.code  邮箱验证码
+   * @param {String} params.inviteCode  邀请码
+   * @returns
+   */
+  registerUserByEmail,
   /**
    * 用户名密码登录
    * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#login
@@ -433,6 +447,16 @@ module.exports = {
    * @returns {object}
    */
   resetPwdBySms,
+  /**
+   * 通过邮箱验证码重置密码
+   * @param {object} params
+   * @param {string} params.email   邮箱
+   * @param {string} params.code   邮箱验证码
+   * @param {string} params.password 密码
+   * @param {string} params.captcha  图形验证码
+   * @returns {object}
+   */
+  resetPwdByEmail,
   /**
    * 注销账户
    * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#close-account
@@ -470,6 +494,16 @@ module.exports = {
    * @returns
    */
   sendSmsCode,
+  /**
+   * 发送邮箱验证码
+   * @tutorial 需自行实现功能
+   * @param {Object} params
+   * @param {String} params.email    邮箱
+   * @param {String} params.captcha   图形验证码
+   * @param {String} params.scene     短信验证码使用场景
+   * @returns
+   */
+  sendEmailCode,
   /**
    * 刷新token
    * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#refresh-token

uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/index.js

 module.exports = {
   updatePwd: require('./update-pwd'),
   resetPwdBySms: require('./reset-pwd-by-sms'),
+  resetPwdByEmail: require('./reset-pwd-by-email'),
   closeAccount: require('./close-account'),
   getAccountInfo: require('./get-account-info')
 }

uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/account/reset-pwd-by-email.js

+const {
+  ERROR
+} = require('../../common/error')
+const {
+  getNeedCaptcha,
+  verifyCaptcha
+} = require('../../lib/utils/captcha')
+const {
+  verifyEmailCode
+} = require('../../lib/utils/verify-code')
+const {
+  userCollection,
+  EMAIL_SCENE,
+  CAPTCHA_SCENE,
+  LOG_TYPE
+} = require('../../common/constants')
+const {
+  findUser
+} = require('../../lib/utils/account')
+const PasswordUtils = require('../../lib/utils/password')
+
+/**
+ * 通过邮箱验证码重置密码
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#reset-pwd-by-email
+ * @param {object} params
+ * @param {string} params.email   邮箱
+ * @param {string} params.code   邮箱验证码
+ * @param {string} params.password 密码
+ * @param {string} params.captcha  图形验证码
+ * @returns {object}
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    email: 'email',
+    code: 'string',
+    password: 'password',
+    captcha: {
+      required: false,
+      type: 'string'
+    }
+  }
+  this.middleware.validate(params, schema)
+  const {
+    email,
+    code,
+    password,
+    captcha
+  } = params
+
+  const needCaptcha = await getNeedCaptcha.call(this, {
+    email,
+    type: LOG_TYPE.RESET_PWD_BY_EMAIL
+  })
+  if (needCaptcha) {
+    await verifyCaptcha.call(this, {
+      captcha,
+      scene: CAPTCHA_SCENE.RESET_PWD_BY_EMAIL
+    })
+  }
+  try {
+    // 验证手机号验证码，验证不通过时写入失败日志
+    await verifyEmailCode({
+      email,
+      code,
+      scene: EMAIL_SCENE.RESET_PWD_BY_EMAIL
+    })
+  } catch (error) {
+    await this.middleware.uniIdLog({
+      data: {
+        email
+      },
+      type: LOG_TYPE.RESET_PWD_BY_EMAIL,
+      success: false
+    })
+    throw error
+  }
+  // 根据手机号查找匹配的用户
+  const userMatched = await findUser.call(this, {
+    userQuery: {
+      email
+    },
+    authorizedApp: [this.getClientInfo().appId]
+  })
+  if (userMatched.length === 0) {
+    throw {
+      errCode: ERROR.ACCOUNT_NOT_EXISTS
+    }
+  } else if (userMatched.length > 1) {
+    throw {
+      errCode: ERROR.ACCOUNT_CONFLICT
+    }
+  }
+  const { _id: uid } = userMatched[0]
+  const {
+    passwordHash,
+    version
+  } = new PasswordUtils({
+    passwordSecret: this.config.passwordSecret
+  }).generatePasswordHash({
+    password
+  })
+  // 更新用户密码
+  await userCollection.doc(uid).update({
+    password: passwordHash,
+    password_secret_version: version,
+    valid_token_date: Date.now()
+  })
+
+  // 写入成功日志
+  await this.middleware.uniIdLog({
+    data: {
+      email
+    },
+    type: LOG_TYPE.RESET_PWD_BY_SMS
+  })
+  return {
+    errCode: 0
+  }
+}

uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/index.js

 module.exports = {
   registerUser: require('./register-user'),
-  registerAdmin: require('./register-admin')
+  registerAdmin: require('./register-admin'),
+  registerUserByEmail: require('./register-user-by-email')
 }

uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/register/register-user-by-email.js

+const {
+  postRegister,
+  preRegisterWithPassword
+} = require('../../lib/utils/register')
+const {
+  verifyCaptcha
+} = require('../../lib/utils/captcha')
+const {
+  CAPTCHA_SCENE,
+  EMAIL_SCENE,
+  LOG_TYPE
+} = require('../../common/constants')
+const {
+  verifyEmailCode
+} = require('../../lib/utils/verify-code')
+
+/**
+ * 通过邮箱+验证码注册普通用户
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#register-user-by-email
+ * @param {Object} params
+ * @param {String} params.email    邮箱
+ * @param {String} params.password      密码
+ * @param {String} params.nickname    昵称
+ * @param {String} params.code  邮箱验证码
+ * @param {String} params.inviteCode  邀请码
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    email: 'email',
+    password: 'password',
+    nickname: {
+      required: false,
+      type: 'nickname'
+    },
+	code: 'string',
+    inviteCode: {
+      required: false,
+      type: 'string'
+    }
+  }
+  this.middleware.validate(params, schema)
+  const {
+    email,
+    password,
+    nickname,
+    code,
+	inviteCode
+  } = params
+  
+  try {
+    // 验证邮箱验证码，验证不通过时写入失败日志
+    await verifyEmailCode({
+      email,
+      code,
+      scene: EMAIL_SCENE.REGISTER
+    })
+  } catch (error) {
+    await this.middleware.uniIdLog({
+      data: {
+        email
+      },
+      type: LOG_TYPE.REGISTER,
+      success: false
+    })
+    throw error
+  }
+  
+  const {
+    user,
+    extraData
+  } = await preRegisterWithPassword.call(this, {
+    user: {
+      email
+    },
+    password
+  })
+  return postRegister.call(this, {
+    user,
+    extraData: {
+      ...extraData,
+      nickname,
+	  email_confirmed: 1
+    },
+    inviteCode
+  })
+}

uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/send-email-code.js

+const {
+  verifyCaptcha
+} = require('../../lib/utils/captcha')
+const {
+  EMAIL_SCENE
+} = require('../../common/constants')
+const {
+  ERROR
+} = require('../../common/error')
 /**
  * 发送邮箱验证码，可用于登录、注册、绑定邮箱、修改密码等操作
  * @tutorial
  * @param {Object} params
  * @param {String} params.email     邮箱
+ * @param {String} params.captcha   图形验证码
  * @param {String} params.scene     使用场景
  * @returns
  */
 module.exports = async function (params = {}) {
-  // 此接口暂未实现，欢迎向我们提交pr
-  throw new Error('api[sendEmailCode] is not yet implemented')
+  const schema = {
+    email: 'email',
+    captcha: 'string',
+    scene: 'string'
+  }
+  this.middleware.validate(params, schema)
+  
+  const {
+    email,
+    captcha,
+    scene
+  } = params
+  
+  if (!(Object.values(EMAIL_SCENE).includes(scene))) {
+    throw {
+      errCode: ERROR.INVALID_PARAM
+    }
+  }
+  
+  await verifyCaptcha.call(this, {
+    scene: 'send-email-code',
+    captcha
+  })
+  
+  // -- 测试代码
+  require('../../lib/utils/verify-code')
+    .setEmailVerifyCode.call(this, {
+      email,
+      code: '123456',
+      expiresIn: 180,
+      scene
+    })
+  return {
+    errCode: 'uni-id-invalid-mail-template',
+    errMsg: `已启动测试模式，直接使用：123456作为邮箱验证码即可。\n如果是正式项目，需自行实现发送邮件的相关功能`
+  }
+  // -- 测试代码
+  
+  
+  //发送邮件--需自行实现
 }