@kne/fastify-account 1.0.0-alpha.2 → 1.0.0-alpha.4

package/libs/controllers/adminTenant.js

@@ -1,10 +1,11 @@
 const fp = require('fastify-plugin');
 
 module.exports = fp(async (fastify, options) => {
+  const { authenticate, services } = fastify.account;
   fastify.get(
     `${options.prefix}/admin/getAllTenantList`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         query: {
           type: 'object',
@@ -38,7 +39,7 @@ module.exports = fp(async (fastify, options) => {
         },
         request.query
       );
-      return await fastify.account.services.admin.getAllTenantList({
+      return await services.tenant.getAllTenantList({
         filter: { name },
         perPage,
         currentPage
@@ -49,7 +50,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.get(
     `${options.prefix}/admin/getTenantInfo`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         query: {
           type: 'object',
@@ -61,14 +62,14 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { id } = request.query;
-      return await fastify.account.services.tenant.getTenantInfo({ id });
+      return await services.tenant.getTenant({ id });
     }
   );
 
   fastify.post(
     `${options.prefix}/admin/addTenant`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         body: {
           type: 'object',
@@ -89,7 +90,7 @@ module.exports = fp(async (fastify, options) => {
       }
     },
     async request => {
-      await fastify.account.services.admin.addTenant(request.body);
+      await services.tenant.addTenant(request.body);
       return {};
     }
   );
@@ -97,7 +98,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/admin/saveTenant`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         body: {
           type: 'object',
@@ -119,7 +120,7 @@ module.exports = fp(async (fastify, options) => {
       }
     },
     async request => {
-      await fastify.account.services.admin.saveTenant(request.body);
+      await services.tenant.saveTenant(request.body);
       return {};
     }
   );
@@ -127,7 +128,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/admin/tenant/addOrg`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       required: ['name', 'tenantId', 'pid'],
       properties: {
         name: { type: 'string' },
@@ -136,14 +137,14 @@ module.exports = fp(async (fastify, options) => {
       }
     },
     async request => {
-      return await fastify.account.services.tenant.addTenantOrg(request.body);
+      return await services.tenantOrg.addTenantOrg(request.body);
     }
   );
 
   fastify.get(
     `${options.prefix}/admin/tenant/orgList`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         query: {
           type: 'object',
@@ -155,14 +156,14 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { tenantId } = request.query;
-      return await fastify.account.services.tenant.getTenantOrgList({ tenantId });
+      return await services.tenantOrg.getTenantOrgList({ tenantId });
     }
   );
 
   fastify.post(
     `${options.prefix}/admin/tenant/editOrg`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       required: ['name', 'tenantId', 'pid'],
       properties: {
         name: { type: 'string' },
@@ -171,7 +172,7 @@ module.exports = fp(async (fastify, options) => {
       }
     },
     async request => {
-      await fastify.account.services.tenant.saveTenantOrg(request.body);
+      await services.tenantOrg.saveTenantOrg(request.body);
       return {};
     }
   );
@@ -179,7 +180,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/admin/tenant/removeOrg`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       required: ['tenantId', 'id'],
       properties: {
         tenantId: { type: 'string' },
@@ -187,7 +188,7 @@ module.exports = fp(async (fastify, options) => {
       }
     },
     async request => {
-      await fastify.account.services.tenant.deleteTenantOrg(request.body);
+      await services.tenantOrg.deleteTenantOrg(request.body);
       return {};
     }
   );
@@ -195,7 +196,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.get(
     `${options.prefix}/admin/getTenantUserList`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         query: {
           type: 'object',
@@ -207,13 +208,14 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { tenantId } = request.query;
-      return await fastify.account.services.tenant.getTenantUserList({ tenantId });
+      return await services.tenantUser.getTenantUserList({ tenantId });
     }
   );
 
   fastify.post(
     `${options.prefix}/admin/addTenantUser`,
     {
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         body: {
           type: 'object',
@@ -237,7 +239,7 @@ module.exports = fp(async (fastify, options) => {
       }
     },
     async request => {
-      await fastify.account.services.tenant.addTenantUser(request.body);
+      await services.tenantUser.addTenantUser(request.body);
       return {};
     }
   );
@@ -245,6 +247,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/admin/saveTenantUser`,
     {
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         body: {
           type: 'object',
@@ -267,7 +270,7 @@ module.exports = fp(async (fastify, options) => {
       }
     },
     async request => {
-      await fastify.account.services.tenant.saveTenantUser(request.body);
+      await services.tenantUser.saveTenantUser(request.body);
       return {};
     }
   );
@@ -275,7 +278,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/admin/deleteTenantUser`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         body: {
           type: 'object',
@@ -289,7 +292,7 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { tenantId, tenantUserId } = request.body;
-      await fastify.account.services.tenant.deleteTenantUser({ tenantId, tenantUserId });
+      await services.tenantUser.deleteTenantUser({ tenantId, tenantUserId });
       return {};
     }
   );
@@ -297,7 +300,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/admin/closeTenant`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         body: {
           type: 'object',
@@ -310,7 +313,7 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { tenantId } = request.body;
-      await fastify.account.services.tenant.closeTenant({ tenantId });
+      await services.tenant.closeTenant({ tenantId });
       return {};
     }
   );
@@ -318,7 +321,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/admin/openTenant`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         body: {
           type: 'object',
@@ -331,7 +334,7 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { tenantId } = request.body;
-      await fastify.account.services.tenant.openTenant({ tenantId });
+      await services.tenant.openTenant({ tenantId });
       return {};
     }
   );
@@ -339,7 +342,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/admin/closeTenantUser`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         body: {
           type: 'object',
@@ -353,7 +356,7 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { tenantId, tenantUserId } = request.body;
-      await fastify.account.services.tenant.closeTenantUser({ tenantId, tenantUserId });
+      await services.tenantUser.closeTenantUser({ tenantId, tenantUserId });
       return {};
     }
   );
@@ -361,7 +364,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/admin/openTenantUser`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         body: {
           type: 'object',
@@ -375,7 +378,7 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { tenantId, tenantUserId } = request.body;
-      await fastify.account.services.tenant.openTenantUser({ tenantId, tenantUserId });
+      await services.tenantUser.openTenantUser({ tenantId, tenantUserId });
       return {};
     }
   );
@@ -383,7 +386,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.get(
     `${options.prefix}/admin/getInviteList`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         query: {
           type: 'object',
@@ -403,14 +406,14 @@ module.exports = fp(async (fastify, options) => {
         request.query
       );
 
-      return await fastify.account.services.tenant.getInviteList({ filter, perPage, currentPage, tenantId });
+      return await services.tenantInvite.getInviteList({ filter, perPage, currentPage, tenantId });
     }
   );
 
   fastify.post(
     `${options.prefix}/admin/addInviteToken`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         body: {
           type: 'object',
@@ -434,7 +437,7 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { tenantId, info } = request.body;
-      await fastify.account.services.tenant.addInviteToken({ tenantId, info });
+      await services.tenantInvite.addInviteToken({ tenantId, info });
       return {};
     }
   );
@@ -442,7 +445,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/admin/deleteInviteToken`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         body: {
           type: 'object',
@@ -454,7 +457,7 @@ module.exports = fp(async (fastify, options) => {
       }
     },
     async request => {
-      await fastify.account.services.tenant.deleteInviteToken({ id: request.body.id });
+      await services.tenantInvite.deleteInviteToken({ id: request.body.id });
       return {};
     }
   );

package/libs/controllers/tenant.js

@@ -1,19 +1,20 @@
 const fp = require('fastify-plugin');
 module.exports = fp(async (fastify, options) => {
+  const { authenticate, services } = fastify.account;
   fastify.get(
     `${options.prefix}/tenant/getUserTenant`,
     {
-      onRequest: [fastify.account.authenticate.user]
+      onRequest: [authenticate.user]
     },
     async request => {
-      return await fastify.account.services.tenant.getUserTenant(request.authenticatePayload);
+      return await services.tenantUser.getUserTenant(request.authenticatePayload);
     }
   );
 
   fastify.get(
     `${options.prefix}/tenant/getTenantUserInfo`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.tenant]
+      onRequest: [authenticate.user, authenticate.tenant]
     },
     async request => {
       return request.tenantInfo;
@@ -23,11 +24,11 @@ module.exports = fp(async (fastify, options) => {
   fastify.get(
     `${options.prefix}/tenant/orgList`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.tenant]
+      onRequest: [authenticate.user, authenticate.tenant]
     },
     async request => {
-      const { tenantId } = request.tenantInfo;
-      return await fastify.account.services.tenant.getTenantOrgList({ tenantId });
+      const { id: tenantId } = request.tenantInfo.tenant;
+      return await services.tenantOrg.getTenantOrgList({ tenantId });
     }
   );
 });

package/libs/controllers/user.js

@@ -1,9 +1,10 @@
 const fp = require('fastify-plugin');
 module.exports = fp(async (fastify, options) => {
+  const { authenticate, services } = fastify.account;
   fastify.get(
     `${options.prefix}/getUserInfo`,
     {
-      onRequest: [fastify.account.authenticate.user]
+      onRequest: [authenticate.user]
     },
     async request => {
       return { userInfo: request.userInfo };
@@ -13,7 +14,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/setCurrentTenantId`,
     {
-      onRequest: [fastify.account.authenticate.user],
+      onRequest: [authenticate.user],
       schema: {
         body: {
           type: 'object',
@@ -26,7 +27,7 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { tenantId } = request.body;
-      await fastify.account.services.user.setCurrentTenantId({ id: request.userInfo.id, tenantId });
+      await services.user.setCurrentTenantId({ id: request.userInfo.id, tenantId });
       return {};
     }
   );

package/libs/models/admin-role.js

@@ -1,7 +1,6 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'adminRole',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       userId: {
         type: DataTypes.UUID,
         allowNull: false
@@ -11,9 +10,6 @@ module.exports = (sequelize, DataTypes) => {
         allowNull: false
       },
       target: DataTypes.STRING
-    },
-    {
-      paranoid: true
     }
-  );
+  };
 };

package/libs/models/application.js

@@ -1,12 +1,15 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'application',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       id: {
-        type: DataTypes.UUID,
-        defaultValue: DataTypes.UUIDV4,
+        type: DataTypes.INTEGER,
+        autoIncrement: true,
         primaryKey: true
       },
+      uuid: {
+        type: DataTypes.UUID,
+        defaultValue: DataTypes.UUIDV4
+      },
       avatar: DataTypes.STRING,
       name: {
         type: DataTypes.STRING,
@@ -23,14 +26,17 @@ module.exports = (sequelize, DataTypes) => {
         defaultValue: 0
       }
     },
-    {
-      paranoid: true,
+    options: {
       indexes: [
         {
           unique: true,
-          fields: ['code', 'deletedAt']
+          fields: ['code', 'deleted_at']
+        },
+        {
+          unique: true,
+          fields: ['uuid', 'deleted_at']
         }
       ]
     }
-  );
+  };
 };

package/libs/models/login-log.js

@@ -1,15 +1,11 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'loginLog',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       userId: {
         type: DataTypes.UUID,
         allowNull: false
       },
       ip: DataTypes.STRING
-    },
-    {
-      paranoid: true
     }
-  );
+  };
 };

package/libs/models/permission.js

@@ -1,9 +1,8 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'permission',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       applicationId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       code: {
@@ -40,14 +39,13 @@ module.exports = (sequelize, DataTypes) => {
         defaultValue: 0
       }
     },
-    {
-      paranoid: true,
+    options: {
       indexes: [
         {
           unique: true,
-          fields: ['code', 'applicationId', 'pid', 'deletedAt']
+          fields: ['code', 'application_id', 'pid', 'deleted_at']
         }
       ]
     }
-  );
+  };
 };

package/libs/models/tenant-application.js

@@ -1,13 +1,12 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'tenantApplication',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       tenantId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       applicationId: {
-        type: DataTypes.INTEGER,
+        type: DataTypes.UUID,
         allowNull: false
       },
       status: {
@@ -15,14 +14,13 @@ module.exports = (sequelize, DataTypes) => {
         defaultValue: 0 //0:开启  11:关闭
       }
     },
-    {
-      paranoid: true,
+    options: {
       indexes: [
         {
           unique: true,
-          fields: ['tenantId', 'applicationId', 'deletedAt']
+          fields: ['tenant_id', 'application_id', 'deleted_at']
         }
       ]
     }
-  );
+  };
 };

package/libs/models/tenant-org.js

@@ -1,9 +1,8 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'tenantOrg',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       tenantId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       name: {
@@ -22,9 +21,6 @@ module.exports = (sequelize, DataTypes) => {
         type: DataTypes.INTEGER,
         defaultValue: 0
       }
-    },
-    {
-      paranoid: true
     }
-  );
+  };
 };

package/libs/models/tenant-permission.js

@@ -1,9 +1,8 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'tenantPermission',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       tenantId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       permissionId: {
@@ -15,14 +14,13 @@ module.exports = (sequelize, DataTypes) => {
         defaultValue: 0 //0:开启  11:关闭
       }
     },
-    {
-      paranoid: true,
+    options: {
       indexes: [
         {
           unique: true,
-          fields: ['tenantId', 'permissionId', 'deletedAt']
+          fields: ['tenant_id', 'permission_id', 'deleted_at']
         }
       ]
     }
-  );
+  };
 };

package/libs/models/tenant-role-application.js

@@ -1,13 +1,12 @@
-module.exports = (sequelize, DataTypes) => {
-  const tenantRoleApplication = sequelize.define(
-    'tenantRoleApplication',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       tenantId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       applicationId: {
-        type: DataTypes.INTEGER,
+        type: DataTypes.UUID,
         allowNull: false
       },
       roleId: {
@@ -19,19 +18,20 @@ module.exports = (sequelize, DataTypes) => {
         defaultValue: 0 //0:开启  11:关闭
       }
     },
-    {
-      paranoid: true,
+    options: {
       indexes: [
         {
           name: 'application_key',
           unique: true,
-          fields: ['tenantId', 'applicationId', 'roleId', 'deletedAt']
+          fields: ['tenant_id', 'application_id', 'role_id', 'deleted_at']
         }
       ]
+    },
+    associate: ({ tenantRoleApplication, application }) => {
+      tenantRoleApplication.belongsTo(application, {
+        targetKey: 'uuid',
+        constraints: false
+      });
     }
-  );
-  tenantRoleApplication.associate = ({ tenantRoleApplication, application }) => {
-    tenantRoleApplication.belongsTo(application);
   };
-  return tenantRoleApplication;
 };