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

package/README.md

@@ -22,7 +22,7 @@ npm i --save @kne/fastify-account
 ### API
 
 ---
-title: "@kne/fastify-account v1.0.0-alpha.1"
+title: "@kne/fastify-account v1.0.0-alpha.3"
 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.1</h1>
+<h1 id="-kne-fastify-account">@kne/fastify-account v1.0.0-alpha.3</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.
 
@@ -1008,6 +1008,45 @@ This operation does not require authentication
 
 `POST /api/v1/account/admin/saveTenantPermissionList`
 
+> Body parameter
+
+```json
+{
+  "type": "object",
+  "required": [
+    "tenantId",
+    "applications",
+    "permissions"
+  ],
+  "properties": {
+    "tenantId": {
+      "type": "string"
+    },
+    "applications": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "permissions": {
+      "type": "array",
+      "items": {
+        "type": "number"
+      }
+    }
+  }
+}
+```
+
+<h3 id="post__api_v1_account_admin_savetenantpermissionlist-parameters">Parameters</h3>
+
+|Name|In|Type|Required|Description|
+|---|---|---|---|---|
+|body|body|object|true|none|
+|» tenantId|body|string|true|none|
+|» applications|body|[string]|true|none|
+|» permissions|body|[number]|true|none|
+
 <h3 id="post__api_v1_account_admin_savetenantpermissionlist-responses">Responses</h3>
 
 |Status|Meaning|Description|Schema|
@@ -1022,6 +1061,12 @@ This operation does not require authentication
 
 `GET /api/v1/account/admin/getTenantPermissionList`
 
+<h3 id="get__api_v1_account_admin_gettenantpermissionlist-parameters">Parameters</h3>
+
+|Name|In|Type|Required|Description|
+|---|---|---|---|---|
+|tenantId|query|string|true|none|
+
 <h3 id="get__api_v1_account_admin_gettenantpermissionlist-responses">Responses</h3>
 
 |Status|Meaning|Description|Schema|

package/index.js

