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

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,243 +62,14 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { id } = request.query;
-      return await fastify.account.services.tenant.getTenantInfo({ id });
-    }
-  );
-
-  fastify.post(
-    `${options.prefix}/admin/addTenant`,
-    {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
-      schema: {
-        body: {
-          type: 'object',
-          required: ['name', 'accountNumber', 'serviceStartTime', 'serviceEndTime'],
-          properties: {
-            name: { type: 'string' },
-            accountNumber: { type: 'number' },
-            serviceStartTime: {
-              type: 'string',
-              format: 'date-time'
-            },
-            serviceEndTime: {
-              type: 'string',
-              format: 'date-time'
-            }
-          }
-        }
-      }
-    },
-    async request => {
-      await fastify.account.services.admin.addTenant(request.body);
-      return {};
-    }
-  );
-
-  fastify.post(
-    `${options.prefix}/admin/saveTenant`,
-    {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
-      schema: {
-        body: {
-          type: 'object',
-          required: ['id', 'name', 'accountNumber', 'serviceStartTime', 'serviceEndTime'],
-          properties: {
-            id: { type: 'string' },
-            name: { type: 'string' },
-            accountNumber: { type: 'number' },
-            serviceStartTime: {
-              type: 'string',
-              format: 'date-time'
-            },
-            serviceEndTime: {
-              type: 'string',
-              format: 'date-time'
-            }
-          }
-        }
-      }
-    },
-    async request => {
-      await fastify.account.services.admin.saveTenant(request.body);
-      return {};
-    }
-  );
-
-  fastify.post(
-    `${options.prefix}/admin/tenant/addOrg`,
-    {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
-      required: ['name', 'tenantId', 'pid'],
-      properties: {
-        name: { type: 'string' },
-        tenantId: { type: 'string' },
-        pid: { type: 'number' }
-      }
-    },
-    async request => {
-      return await fastify.account.services.tenant.addTenantOrg(request.body);
-    }
-  );
-
-  fastify.get(
-    `${options.prefix}/admin/tenant/orgList`,
-    {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
-      schema: {
-        query: {
-          type: 'object',
-          properties: {
-            id: { type: 'string' }
-          }
-        }
-      }
-    },
-    async request => {
-      const { tenantId } = request.query;
-      return await fastify.account.services.tenant.getTenantOrgList({ tenantId });
-    }
-  );
-
-  fastify.post(
-    `${options.prefix}/admin/tenant/editOrg`,
-    {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
-      required: ['name', 'tenantId', 'pid'],
-      properties: {
-        name: { type: 'string' },
-        tenantId: { type: 'string' },
-        pid: { type: 'number' }
-      }
-    },
-    async request => {
-      await fastify.account.services.tenant.saveTenantOrg(request.body);
-      return {};
-    }
-  );
-
-  fastify.post(
-    `${options.prefix}/admin/tenant/removeOrg`,
-    {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
-      required: ['tenantId', 'id'],
-      properties: {
-        tenantId: { type: 'string' },
-        id: { type: 'number' }
-      }
-    },
-    async request => {
-      await fastify.account.services.tenant.deleteTenantOrg(request.body);
-      return {};
-    }
-  );
-
-  fastify.get(
-    `${options.prefix}/admin/getTenantUserList`,
-    {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
-      schema: {
-        query: {
-          type: 'object',
-          properties: {
-            tenantId: { type: 'string' }
-          }
-        }
-      }
-    },
-    async request => {
-      const { tenantId } = request.query;
-      return await fastify.account.services.tenant.getTenantUserList({ tenantId });
-    }
-  );
-
-  fastify.post(
-    `${options.prefix}/admin/addTenantUser`,
-    {
-      schema: {
-        body: {
-          type: 'object',
-          required: ['tenantId', 'userId', 'name'],
-          properties: {
-            tenantId: { type: 'string' },
-            roleIds: { type: 'array', items: { type: 'number' }, default: [] },
-            orgIds: {
-              type: 'array',
-              items: { type: 'number' },
-              default: []
-            },
-            userId: { type: 'string' },
-            name: { type: 'string' },
-            avatar: { type: 'string' },
-            phone: { type: 'string' },
-            email: { type: 'string' },
-            description: { type: 'string' }
-          }
-        }
-      }
-    },
-    async request => {
-      await fastify.account.services.tenant.addTenantUser(request.body);
-      return {};
-    }
-  );
-
-  fastify.post(
-    `${options.prefix}/admin/saveTenantUser`,
-    {
-      schema: {
-        body: {
-          type: 'object',
-          required: ['tenantId', 'name'],
-          properties: {
-            tenantId: { type: 'string' },
-            roleIds: { type: 'array', items: { type: 'number' }, default: [] },
-            orgIds: {
-              type: 'array',
-              items: { type: 'number' },
-              default: []
-            },
-            name: { type: 'string' },
-            avatar: { type: 'string' },
-            phone: { type: 'string' },
-            email: { type: 'string' },
-            description: { type: 'string' }
-          }
-        }
-      }
-    },
-    async request => {
-      await fastify.account.services.tenant.saveTenantUser(request.body);
-      return {};
-    }
-  );
-
-  fastify.post(
-    `${options.prefix}/admin/deleteTenantUser`,
-    {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
-      schema: {
-        body: {
-          type: 'object',
-          required: ['tenantId', 'tenantUserId'],
-          properties: {
-            tenantId: { type: 'string' },
-            tenantUserId: { type: 'string' }
-          }
-        }
-      }
-    },
-    async request => {
-      const { tenantId, tenantUserId } = request.body;
-      await fastify.account.services.tenant.deleteTenantUser({ tenantId, tenantUserId });
-      return {};
+      return await services.tenant.getTenant({ id });
     }
   );
 
   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 +82,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 +90,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,51 +103,66 @@ 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 {};
     }
   );
 
   fastify.post(
-    `${options.prefix}/admin/closeTenantUser`,
+    `${options.prefix}/admin/addTenant`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         body: {
           type: 'object',
-          required: ['tenantId', 'tenantUserId'],
+          required: ['name', 'accountNumber', 'serviceStartTime', 'serviceEndTime'],
           properties: {
-            tenantId: { type: 'string' },
-            tenantUserId: { type: 'string' }
+            name: { type: 'string' },
+            accountNumber: { type: 'number' },
+            serviceStartTime: {
+              type: 'string',
+              format: 'date-time'
+            },
+            serviceEndTime: {
+              type: 'string',
+              format: 'date-time'
+            }
           }
         }
       }
     },
     async request => {
-      const { tenantId, tenantUserId } = request.body;
-      await fastify.account.services.tenant.closeTenantUser({ tenantId, tenantUserId });
+      await services.tenant.addTenant(request.body);
       return {};
     }
   );
 
   fastify.post(
-    `${options.prefix}/admin/openTenantUser`,
+    `${options.prefix}/admin/saveTenant`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         body: {
           type: 'object',
-          required: ['tenantId', 'tenantUserId'],
+          required: ['id', 'name', 'accountNumber', 'serviceStartTime', 'serviceEndTime'],
           properties: {
-            tenantId: { type: 'string' },
-            tenantUserId: { type: 'string' }
+            id: { type: 'string' },
+            name: { type: 'string' },
+            accountNumber: { type: 'number' },
+            serviceStartTime: {
+              type: 'string',
+              format: 'date-time'
+            },
+            serviceEndTime: {
+              type: 'string',
+              format: 'date-time'
+            }
           }
         }
       }
     },
     async request => {
-      const { tenantId, tenantUserId } = request.body;
-      await fastify.account.services.tenant.openTenantUser({ tenantId, tenantUserId });
+      await services.tenant.saveTenant(request.body);
       return {};
     }
   );
