@kne/fastify-account 1.0.0-alpha.14 → 1.0.0-alpha.15

package/index.js

@@ -2,7 +2,8 @@ const fp = require('fastify-plugin');
 const packageJson = require('./package.json');
 const path = require('path');
 const merge = require('lodash/merge');
-const { Unauthorized } = require('http-errors');
+const get = require('lodash/get');
+const { Unauthorized, Forbidden } = require('http-errors');
 
 module.exports = fp(
   async function (fastify, options) {
@@ -13,7 +14,8 @@ module.exports = fp(
         dbTableNamePrefix: 't_account_',
         isTest: false,
         jwt: {
-          secret: 'super-secret'
+          secret: 'super-secret',
+          expires: null
         },
         defaultPassword: 'Aa000000!'
       },
@@ -39,7 +41,9 @@ module.exports = fp(
             user: async request => {
               const info = await request.jwtVerify();
               //这里判断失效时间
-              //info.iat
+              if (options.jwt.expires && Date.now() - info.iat * 1000 > options.jwt.expires) {
+                throw Unauthorized('身份认证超时');
+              }
               request.authenticatePayload = info.payload;
               request.userInfo = await fastify.account.services.user.getUser(request.authenticatePayload);
             },
@@ -50,6 +54,15 @@ module.exports = fp(
               if (!(await fastify.account.services.admin.checkIsSuperAdmin(request.userInfo))) {
                 throw Unauthorized('不能执行该操作，需要超级管理员权限');
               }
+            },
+            createPermission: permission => async request => {
+              const permissions = get(request.tenantInfo, 'tenantUser.permissions');
+              if (!permissions) {
+                throw Forbidden('未获取到权限信息');
+              }
+              if (!(permission && permissions.indexOf(permission) > -1)) {
+                throw Forbidden('用户没有权限执行该操作');
+              }
             }
           }
         ]

package/libs/controllers/admin.js

@@ -88,6 +88,8 @@ module.exports = fp(async (fastify, options) => {
     {
       onRequest: [authenticate.user, authenticate.admin],
       schema: {
+        tags: ['管理后台'],
+        summary: '添加用户',
         body: {}
       }
     },
@@ -103,6 +105,8 @@ module.exports = fp(async (fastify, options) => {
     {
       onRequest: [authenticate.user, authenticate.admin],
       schema: {
+        tags: ['管理后台'],
+        summary: '获取用户列表',
         query: {
           perPage: { type: 'number' },
           currentPage: { type: 'number' }
@@ -130,6 +134,8 @@ module.exports = fp(async (fastify, options) => {
     {
       onRequest: [authenticate.user, authenticate.admin],
       schema: {
+        tags: ['管理后台'],
+        summary: '重置用户账号密码',
         body: {
           type: 'object',
           required: ['userId', 'password'],
@@ -151,6 +157,8 @@ module.exports = fp(async (fastify, options) => {
     {
       onRequest: [authenticate.user, authenticate.admin],
       schema: {
+        tags: ['管理后台'],
+        summary: '修改用户信息',
         body: {
           type: 'object',
           required: ['id'],
@@ -177,6 +185,8 @@ module.exports = fp(async (fastify, options) => {
     {
       onRequest: [authenticate.user, authenticate.admin],
       schema: {
+        tags: ['管理后台'],
+        summary: '关闭用户',
         body: {
           type: 'object',
           required: ['id'],
@@ -198,6 +208,8 @@ module.exports = fp(async (fastify, options) => {
     {
       onRequest: [authenticate.user, authenticate.admin],
       schema: {
+        tags: ['管理后台'],
+        summary: '将用户设置为正常',
         body: {
           type: 'object',
           required: ['id'],

package/libs/controllers/adminPermission.js

@@ -33,6 +33,8 @@ module.exports = fp(async (fastify, options) => {
     {
       onRequest: [authenticate.user, authenticate.admin],
       schema: {
+        tags: ['管理后台-权限'],
+        summary: '修改应用',
         body: {
           type: 'object',
           required: ['id', 'name', 'code'],
@@ -58,6 +60,8 @@ module.exports = fp(async (fastify, options) => {
     {
       onRequest: [authenticate.user, authenticate.admin],
       schema: {
+        tags: ['管理后台-权限'],
+        summary: '删除应用',
         body: {
           type: 'object',
           required: ['id'],
@@ -79,6 +83,8 @@ module.exports = fp(async (fastify, options) => {
     {
       onRequest: [authenticate.user, authenticate.admin],
       schema: {
+        tags: ['管理后台-权限'],
+        summary: '获取应用列表',
         query: {
           type: 'object',
           properties: {
@@ -98,6 +104,8 @@ module.exports = fp(async (fastify, options) => {
     {
       onRequest: [authenticate.user, authenticate.admin],
       schema: {
+        tags: ['管理后台-权限'],
+        summary: '添加应用权限',
         body: {
           type: 'object',
           required: ['applicationId', 'name', 'code'],
@@ -125,6 +133,8 @@ module.exports = fp(async (fastify, options) => {
     {
       onRequest: [authenticate.user, authenticate.admin],
       schema: {
+        tags: ['管理后台-权限'],
+        summary: '获取应用权限列表',
         query: {
           type: 'object',
           required: ['applicationId'],
@@ -132,6 +142,35 @@ module.exports = fp(async (fastify, options) => {
             applicationId: { type: 'string' },
             tenantId: { type: 'string' }
           }
+        },
+        response: {
+          200: {
+            content: {
+              'application/json': {
+                schema: {
+                  type: 'array',
+                  items: {
+                    type: 'object',
+                    properties: {
+                      id: { type: 'number' },
+                      code: { type: 'string' },
+                      name: { type: 'string' },
+                      isModule: { type: 'number' },
+                      isMust: { type: 'number' },
+                      type: { type: 'number' },
+                      pid: { type: 'number' },
+                      paths: { type: 'array', items: { type: 'number' } },
+                      description: { type: 'string' },
+                      status: { type: 'number' },
+                      createdAt: { type: 'string' },
+                      updatedAt: { type: 'string' },
+                      deletedAt: { type: 'string' }
+                    }
+                  }
+                }
+              }
+            }
+          }
         }
       }
     },
@@ -141,11 +180,83 @@ module.exports = fp(async (fastify, options) => {
     }
   );
 
+  fastify.post(`${options.prefix}/admin/parsePermissionList`, {}, async request => {
+    const file = await request.file();
+    if (!file) {
+      throw new Error('不能获取到上传文件');
+    }
+
+    return await services.permission.parsePermissionListJSON({ file });
+  });
+
+  fastify.post(
+    `${options.prefix}/admin/exportPermissionList`,
+    {
+      onRequest: [authenticate.user, authenticate.admin],
+      schema: {
+        tags: ['管理后台-权限'],
+        summary: '导出应用权限列表',
+        body: {
+          type: 'object',
+          required: ['applicationIds'],
+          properties: {
+            applicationIds: { type: 'array', items: { type: 'string' } },
+            tenantId: { type: 'string' }
+          }
+        },
+        response: {
+          200: {
+            content: {
+              'application/json': {
+                schema: {
+                  type: 'array',
+                  items: {
+                    type: 'object',
+                    properties: {
+                      code: { type: 'string' },
+                      name: { type: 'string' },
+                      url: { type: 'string' },
+                      description: { type: 'string' },
+                      status: { type: 'number' },
+                      permissions: {
+                        type: 'array',
+                        items: {
+                          type: 'object',
+                          properties: {
+                            id: { type: 'number' },
+                            code: { type: 'string' },
+                            name: { type: 'string' },
+                            isModule: { type: 'number' },
+                            isMust: { type: 'number' },
+                            type: { type: 'number' },
+                            pid: { type: 'number' },
+                            description: { type: 'string' },
+                            status: { type: 'number' }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    async request => {
+      const { applicationIds, tenantId } = request.body;
+      return await services.permission.exportPermissionList({ applicationIds, tenantId });
+    }
+  );
+
   fastify.post(
     `${options.prefix}/admin/deletePermission`,
     {
       onRequest: [authenticate.user, authenticate.admin],
       schema: {
+        tags: ['管理后台-权限'],
+        summary: '删除应用权限',
         body: {
           type: 'object',
           required: ['id'],
@@ -169,6 +280,8 @@ module.exports = fp(async (fastify, options) => {
     {
       onRequest: [authenticate.user, authenticate.admin],
       schema: {
+        tags: ['管理后台-权限'],
+        summary: '修改应用权限',
         body: {
           type: 'object',
           required: ['id'],
@@ -188,11 +301,35 @@ module.exports = fp(async (fastify, options) => {
     }
   );
 
+  fastify.get(
+    `${options.prefix}/admin/getTenantPermissionList`,
+    {
+      onRequest: [authenticate.user, authenticate.admin],
+      schema: {
+        tags: ['管理后台-权限'],
+        summary: '获取租户应用权限配置',
+        query: {
+          type: 'object',
+          required: ['tenantId'],
+          properties: {
+            tenantId: { type: 'string' }
+          }
+        }
+      }
+    },
+    async request => {
+      const { tenantId } = request.query;
+      return await services.permission.getTenantPermissionList({ tenantId });
+    }
+  );
+
   fastify.post(
     `${options.prefix}/admin/saveTenantPermissionList`,
     {
       onRequest: [authenticate.user, authenticate.admin],
       schema: {
+        tags: ['管理后台-权限'],
+        summary: '修改租户应用权限配置',
         body: {
           type: 'object',
           required: ['tenantId', 'applications', 'permissions'],
@@ -216,24 +353,4 @@ module.exports = fp(async (fastify, options) => {
       return {};
     }
   );
-
-  fastify.get(
-    `${options.prefix}/admin/getTenantPermissionList`,
-    {
-      onRequest: [authenticate.user, authenticate.admin],
-      schema: {
-        query: {
-          type: 'object',
-          required: ['tenantId'],
-          properties: {
-            tenantId: { type: 'string' }
-          }
-        }
-      }
-    },
-    async request => {
-      const { tenantId } = request.query;
-      return await services.permission.getTenantPermissionList({ tenantId });
-    }
-  );
 });

package/libs/services/application.js

@@ -26,6 +26,21 @@ module.exports = fp(async (fastify, options) => {
     });
   };
 
+  const getApplicationByCode = async ({ code }) => {
+    const application = await models.application.findOne({
+      where: {
+        code
+      }
+    });
+    if (application) {
+      await getApplicationInstance({ id: application.uuid });
+      return Object.assign({}, application.get({ plain: true }), {
+        id: application.uuid
+      });
+    }
+    return null;
+  };
+
   const addApplication = async application => {
     const currentApplication = await models.application.create(application);
     return Object.assign({}, currentApplication.get({ plain: true }), {
@@ -143,6 +158,7 @@ module.exports = fp(async (fastify, options) => {
   services.application = {
     addApplication,
     getApplication,
+    getApplicationByCode,
     saveApplication,
     deleteApplication,
     getApplicationList,

package/libs/services/permission.js

@@ -1,8 +1,12 @@
 const fp = require('fastify-plugin');
 const isNil = require('lodash/isNil');
+const get = require('lodash/get');
+const groupBy = require('lodash/groupBy');
+
+const uniq = require('lodash/uniq');
 module.exports = fp(async (fastify, options) => {
   const { models, services } = fastify.account;
-
+  const { Op } = fastify.sequelize.Sequelize;
   const addPermission = async ({ applicationId, pid, code, name, type, isModule, isMust, description }) => {
     if (!(await services.application.getApplication({ id: applicationId }))) {
       throw new Error('应用不存在');
@@ -47,10 +51,10 @@ module.exports = fp(async (fastify, options) => {
       const tenantPermissions = await models.tenantPermission.findAll({
         where: { tenantId }
       });
-      query[fastify.sequelize.Sequelize.Op.or] = [
+      query[Op.or] = [
         {
           id: {
-            [fastify.sequelize.Sequelize.Op.in]: tenantPermissions.map(({ permissionId }) => permissionId)
+            [Op.in]: tenantPermissions.map(({ permissionId }) => permissionId)
           }
         },
         { isMust: 1 }
@@ -64,6 +68,57 @@ module.exports = fp(async (fastify, options) => {
     });
   };
 
+  const parsePermissionListJSON = async ({ file }) => {
+    const data = JSON.parse(await file.toBuffer());
+    await Promise.all(
+      data.map(async application => {
+        const { permissions, ...other } = application;
+        const app = await services.application.getApplicationByCode({ code: application.code });
+
+        if (!app) {
+          const newApplication = await services.application.addApplication(other);
+          const permissionsPidMapping = groupBy(permissions, 'pid');
+          const addPermissions = async (pid, applicationId) =>
+            await Promise.all(
+              (get(permissionsPidMapping, pid) || []).map(async ({ id, ...permissionProps }) => {
+                const permission = await services.permission.addPermission(Object.assign({}, permissionProps, { applicationId, pid }));
+                await addPermissions(permission.id, applicationId);
+              })
+            );
+          await addPermissions(0, newApplication.uuid);
+        } else {
+          const permissionsPidMapping = groupBy(permissions, 'pid');
+          const addPermissions = async (pid, applicationId, importPid) => {
+            await Promise.all(
+              (get(permissionsPidMapping, importPid || pid) || []).map(async ({ id, ...permissionProps }) => {
+                const current = await models.permission.findOne({ where: { code: permissionProps.code, pid } });
+                if (current) {
+                  await addPermissions(current.id, applicationId, id);
+                } else {
+                  const permission = await services.permission.addPermission(Object.assign({}, permissionProps, { applicationId, pid }));
+                  await addPermissions(permission.id, applicationId);
+                }
+              })
+            );
+          };
+          await addPermissions(0, app.uuid);
+        }
+        return app;
+      })
+    );
+    return data;
+  };
+
+  const exportPermissionList = async ({ applicationIds, tenantId }) => {
+    return await Promise.all(
+      (applicationIds || []).map(async applicationId => {
+        let application = await services.application.getApplication({ id: applicationId });
+        application.permissions = await services.permission.getPermissionList({ applicationId, tenantId });
+        return application;
+      })
+    );
+  };
+
   const deletePermission = async ({ id }) => {
     const currentPermission = await models.permission.findByPk(id);
 
@@ -90,7 +145,7 @@ module.exports = fp(async (fastify, options) => {
       await models.tenantPermission.destroy({
         where: {
           permissionId: {
-            [fastify.sequelize.Sequelize.Op.in]: permissionIdList
+            [Op.in]: permissionIdList
           }
         },
         transaction: t
@@ -98,7 +153,7 @@ module.exports = fp(async (fastify, options) => {
       await models.tenantRolePermission.destroy({
         where: {
           permissionId: {
-            [fastify.sequelize.Sequelize.Op.in]: permissionIdList
+            [Op.in]: permissionIdList
           }
         },
         transaction: t
@@ -106,7 +161,7 @@ module.exports = fp(async (fastify, options) => {
       await models.permission.destroy({
         where: {
           id: {
-            [fastify.sequelize.Sequelize.Op.in]: permissionIdList
+            [Op.in]: permissionIdList
           }
         },
         transaction: t
@@ -159,7 +214,7 @@ module.exports = fp(async (fastify, options) => {
       await models.tenantRoleApplication.destroy({
         where: {
           applicationId: {
-            [fastify.sequelize.Sequelize.Op.in]: needDeleteApplications
+            [Op.in]: needDeleteApplications
           },
           tenantId
         },
@@ -169,7 +224,7 @@ module.exports = fp(async (fastify, options) => {
       await models.tenantRolePermission.destroy({
         where: {
           permissionId: {
-            [fastify.sequelize.Sequelize.Op.in]: needDeletePermissions
+            [Op.in]: needDeletePermissions
           },
           tenantId
         },
@@ -179,7 +234,7 @@ module.exports = fp(async (fastify, options) => {
       await models.tenantApplication.destroy({
         where: {
           applicationId: {
-            [fastify.sequelize.Sequelize.Op.in]: needDeleteApplications
+            [Op.in]: needDeleteApplications
           },
           tenantId
         },
@@ -189,7 +244,7 @@ module.exports = fp(async (fastify, options) => {
       await models.tenantPermission.destroy({
         where: {
           permissionId: {
-            [fastify.sequelize.Sequelize.Op.in]: needDeletePermissions
+            [Op.in]: needDeletePermissions
           },
           tenantId
         },
@@ -239,15 +294,20 @@ module.exports = fp(async (fastify, options) => {
       where: { tenantId }
     });
 
+    const mustPermissions = await models.permission.findAll({
+      attributes: ['id'],
+      where: { isMust: 1 }
+    });
+
     const tenantApplicationIds = tenantApplications.map(({ applicationId }) => applicationId);
-    const tenantPermissionIds = tenantPermissions.map(({ permissionId }) => permissionId);
+    const tenantPermissionIds = uniq([...mustPermissions.map(({ id }) => id), ...tenantPermissions.map(({ permissionId }) => permissionId)]);
 
     const currentApplications = await models.tenantRoleApplication.findAll({
       where: {
         roleId: role.id,
         tenantId,
         applicationId: {
-          [fastify.sequelize.Sequelize.Op.in]: tenantApplicationIds
+          [Op.in]: tenantApplicationIds
         }
       }
     });
@@ -256,7 +316,7 @@ module.exports = fp(async (fastify, options) => {
       where: {
         roleId: role.id,
         tenantId,
-        permissionId: { [fastify.sequelize.Sequelize.Op.in]: tenantPermissionIds }
+        permissionId: { [Op.in]: tenantPermissionIds }
       }
     });
 
@@ -276,7 +336,7 @@ module.exports = fp(async (fastify, options) => {
         (await models.tenantRoleApplication.destroy({
           where: {
             applicationId: {
-              [fastify.sequelize.Sequelize.Op.in]: needDeleteApplications
+              [Op.in]: needDeleteApplications
             },
             tenantId
           },
@@ -287,7 +347,7 @@ module.exports = fp(async (fastify, options) => {
         (await models.tenantRolePermission.destroy({
           where: {
             permissionId: {
-              [fastify.sequelize.Sequelize.Op.in]: needDeletePermissions
+              [Op.in]: needDeletePermissions
             },
             tenantId
           },
@@ -357,6 +417,7 @@ module.exports = fp(async (fastify, options) => {
   services.permission = {
     addPermission,
     getPermissionList,
+    exportPermissionList,
     deletePermission,
     savePermission,
     saveTenantPermissionList,

package/libs/services/tenant-role.js

@@ -83,16 +83,9 @@ module.exports = fp(async (fastify, options) => {
     return await models.permission.findAll({
       attributes: ['id', 'code', 'name', 'isModule', 'pid', 'applicationId', 'paths'],
       where: {
-        [Op.or]: [
-          {
-            id: {
-              [Op.in]: tenantRolePermission.map(({ permissionId }) => permissionId)
-            }
-          },
-          {
-            isMust: true
-          }
-        ]
+        id: {
+          [Op.in]: tenantRolePermission.map(({ permissionId }) => permissionId)
+        }
       }
     });
   };

package/package.json

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