@@ -9,6 +9,7 @@ module.exports = fp(
     options = merge(
       {
         prefix: `/api/v${packageJson.version.split('.')[0]}/account`, //如果为true，发送邮件和短信将不调用，验证码随response返回
+        dbTableNamePrefix: 't_account_',
         isTest: false,
         jwt: {
           secret: 'super-secret'
@@ -23,7 +24,12 @@ module.exports = fp(
       options,
       name: 'account',
       modules: [
-        ['models', await fastify.sequelize.addModels(path.resolve(__dirname, './libs/models'))],
+        [
+          'models',
+          await fastify.sequelize.addModels(path.resolve(__dirname, './libs/models'), {
+            prefix: options.dbTableNamePrefix
+          })
+        ],
         ['services', path.resolve(__dirname, './libs/services')],
         ['controllers', path.resolve(__dirname, './libs/controllers')],
         [
@@ -34,13 +40,13 @@ module.exports = fp(
               //这里判断失效时间
               //info.iat
               request.authenticatePayload = info.payload;
-              request.userInfo = await fastify.account.services.user.getUserInfo(request.authenticatePayload);
+              request.userInfo = await fastify.account.services.user.getUser(request.authenticatePayload);
             },
             tenant: async request => {
-              request.tenantInfo = await fastify.account.services.tenant.tenantUserAuthenticate(request.userInfo);
+              request.tenantInfo = await fastify.account.services.tenantUser.getTenantUserByUserId(request.userInfo);
             },
             admin: async request => {
-              request.adminInfo = await fastify.account.services.admin.superAdminAuthenticate(request.userInfo);
+              request.adminInfo = await fastify.account.services.admin.checkSuperAdmin(request.userInfo);
             }
           }
         ]

package/libs/controllers/account.js

@@ -1,5 +1,6 @@
 const fp = require('fastify-plugin');
 module.exports = fp(async (fastify, options) => {
+  const { services } = fastify.account;
   fastify.post(
     `${options.prefix}/sendEmailCode`,
     {
@@ -36,7 +37,7 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { email } = request.body;
-      const code = await fastify.account.services.account.sendEmailCode({ email });
+      const code = await services.account.sendEmailCode({ email });
       return options.isTest ? { code } : {};
     }
   );
@@ -56,7 +57,7 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { phone } = request.body;
-      const code = await fastify.account.services.account.sendSMSCode({ phone });
+      const code = await services.account.sendSMSCode({ phone });
       return options.isTest ? { code } : {};
     }
   );
@@ -78,7 +79,7 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { name, type, code } = request.body;
-      const isPass = await fastify.account.services.account.verificationCodeValidate({
+      const isPass = await services.account.verificationCodeValidate({
         name,
         type,
         code
@@ -116,7 +117,7 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { phone, email } = request.body;
-      return { isExists: await fastify.account.services.user.accountIsExists({ phone, email }) };
+      return { isExists: await services.user.accountIsExists({ phone, email }) };
     }
   );
 
@@ -162,7 +163,7 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const account = request.body;
-      return await fastify.account.services.account.register(account);
+      return await services.account.register(account);
     }
   );
 
@@ -182,7 +183,7 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { username, password } = request.body;
-      const { token, user } = await fastify.account.services.account.login({ username, password, ip: request.ip });
+      const { token, user } = await services.account.login({ username, password, ip: request.ip });
       return { token, currentTenantId: user.currentTenantId };
     }
   );

package/libs/controllers/admin.js

@@ -1,14 +1,15 @@
 const fp = require('fastify-plugin');
 
 module.exports = fp(async (fastify, options) => {
+  const { authenticate, services } = fastify.account;
   // 用于系统初始化时，设置第一个用户，只能使用一次，其他用户由该用户创建
   fastify.post(
     `${options.prefix}/initSuperAdmin`,
     {
-      onRequest: [fastify.account.authenticate.user]
+      onRequest: [authenticate.user]
     },
     async request => {
-      await fastify.account.services.admin.initSuperAdmin(await fastify.account.services.user.getUserInfo(request.authenticatePayload));
+      await services.admin.initSuperAdmin(await services.user.getUser(request.authenticatePayload));
       return {};
     }
   );
@@ -16,7 +17,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.get(
     `${options.prefix}/admin/getSuperAdminInfo`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin]
+      onRequest: [authenticate.user, authenticate.admin]
     },
     async request => {
       return { userInfo: request.userInfo };
@@ -26,14 +27,14 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/admin/addUser`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         body: {}
       }
     },
     async request => {
       const userInfo = request.body;
-      await fastify.account.services.admin.addUser(Object.assign({}, userInfo, { password: options.defaultPassword }));
+      await services.admin.addUser(Object.assign({}, userInfo, { password: options.defaultPassword }));
       return {};
     }
   );
@@ -41,7 +42,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.get(
     `${options.prefix}/admin/getAllUserList`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         query: {}
       }
@@ -54,7 +55,7 @@ module.exports = fp(async (fastify, options) => {
         },
         request.query
       );
-      return await fastify.account.services.admin.getAllUserList({
+      return await services.user.getAllUserList({
         filter,
         perPage,
         currentPage
@@ -65,7 +66,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/admin/resetUserPassword`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         body: {
           type: 'object',
@@ -78,7 +79,7 @@ module.exports = fp(async (fastify, options) => {
       }
     },
     async request => {
-      await fastify.account.services.admin.resetUserPassword(request.body);
+      await services.admin.resetUserPassword(request.body);
       return {};
     }
   );
@@ -86,7 +87,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/admin/saveUser`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         body: {
           type: 'object',
@@ -104,7 +105,7 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const user = request.body;
-      await fastify.account.services.user.saveUser(user);
+      await services.user.saveUser(user);
       return {};
     }
   );
@@ -112,7 +113,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/admin/closeUser`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         body: {
           type: 'object',
@@ -125,7 +126,7 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { id } = request.body;
-      await fastify.account.services.user.closeUser({ id });
+      await services.user.closeUser({ id });
       return {};
     }
   );
@@ -133,7 +134,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/admin/openUser`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         body: {
           type: 'object',
@@ -146,7 +147,7 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { id } = request.body;
-      await fastify.account.services.user.openUser({ id });
+      await services.user.openUser({ id });
       return {};
     }
   );

package/libs/controllers/adminPermission.js

@@ -1,10 +1,11 @@
 const fp = require('fastify-plugin');
 
 module.exports = fp(async (fastify, options) => {
+  const { authenticate, services } = fastify.account;
   fastify.post(
     `${options.prefix}/admin/addApplication`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         body: {
           type: 'object',
@@ -20,7 +21,7 @@ module.exports = fp(async (fastify, options) => {
       }
     },
     async request => {
-      await fastify.account.services.permission.addApplication(request.body);
+      await services.application.addApplication(request.body);
       return {};
     }
   );
@@ -28,7 +29,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/admin/saveApplication`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         body: {
           type: 'object',
@@ -45,7 +46,7 @@ module.exports = fp(async (fastify, options) => {
       }
     },
     async request => {
-      await fastify.account.services.permission.saveApplication(request.body);
+      await services.application.saveApplication(request.body);
       return {};
     }
   );
@@ -53,7 +54,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/admin/deleteApplication`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         body: {
           type: 'object',
@@ -66,7 +67,7 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { id } = request.body;
-      await fastify.account.services.permission.deleteApplication({ id });
+      await services.application.deleteApplication({ id });
       return {};
     }
   );
@@ -74,7 +75,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.get(
     `${options.prefix}/admin/getApplicationList`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         query: {
           type: 'object',
@@ -86,14 +87,14 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { tenantId } = request.query;
-      return await fastify.account.services.permission.getApplicationList({ tenantId });
+      return await services.application.getApplicationList({ tenantId });
     }
   );
 
   fastify.post(
     `${options.prefix}/admin/addPermission`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         body: {
           type: 'object',
@@ -112,7 +113,7 @@ module.exports = fp(async (fastify, options) => {
       }
     },
     async request => {
-      await fastify.account.services.permission.addPermission(request.body);
+      await services.permission.addPermission(request.body);
       return {};
     }
   );
@@ -120,7 +121,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.get(
     `${options.prefix}/admin/getPermissionList`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         query: {
           type: 'object',
@@ -134,14 +135,14 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { applicationId, tenantId } = request.query;
-      return await fastify.account.services.permission.getPermissionList({ applicationId, tenantId });
+      return await services.permission.getPermissionList({ applicationId, tenantId });
     }
   );
 
   fastify.post(
     `${options.prefix}/admin/deletePermission`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         body: {
           type: 'object',
@@ -155,7 +156,7 @@ module.exports = fp(async (fastify, options) => {
     async request => {
       const { id } = request.body;
 
-      await fastify.account.services.permission.deletePermission({ id });
+      await services.permission.deletePermission({ id });
 
       return {};
     }
@@ -164,7 +165,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/admin/savePermission`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         body: {
           type: 'object',
@@ -180,7 +181,7 @@ module.exports = fp(async (fastify, options) => {
       }
     },
     async request => {
-      await fastify.account.services.permission.savePermission(request.body);
+      await services.permission.savePermission(request.body);
       return {};
     }
   );
@@ -188,24 +189,27 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/admin/saveTenantPermissionList`,
     {
-      body: {
-        type: 'object',
-        required: ['tenantId', 'applications', 'permissions'],
-        properties: {
-          tenantId: { type: 'string' },
-          applications: {
-            type: 'array',
-            items: { type: 'string' }
-          },
-          permissions: {
-            type: 'array',
-            items: { type: 'number' }
+      onRequest: [authenticate.user, authenticate.admin],
+      schema: {
+        body: {
+          type: 'object',
+          required: ['tenantId', 'applications', 'permissions'],
+          properties: {
+            tenantId: { type: 'string' },
+            applications: {
+              type: 'array',
+              items: { type: 'string' }
+            },
+            permissions: {
+              type: 'array',
+              items: { type: 'number' }
+            }
           }
         }
       }
     },
     async request => {
-      await fastify.account.services.permission.saveTenantPermissionList(request.body);
+      await services.permission.saveTenantPermissionList(request.body);
 
       return {};
     }
@@ -214,17 +218,20 @@ module.exports = fp(async (fastify, options) => {
   fastify.get(
     `${options.prefix}/admin/getTenantPermissionList`,
     {
-      query: {
-        type: 'object',
-        required: ['tenantId'],
-        properties: {
-          tenantId: { type: 'string' }
+      onRequest: [authenticate.user, authenticate.admin],
+      schema: {
+        query: {
+          type: 'object',
+          required: ['tenantId'],
+          properties: {
+            tenantId: { type: 'string' }
+          }
         }
       }
     },
     async request => {
       const { tenantId } = request.query;
-      return await fastify.account.services.permission.getTenantPermissionList({ tenantId });
+      return await services.permission.getTenantPermissionList({ tenantId });
     }
   );
 });

package/libs/controllers/adminRole.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/getRoleList`,
     {
-      onRequest: [fastify.account.authenticate.user, fastify.account.authenticate.admin],
+      onRequest: [authenticate.user, authenticate.admin],
       schema: {
         query: {
           type: 'object',
@@ -30,14 +31,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 +53,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 +62,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 +76,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 +84,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 +97,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 +105,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 +118,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 +139,7 @@ module.exports = fp(async (fastify, options) => {
       }
     },
     async request => {
-      await fastify.account.services.permission.saveRolePermissionList(request.body);
+      await services.permission.saveRolePermissionList(request.body);
       return {};
     }
   );