@@ -383,7 +170,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 +190,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 +221,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 +229,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 +241,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/adminTenantCompany.js

@@ -0,0 +1,53 @@
+const fp = require('fastify-plugin');
+
+module.exports = fp(async (fastify, options) => {
+  const { authenticate, services } = fastify.account;
+
+  fastify.get(
+    `${options.prefix}/admin/getCompanyInfo`,
+    {
+      onRequest: [authenticate.user, authenticate.admin],
+      schema: {
+        tags: ['管理后台'],
+        summary: '获取租户管理的公司信息',
+        required: ['tenantId'],
+        query: {
+          type: 'object',
+          properties: {
+            tenantId: { type: 'string' }
+          }
+        }
+      }
+    },
+    async request => {
+      return await services.tenantCompany.getTenantCompanyInfo(request.query);
+    }
+  );
+
+  fastify.post(
+    `${options.prefix}/admin/saveCompanyInfo`,
+    {
+      onRequest: [authenticate.user, authenticate.admin],
+      schema: {
+        tags: ['管理后台'],
+        summary: '修改租户管理的公司信息',
+        required: ['tenantId', 'id'],
+        body: {
+          type: 'object',
+          properties: {
+            id: { type: 'number' },
+            tenantId: { type: 'string' },
+            name: { type: 'string' },
+            shortName: { type: 'string' },
+            themeColor: { type: 'string' },
+            logo: { type: 'string' },
+            description: { type: 'string' }
+          }
+        }
+      }
+    },
+    async request => {
+      return await services.tenantCompany.saveTenantCompanyInfo(request.body);
+    }
+  );
+});

