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

package/README.md

@@ -22,7 +22,7 @@ npm i --save @kne/fastify-account
 ### API
 
 ---
-title: "@kne/fastify-account v1.0.0-alpha.6"
+title: "@kne/fastify-account v1.0.0-alpha.8"
 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.6</h1>
+<h1 id="-kne-fastify-account">@kne/fastify-account v1.0.0-alpha.8</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/index.js

@@ -2,6 +2,7 @@ const fp = require('fastify-plugin');
 const packageJson = require('./package.json');
 const path = require('path');
 const merge = require('lodash/merge');
+const { Unauthorized } = require('http-errors');
 
 module.exports = fp(
   async function (fastify, options) {
@@ -46,7 +47,9 @@ module.exports = fp(
               request.tenantInfo = await fastify.account.services.tenantUser.getTenantUserByUserId(request.userInfo);
             },
             admin: async request => {
-              request.adminInfo = await fastify.account.services.admin.checkSuperAdmin(request.userInfo);
+              if (!(await fastify.account.services.admin.checkIsSuperAdmin(request.userInfo))) {
+                throw Unauthorized('不能执行该操作，需要超级管理员权限');
+              }
             }
           }
         ]

package/libs/services/admin.js

@@ -17,17 +17,15 @@ module.exports = fp(async (fastify, options) => {
     });
   };
 
