@kne/fastify-account 1.0.0-alpha.5 → 1.0.0-alpha.7

package/README.md

@@ -22,7 +22,7 @@ npm i --save @kne/fastify-account
 ### API
 
 ---
-title: "@kne/fastify-account v1.0.0-alpha.4"
+title: "@kne/fastify-account v1.0.0-alpha.6"
 language_tabs:
   - shell: Shell
   - http: HTTP
@@ -42,7 +42,7 @@ headingLevel: 2
 
 <!-- Generator: Widdershins v4.0.1 -->
 
-<h1 id="-kne-fastify-account">@kne/fastify-account v1.0.0-alpha.4</h1>
+<h1 id="-kne-fastify-account">@kne/fastify-account v1.0.0-alpha.6</h1>
 
 > Scroll down for code samples, example requests and responses. Select a language for code samples from the tabs above or the mobile navigation menu.
 

package/libs/controllers/admin.js

@@ -34,7 +34,7 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const userInfo = request.body;
-      await services.admin.addUser(Object.assign({}, userInfo, { password: options.defaultPassword }));
+      await services.admin.addUser(Object.assign({}, userInfo, { password: services.account.md5(options.defaultPassword) }));
       return {};
     }
   );

package/libs/services/account.js

@@ -1,6 +1,7 @@
 const fp = require('fastify-plugin');
 const dayjs = require('dayjs');
 const bcrypt = require('bcryptjs');
+const crypto = require('crypto');
 
 function generateRandom6DigitNumber() {
   const randomNumber = Math.random() * 1000000;
@@ -76,6 +77,12 @@ module.exports = fp(async (fastify, options) => {
     };
   };
 
+  const md5 = value => {
+    const hash = crypto.createHash('md5');
+    hash.update(value);
+    return hash.digest('hex');
+  };
+
   const resetPassword = async ({ userId, password }) => {
     const userInfo = await models.user.findOne({
       where: { uuid: userId }
@@ -198,6 +205,7 @@ module.exports = fp(async (fastify, options) => {
   };
 
   services.account = {
+    md5,
     login,
     register,
     sendEmailCode,

package/libs/services/tenant-user.js

@@ -46,16 +46,12 @@ module.exports = fp(async (fastify, options) => {
       const output = [];
       const core = (list, node) => {
         const { children, other } = groupBy(list, item => (item.pid === node.id ? 'children' : 'other'));
-        if (!(other && other.length > 0)) {
-          return;
-        }
         if (!(children && children.length > 0)) {
           node.id !== 0 && output.push(node);
           return;
         }
-
         children.forEach(node => {
-          core(other, node);
+          core(other || [], node);
         });
         return output;
       };
@@ -261,7 +257,7 @@ module.exports = fp(async (fastify, options) => {
     }
   };
 
-  const addTenantUser = async ({ tenantId, roleIds, orgIds, userId, ...tenantUser }) => {
+  const addTenantUser = async ({ tenantId, roleIds, orgIds, userId, ...tenantUser }, transaction) => {
     const tenant = await services.tenant.getTenant({ id: tenantId });
 
     const currentAccountNumber = await models.tenantUser.count({
@@ -274,7 +270,7 @@ module.exports = fp(async (fastify, options) => {
 
     await checkTenantUserInfoValidate({ tenantId, roleIds, orgIds, userId });
 
-    const t = await fastify.sequelize.instance.transaction();
+    const t = transaction || (await fastify.sequelize.instance.transaction());
 
     if (
       (await models.tenantUser.count({
@@ -323,9 +319,9 @@ module.exports = fp(async (fastify, options) => {
         { transaction: t }
       );
 
-      await t.commit();
+      !transaction && (await t.commit());
     } catch (e) {
-      await t.rollback();
+      !transaction && (await t.rollback());
       throw e;
     }
   };
@@ -470,6 +466,69 @@ module.exports = fp(async (fastify, options) => {
     };
   };
 
+  const includeTenantUserBatch = async ({ tenantId, list }) => {
+    await services.tenant.getTenant({ id: tenantId });
+    const errors = [],
+      successes = [];
+    for (let current of list) {
+      if (!(current.phone || current.email)) {
+        errors.push({ item: current, msg: '电话和邮箱不能同时为空' });
+        continue;
+      }
+      const currentQuery = [];
+      if (current.phone) {
+        currentQuery.push({ phone: current.phone });
+      }
+      if (current.email) {
+        currentQuery.push({ email: current.email });
+      }
+
+      if (
+        (await models.tenantUser.count({
+          where: {
+            [Op.or]: currentQuery
+          }
+        })) > 0
+      ) {
+        errors.push({ item: current, msg: '租户用户已经存在，或手机邮箱和已有租户用户重复' });
+        continue;
+      }
+      const t = await fastify.sequelize.instance.transaction();
+      try {
+        if (await services.user.accountIsExists(current, {})) {
+          errors.push({ item: current, msg: '用户已经存在，已发送加入租户邀请等待对方同意' });
+          continue;
+        }
+
+        const user = await services.user.addUser(
+          {
+            nickname: current.name,
+            phone: current.phone,
+            email: current.email,
+            password: services.account.md5(current.password || options.defaultPassword),
+            status: 1
+          },
+          { transaction: t }
+        );
+        await services.tenantUser.addTenantUser(
+          {
+            tenantId,
+            userId: user.id,
+            ...current
+          },
+          { transaction: t }
+        );
+        successes.push({ item: current });
+        await t.commit();
+      } catch (e) {
+        await t.rollback();
+        errors.push({ item: current, msg: e.message });
+      }
+    }
+
+    return { errors, successes };
+  };
+
   services.tenantUser = {
     getUserTenant,
     getTenantUserPermissionList,
@@ -481,6 +540,7 @@ module.exports = fp(async (fastify, options) => {
     deleteTenantUser,
     closeTenantUser,
     openTenantUser,
-    getTenantUserList
+    getTenantUserList,
+    includeTenantUserBatch
   };
 });

package/libs/services/user.js

@@ -54,7 +54,7 @@ module.exports = fp(async (fastify, options) => {
     );
   };
 
-  const addUser = async ({ avatar, nickname, gender, birthday, description, phone, email, password, status }) => {
+  const addUser = async ({ avatar, nickname, gender, birthday, description, phone, email, password, status }, transaction) => {
     if ((await accountIsExists({ phone, email })) > 0) {
       throw new Error('手机号或者邮箱都不能重复');
     }
@@ -62,18 +62,21 @@ module.exports = fp(async (fastify, options) => {
       throw new Error('密码不能为空');
     }
     const account = await models.userAccount.create(await services.account.passwordEncryption(password));
-    const user = await models.user.create({
-      avatar,
-      nickname,
-      gender,
-      birthday,
-      description,
-      phone,
-      email,
-      status,
-      userAccountId: account.uuid
-    });
-    await account.update({ belongToUserId: user.uuid });
+    const user = await models.user.create(
+      {
+        avatar,
+        nickname,
+        gender,
+        birthday,
+        description,
+        phone,
+        email,
+        status,
+        userAccountId: account.uuid
+      },
+      { transaction }
+    );
+    await account.update({ belongToUserId: user.uuid }, { transaction });
 
     return Object.assign({}, user.get({ pain: true }), { id: user.uuid });
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kne/fastify-account",
-  "version": "1.0.0-alpha.5",
+  "version": "1.0.0-alpha.7",
   "description": "fastify的用户管理账号等实现",
   "main": "index.js",
   "scripts": {