package/libs/controllers/adminTenantOrg.js

@@ -0,0 +1,71 @@
+const fp = require('fastify-plugin');
+
+module.exports = fp(async (fastify, options) => {
+  const { authenticate, services } = fastify.account;
+  fastify.post(
+    `${options.prefix}/admin/tenant/addOrg`,
+    {
+      onRequest: [authenticate.user, authenticate.admin],
+      required: ['name', 'tenantId', 'pid'],
+      properties: {
+        name: { type: 'string' },
+        tenantId: { type: 'string' },
+        pid: { type: 'number' }
+      }
+    },
+    async request => {
+      return await services.tenantOrg.addTenantOrg(request.body);
+    }
+  );
+
+  fastify.get(
+    `${options.prefix}/admin/tenant/orgList`,
+    {
+      onRequest: [authenticate.user, authenticate.admin],
+      schema: {
+        query: {
+          type: 'object',
+          properties: {
+            id: { type: 'string' }
+          }
+        }
+      }
+    },
+    async request => {
+      const { tenantId } = request.query;
+      return await services.tenantOrg.getTenantOrgList({ tenantId });
+    }
+  );
+
+  fastify.post(
+    `${options.prefix}/admin/tenant/editOrg`,
+    {
+      onRequest: [authenticate.user, authenticate.admin],
+      required: ['name', 'tenantId', 'pid'],
+      properties: {
+        name: { type: 'string' },
+        tenantId: { type: 'string' },
+        pid: { type: 'number' }
+      }
+    },
+    async request => {
+      await services.tenantOrg.saveTenantOrg(request.body);
+      return {};
+    }
+  );
+
+  fastify.post(
+    `${options.prefix}/admin/tenant/removeOrg`,
+    {
+      onRequest: [authenticate.user, authenticate.admin],
+      required: ['id'],
+      properties: {
+        id: { type: 'number' }
+      }
+    },
+    async request => {
+      await services.tenantOrg.deleteTenantOrg(request.body);
+      return {};
+    }
+  );
+});

package/libs/controllers/{adminRole.js → adminTenantRole.js}

@@ -1,16 +1,19 @@
 const fp = require('fastify-plugin');
 
 module.exports = fp(async (fastify, options) => {
+  const { authenticate, services } = fastify.account;
   fastify.get(
     `${options.prefix}/admin/getRoleList`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         query: {
           type: 'object',
           required: ['tenantId'],
           properties: {
             tenantId: { type: 'string' },
+            perPage: { type: 'number' },
+            currentPage: { type: 'number' },
             filter: {
               type: 'object',
               properties: {
@@ -30,14 +33,14 @@ module.exports = fp(async (fastify, options) => {
         },
         request.query
       );
-      return await fastify.account.services.tenant.getRoleList({ tenantId, perPage, currentPage, filter });
+      return await services.tenantRole.getTenantRoleList({ tenantId, perPage, currentPage, filter });
     }
   );
 
   fastify.post(
     `${options.prefix}/admin/addRole`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         body: {
           type: 'object',
@@ -52,7 +55,7 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { tenantId, name, description } = request.body;
-      await fastify.account.services.tenant.addRole({ tenantId, name, description });
+      await services.tenantRole.addTenantRole({ tenantId, name, description });
 
       return {};
     }
@@ -61,7 +64,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/admin/saveRole`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         body: {
           type: 'object',
@@ -75,7 +78,7 @@ module.exports = fp(async (fastify, options) => {
       }
     },
     async request => {
-      await fastify.account.services.tenant.saveRole(request.body);
+      await services.tenantRole.saveTenantRole(request.body);
       return {};
     }
   );
@@ -83,7 +86,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/admin/removeRole`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         body: {
           type: 'object',
@@ -96,7 +99,7 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { id } = request.body;
-      await fastify.account.services.tenant.removeRole({ id });
+      await services.tenantRole.removeTenantRole({ id });
       return {};
     }
   );
@@ -104,7 +107,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.get(
     `${options.prefix}/admin/getRolePermissionList`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         query: {
           type: 'object',
@@ -117,14 +120,14 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { id } = request.query;
-      return await fastify.account.services.permission.getRolePermissionList({ roleId: id });
+      return await services.permission.getRolePermissionList({ roleId: id });
     }
   );
 
   fastify.post(
     `${options.prefix}/admin/saveRolePermissionList`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         roleId: { type: 'string' },
         applications: {
@@ -138,7 +141,7 @@ module.exports = fp(async (fastify, options) => {
       }
     },
     async request => {
-      await fastify.account.services.permission.saveRolePermissionList(request.body);
+      await services.permission.saveRolePermissionList(request.body);
       return {};
     }
   );