-  const checkSuperAdmin = async user => {
-    if (
+  const checkIsSuperAdmin = async user => {
+    return (
       (await models.adminRole.count({
         where: {
           userId: user.id,
           role: ROLE['SuperAdmin']
         }
       })) === 0
-    ) {
-      throw new Error('不能执行该操作，需要超级管理员权限');
-    }
+    );
   };
 
   const addUser = async ({ avatar, nickname, phone, email, password, description }) => {
@@ -72,7 +70,7 @@ module.exports = fp(async (fastify, options) => {
   services.admin = {
     initSuperAdmin,
     setSuperAdmin,
-    checkSuperAdmin,
+    checkIsSuperAdmin,
     generateTenantAdminVerifyCode,
     verifyTenantAdmin,
     addUser,

package/libs/services/tenant-org.js

@@ -74,11 +74,24 @@ module.exports = fp(async (fastify, options) => {
     return data.map(item => item.get({ plain: true }));
   };
 
+  const getTenantOrgRoot = async ({ tenantId }) => {
+    const data = await models.tenantOrg.findOne({
+      where: { tenantId, pid: 0 }
+    });
+
+    if (!data) {
+      throw new Error('该租户不存在根节点');
+    }
+
+    return data.get({ plain: true });
+  };
+
   services.tenantOrg = {
     getTenantOrgInstance,
     addTenantOrg,
     saveTenantOrg,
     deleteTenantOrg,
-    getTenantOrgList
+    getTenantOrgList,
+    getTenantOrgRoot
   };
 });

package/libs/services/tenant-user.js

@@ -213,6 +213,7 @@ module.exports = fp(async (fastify, options) => {
   const checkTenantUserInfoValidate = async ({ tenantId, roleIds, orgIds, userId }) => {
     await services.tenant.getTenant({ id: tenantId });
     if (
+      roleIds &&
       roleIds.length > 0 &&
       (await models.tenantRole.count({
         where: {
@@ -224,7 +225,7 @@ module.exports = fp(async (fastify, options) => {
     ) {
       throw new Error('包含租户不存在的角色');
     }
-    if (orgIds.length === 0) {
+    if (orgIds && orgIds.length === 0) {
       const tenantOrg = await models.tenantOrg.findOne({
         where: {
           pid: 0,
@@ -234,10 +235,11 @@ module.exports = fp(async (fastify, options) => {
       if (!tenantOrg) {
         throw new Error('租户根节点不存在');
       }
-      orgIds = [tenantOrg.id];
     }
 
     if (
+      orgIds &&
+      orgIds.length > 0 &&
       (await models.tenantOrg.count({
         where: {
           tenantId,
@@ -257,7 +259,7 @@ module.exports = fp(async (fastify, options) => {
     }
   };
 
-  const addTenantUser = async ({ tenantId, roleIds, orgIds, userId, ...tenantUser }, transaction) => {
+  const addTenantUser = async ({ tenantId, roleIds, orgIds, userId, ...tenantUser }) => {
     const tenant = await services.tenant.getTenant({ id: tenantId });
 
     const currentAccountNumber = await models.tenantUser.count({
@@ -270,7 +272,7 @@ module.exports = fp(async (fastify, options) => {
 
     await checkTenantUserInfoValidate({ tenantId, roleIds, orgIds, userId });
 
-    const t = transaction || (await fastify.sequelize.instance.transaction());
+    const t = await fastify.sequelize.instance.transaction();
 
     if (
       (await models.tenantUser.count({
@@ -319,9 +321,9 @@ module.exports = fp(async (fastify, options) => {
         { transaction: t }
       );
 
-      !transaction && (await t.commit());
+      await t.commit();
     } catch (e) {
-      !transaction && (await t.rollback());
+      await t.rollback();
       throw e;
     }
   };
@@ -363,43 +365,47 @@ module.exports = fp(async (fastify, options) => {
       });
       await currentTenantUser.save({ transaction: t });
       // 修改角色
-      const needDeleteTenantRole = tenantRoleIds.filter(targetId => roleIds.indexOf(targetId) === -1);
-      const needAddTenantRole = roleIds.filter(targetId => tenantRoleIds.indexOf(targetId) === -1);
-      await models.tenantUserRole.destroy({
-        where: {
-          tenantId,
-          tenantUserId: currentTenantUser.uuid,
-          tenantRoleId: {
-            [Op.in]: needDeleteTenantRole
-          }
-        },
-        transaction: t
-      });
-      await models.tenantUserRole.bulkCreate(
-        needAddTenantRole.map(tenantRoleId => {
-          return { tenantId, tenantUserId: currentTenantUser.uuid, tenantRoleId };
-        }),
-        { transaction: t }
-      );
+      if (roleIds) {
+        const needDeleteTenantRole = tenantRoleIds.filter(targetId => roleIds.indexOf(targetId) === -1);
+        const needAddTenantRole = roleIds.filter(targetId => tenantRoleIds.indexOf(targetId) === -1);
+        await models.tenantUserRole.destroy({
+          where: {
+            tenantId,
+            tenantUserId: currentTenantUser.uuid,
+            tenantRoleId: {
+              [Op.in]: needDeleteTenantRole
+            }
+          },
+          transaction: t
+        });
+        await models.tenantUserRole.bulkCreate(
+          needAddTenantRole.map(tenantRoleId => {
+            return { tenantId, tenantUserId: currentTenantUser.uuid, tenantRoleId };
+          }),
+          { transaction: t }
+        );
+      }
       //修改组织
-      const needDeleteTenantOrg = tenantOrgIds.filter(targetId => orgIds.indexOf(targetId) === -1);
-      const needAddTenantOrg = orgIds.filter(targetId => tenantOrgIds.indexOf(targetId) === -1);
-      await models.tenantUserOrg.destroy({
-        where: {
-          tenantId,
-          tenantUserId: currentTenantUser.uuid,
-          tenantOrgId: {
-            [Op.in]: needDeleteTenantOrg
-          }
-        },
-        transaction: t
-      });
-      await models.tenantUserOrg.bulkCreate(
-        needAddTenantOrg.map(tenantOrgId => {
-          return { tenantId, tenantUserId: currentTenantUser.uuid, tenantOrgId };
-        }),
-        { transaction: t }
-      );
+      if (orgIds) {
+        const needDeleteTenantOrg = tenantOrgIds.filter(targetId => orgIds.indexOf(targetId) === -1);
+        const needAddTenantOrg = orgIds.filter(targetId => tenantOrgIds.indexOf(targetId) === -1);
+        await models.tenantUserOrg.destroy({
+          where: {
+            tenantId,
+            tenantUserId: currentTenantUser.uuid,
+            tenantOrgId: {
+              [Op.in]: needDeleteTenantOrg
+            }
+          },
+          transaction: t
+        });
+        await models.tenantUserOrg.bulkCreate(
+          needAddTenantOrg.map(tenantOrgId => {
+            return { tenantId, tenantUserId: currentTenantUser.uuid, tenantOrgId };
+          }),
+          { transaction: t }
+        );
+      }
       await t.commit();
     } catch (e) {
       await t.rollback();
@@ -493,36 +499,39 @@ module.exports = fp(async (fastify, options) => {
         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 }
-        );
+      if (await services.user.accountIsExists(current, {})) {
+        errors.push({ item: current, msg: '用户已经存在，已发送加入租户邀请等待对方同意' });
+        continue;
+      }
+
+      try {
+        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
+        });
+        const rootOrg = await services.tenantOrg.getTenantOrgRoot({ tenantId });
         await services.tenantUser.addTenantUser(
-          {
-            tenantId,
-            userId: user.id,
-            ...current
-          },
-          { transaction: t }
+          Object.assign(
+            {},
+            {
+              orgIds: [rootOrg.id],
+              roleIds: []
+            },
+            {
+              tenantId,
+              userId: user.id,
+              ...current
+            }
+          )
         );
         successes.push({ item: current });
-        await t.commit();
       } catch (e) {
-        await t.rollback();
         errors.push({ item: current, msg: e.message });
+        throw e;
       }
     }
 

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 }, transaction) => {
+  const addUser = async ({ avatar, nickname, gender, birthday, description, phone, email, password, status }) => {
     if ((await accountIsExists({ phone, email })) > 0) {
       throw new Error('手机号或者邮箱都不能重复');
     }
@@ -62,21 +62,18 @@ 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
-      },
-      { transaction }
-    );
-    await account.update({ belongToUserId: user.uuid }, { transaction });
+    const user = await models.user.create({
+      avatar,
+      nickname,
+      gender,
+      birthday,
+      description,
+      phone,
+      email,
+      status,
+      userAccountId: account.uuid
+    });
+    await account.update({ belongToUserId: user.uuid });
 
     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.7",
+  "version": "1.0.0-alpha.9",
   "description": "fastify的用户管理账号等实现",
   "main": "index.js",
   "scripts": {