Merge branch 'uniId' into dev

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

@@ -18,7 +18,8 @@ const {
   registerUser
 } = require('./module/register/index')
 const {
-  addUser
+  addUser,
+    updateUser
 } = require('./module/admin/index')
 const {
   login,
@@ -216,6 +217,23 @@ module.exports = {
    * @returns
    */
   addUser,
+  /**
+   * 修改用户
+   * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#update-user
+   * @param {Object}  params
+   * @param {String} params.id              要更新的用户id
+   * @param {String}  params.username       用户名
+   * @param {String}  params.password       密码
+   * @param {String}  params.nickname       昵称
+   * @param {Array}   params.authorizedApp  允许登录的AppID列表
+   * @param {Array}   params.role           用户角色列表
+   * @param {String} params.mobile          手机号
+   * @param {String} params.email           邮箱
+   * @param {Array}  params.tags            用户标签
+   * @param {Number} params.status          用户状态
+   * @returns
+   */
+  updateUser,
   /**
    * 授权用户登录应用
    * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#authorize-app-login
@@ -490,4 +508,4 @@ module.exports = {
    * @returns
    */
   getSupportedLoginType
-}
+}

uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/admin/add-user.js

@@ -18,6 +18,10 @@ const PasswordUtils = require('../../lib/utils/password')
  * @param {String}  params.nickname       昵称
  * @param {Array}   params.authorizedApp  允许登录的AppID列表
  * @param {Array}   params.role           用户角色列表
+ * @param {String} params.mobile          手机号
+ * @param {String} params.email           邮箱
+ * @param {Array}  params.tags            用户标签
+ * @param {Number} params.status          用户状态
  * @returns
  */
 module.exports = async function (params = {}) {
@@ -35,6 +39,22 @@ module.exports = async function (params = {}) {
     role: {
       require: false,
       type: 'array<string>'
+    },
+    mobile: {
+      required: false,
+      type: 'mobile'
+    },
+    email: {
+      required: false,
+      type: 'email'
+    },
+    tags: {
+      required: false,
+      type: 'array<string>'
+    },
+    status: {
+      required: false,
+      type: 'number'
     }
   }
   this.middleware.validate(params, schema)
@@ -43,7 +63,11 @@ module.exports = async function (params = {}) {
     password,
     authorizedApp,
     nickname,
-    role
+    role,
+    mobile,
+    email,
+    tags,
+    status
   } = params
   const userMatched = await findUser({
     userQuery: {
@@ -72,7 +96,11 @@ module.exports = async function (params = {}) {
     password_secret_version: version,
     dcloud_appid: authorizedApp || [],
     nickname,
-    role: role || []
+    role: role || [],
+    mobile,
+    email,
+    tags: tags || [],
+    status
   })
 
   return {

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

 module.exports = {
-  addUser: require('./add-user')
+  addUser: require('./add-user'),
+  updateUser: require('./update-user')
 }

uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/admin/update-user.js

+const {
+  findUser
+} = require('../../lib/utils/account')
+const {
+  ERROR
+} = require('../../common/error')
+const {
+  userCollection
+} = require('../../common/constants')
+const PasswordUtils = require('../../lib/utils/password')
+
+/**
+ * 修改用户
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#update-user
+ * @param {Object}  params
+ * @param {String} params.id              要更新的用户id
+ * @param {String}  params.username       用户名
+ * @param {String}  params.password       密码
+ * @param {String}  params.nickname       昵称
+ * @param {Array}   params.authorizedApp  允许登录的AppID列表
+ * @param {Array}   params.role           用户角色列表
+ * @param {String} params.mobile          手机号
+ * @param {String} params.email           邮箱
+ * @param {Array}  params.tags            用户标签
+ * @param {Number} params.status          用户状态
+ * @returns
+ */
+module.exports = async function (params = {}) {
+  const schema = {
+    username: 'username',
+    password: {
+      required: false,
+      type: 'password'
+    },
+    authorizedApp: {
+      required: false,
+      type: 'array<string>'
+    }, // 指定允许登录的app，传空数组或不传时表示可以不可以在任何端登录
+    nickname: {
+      required: false,
+      type: 'nickname'
+    },
+    role: {
+      require: false,
+      type: 'array<string>'
+    },
+    mobile: {
+      required: false,
+      type: 'mobile'
+    },
+    email: {
+      required: false,
+      type: 'email'
+    },
+    tags: {
+      required: false,
+      type: 'array<string>'
+    },
+    status: {
+      required: false,
+      type: 'number'
+    }
+  }
+
+  this.middleware.validate(params, schema)
+
+  const {
+    id,
+    username,
+    password,
+    authorizedApp,
+    nickname,
+    role,
+    mobile,
+    email,
+    tags,
+    status
+  } = params
+
+  // 更新的用户数据字段
+  const collection = {
+    username,
+    dcloud_appid: authorizedApp || [],
+    nickname,
+    role: role || [],
+    mobile,
+    email,
+    tags: tags || [],
+    status
+  }
+
+  // 更新用户名时验证用户名是否重新
+  if (username) {
+    const userMatched = await findUser({
+      userQuery: {
+        username
+      },
+      authorizedApp
+    })
+    if (userMatched.filter(user => user._id !== id).length) {
+      throw {
+        errCode: ERROR.ACCOUNT_EXISTS
+      }
+    }
+  }
+
+  if (password) {
+    const passwordUtils = new PasswordUtils({
+      passwordSecret: this.config.passwordSecret
+    })
+    const {
+      passwordHash,
+      version
+    } = passwordUtils.generatePasswordHash({
+      password
+    })
+
+    collection.passwordHash = passwordHash
+    collection.password = password
+  }
+
+  await userCollection.where({_id: id}).update(collection)
+
+  return {
+    errCode: 0
+  }
+}