@kne/fastify-account 1.0.0-alpha.8 → 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.7"
+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.7</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-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 }) => {
+  const addTenantUser = async ({ tenantId, roleIds, orgIds, userId, ...tenantUser }) => {
     const tenant = await services.tenant.getTenant({ id: tenantId });
 
     const currentAccountNumber = await models.tenantUser.count({
@@ -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();

package/package.json

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