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

package/index.js

@@ -2,6 +2,8 @@ const fp = require('fastify-plugin');
 const packageJson = require('./package.json');
 const path = require('path');
 const merge = require('lodash/merge');
+const get = require('lodash/get');
+const { Unauthorized, Forbidden } = require('http-errors');
 
 module.exports = fp(
   async function (fastify, options) {
@@ -9,21 +11,27 @@ module.exports = fp(
     options = merge(
       {
         prefix: `/api/v${packageJson.version.split('.')[0]}/account`, //如果为true，发送邮件和短信将不调用，验证码随response返回
+        dbTableNamePrefix: 't_account_',
         isTest: false,
         jwt: {
-          secret: 'super-secret'
+          secret: 'super-secret',
+          expires: null
         },
-        defaultPassword: 'Aa000000!'
+        sendMessage: async () => {}
       },
       options
     );
-    fastify.register(require('fastify-ip'));
     fastify.register(require('@fastify/jwt'), options.jwt);
     fastify.register(require('@kne/fastify-namespace'), {
       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')],
         [
@@ -32,15 +40,60 @@ 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.getUserInfo(request.authenticatePayload);
+              request.userInfo = await fastify.account.services.user.getUser(request.authenticatePayload);
+              request.appName = request.headers['x-app-name'];
+              await fastify.account.services.requestLog.addRequestLog({
+                userInfo: request.userInfo,
+                tenantId: request.userInfo.currentTenantId,
+                appName: request.appName,
+                type: 'user',
+                action: `${request.routerPath}:${request.method}`,
+                summary: request.routeSchema?.summary
+              });
             },
             tenant: async request => {
-              request.tenantInfo = await fastify.account.services.tenant.tenantUserAuthenticate(request.userInfo);
+              request.appName = request.headers['x-app-name'];
+              request.tenantInfo = await fastify.account.services.tenantUser.getTenantUserByUserId({
+                userInfo: request.userInfo,
+                appName: request.appName
+              });
+              request.tenantInfo.companyInfo = await fastify.account.services.tenantCompany.getTenantCompanyInfo({
+                tenantId: request.tenantInfo.tenant.id
+              });
+              await fastify.account.services.requestLog.addRequestLog({
+                userInfo: request.userInfo,
+                tenantId: request.tenantInfo.tenant.id,
+                appName: request.appName,
+                type: 'tenant',
+                action: `${request.routerPath}:${request.method}`,
+                summary: request.routeSchema?.summary
+              });
             },
             admin: async request => {
-              request.adminInfo = await fastify.account.services.admin.superAdminAuthenticate(request.userInfo);
+              if (!(await fastify.account.services.admin.checkIsSuperAdmin(request.userInfo))) {
+                throw Unauthorized('不能执行该操作，需要超级管理员权限');
+              }
+              request.appName = request.headers['x-app-name'];
+              await fastify.account.services.requestLog.addRequestLog({
+                userInfo: request.userInfo,
+                appName: request.appName,
+                type: 'admin',
+                action: `${request.routerPath}:${request.method}`,
+                summary: request.routeSchema?.summary
+              });
+            },
+            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/account.js

@@ -1,9 +1,12 @@
 const fp = require('fastify-plugin');
 module.exports = fp(async (fastify, options) => {
+  const { services } = fastify.account;
   fastify.post(
     `${options.prefix}/sendEmailCode`,
     {
       schema: {
+        tags: ['账号'],
+        summary: '发送登录邮箱验证码',
         body: {
           type: 'object',
           required: ['email'],
@@ -18,14 +21,7 @@ module.exports = fp(async (fastify, options) => {
                 schema: {
                   type: 'object',
                   properties: {
-                    code: { type: 'number' },
-                    data: {
-                      type: 'object',
-                      properties: {
-                        code: { type: 'string', description: '验证码' }
-                      }
-                    },
-                    msg: { type: 'string' }
+                    code: { type: 'string', description: '验证码' }
                   }
                 }
               }
@@ -36,7 +32,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.sendVerificationCode({ name: email, type: 0 });
       return options.isTest ? { code } : {};
     }
   );
@@ -45,18 +41,34 @@ module.exports = fp(async (fastify, options) => {
     `${options.prefix}/sendSMSCode`,
     {
       schema: {
+        tags: ['账号'],
+        summary: '发送登录短信验证码',
         body: {
           type: 'object',
           required: ['phone'],
           properties: {
             phone: { type: 'string', description: '电话' }
           }
+        },
+        response: {
+          200: {
+            content: {
+              'application/json': {
+                schema: {
+                  type: 'object',
+                  properties: {
+                    code: { type: 'string', description: '验证码' }
+                  }
+                }
+              }
+            }
+          }
         }
       }
     },
     async request => {
       const { phone } = request.body;
-      const code = await fastify.account.services.account.sendSMSCode({ phone });
+      const code = await services.account.sendVerificationCode({ name: phone, type: 0 });
       return options.isTest ? { code } : {};
     }
   );
@@ -65,20 +77,31 @@ module.exports = fp(async (fastify, options) => {
     `${options.prefix}/validateCode`,
     {
       schema: {
+        tags: ['账号'],
+        summary: '验证码验证',
         body: {
           type: 'object',
           required: ['name', 'type', 'code'],
           properties: {
             name: { type: 'string', description: '被验证的账号，手机或邮箱' },
-            type: { type: 'number', description: '0:手机注册,1:邮箱注册,2:手机登录,3:邮箱登录,4:验证租户管理员' },
+            type: { type: 'number', description: '0:注册,2:登录,4:验证租户管理员,5:忘记密码' },
             code: { type: 'string', description: '接受到的验证码' }
           }
+        },
+        response: {
+          200: {
+            content: {
+              'application/json': {
+                schema: {}
+              }
+            }
+          }
         }
       }
     },
     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
@@ -94,29 +117,45 @@ module.exports = fp(async (fastify, options) => {
     `${options.prefix}/accountIsExists`,
     {
       schema: {
+        tags: ['账号'],
+        summary: '账号是否已存在',
         body: {
           oneOf: [
             {
               type: 'object',
               required: ['phone'],
               properties: {
-                phone: { type: 'string' }
+                phone: { type: 'string', description: '电话' }
               }
             },
             {
               type: 'object',
               required: ['email'],
               properties: {
-                email: { type: 'string' }
+                email: { type: 'string', description: '邮箱' }
               }
             }
           ]
+        },
+        response: {
+          200: {
+            content: {
+              'application/json': {
+                schema: {
+                  type: 'object',
+                  properties: {
+                    isExists: { type: 'boolean', description: 'true已存在，false不存在' }
+                  }
+                }
+              }
+            }
+          }
         }
       }
     },
     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 }) };
     }
   );
 
@@ -124,45 +163,56 @@ module.exports = fp(async (fastify, options) => {
     `${options.prefix}/register`,
     {
       schema: {
+        tags: ['账号'],
+        summary: '注册账号',
         body: {
           oneOf: [
             {
               type: 'object',
               required: ['phone', 'password', 'code'],
               properties: {
-                avatar: { type: 'string' },
-                phone: { type: 'string' },
-                code: { type: 'string' },
-                password: { type: 'string' },
-                invitationCode: { type: 'string' },
-                nickname: { type: 'string' },
-                gender: { type: 'string' },
-                birthday: { type: 'string', format: 'date' },
-                description: { type: 'string' }
+                avatar: { type: 'string', description: '头像图片id' },
+                phone: { type: 'string', description: '电话' },
+                code: { type: 'string', description: '验证码' },
+                password: { type: 'string', description: '密码（需要md5加密）' },
+                invitationCode: { type: 'string', description: '邀请码，用来默认加入租户' },
+                nickname: { type: 'string', description: '昵称' },
+                gender: { type: 'string', description: '性别' },
+                birthday: { type: 'string', format: 'date', description: '出生日期' },
+                description: { type: 'string', description: '个人简介' }
               }
             },
             {
               type: 'object',
               required: ['email', 'password', 'code'],
               properties: {
-                avatar: { type: 'string' },
-                email: { type: 'string' },
-                code: { type: 'string' },
-                password: { type: 'string' },
-                invitationCode: { type: 'string' },
-                nickname: { type: 'string' },
-                gender: { type: 'string' },
-                birthday: { type: 'string', format: 'date' },
-                description: { type: 'string' }
+                avatar: { type: 'string', description: '头像图片id' },
+                email: { type: 'string', description: '邮箱' },
+                code: { type: 'string', description: '验证码' },
+                password: { type: 'string', description: '密码（需要md5加密）' },
+                invitationCode: { type: 'string', description: '邀请码，用来默认加入租户' },
+                nickname: { type: 'string', description: '昵称' },
+                gender: { type: 'string', description: '性别' },
+                birthday: { type: 'string', format: 'date', description: '出生日期' },
+                description: { type: 'string', description: '个人简介' }
               }
             }
           ]
+        },
+        response: {
+          200: {
+            content: {
+              'application/json': {
+                schema: {}
+              }
+            }
+          }
         }
       }
     },
     async request => {
       const account = request.body;
-      return await fastify.account.services.account.register(account);
+      return await services.account.register(account);
     }
   );
 
@@ -170,20 +220,154 @@ module.exports = fp(async (fastify, options) => {
     `${options.prefix}/login`,
     {
       schema: {
+        tags: ['账号'],
+        summary: '登录',
         body: {
           type: 'object',
           required: ['username', 'password'],
           properties: {
-            username: { type: 'string' },
-            password: { type: 'string' }
+            username: { type: 'string', description: '用户名' },
+            password: { type: 'string', description: '密码' }
+          }
+        },
+        response: {
+          200: {
+            content: {
+              'application/json': {
+                schema: {
+                  type: 'object',
+                  properties: {
+                    token: { type: 'string', description: '用户token' },
+                    currentTenantId: { type: 'string', description: '当前租户id' }
+                  }
+                }
+              }
+            }
           }
         }
       }
     },
     async request => {
       const { username, password } = request.body;
-      const { token, user } = await fastify.account.services.account.login({ username, password, ip: request.ip });
+      const appName = request.headers['x-app-name'];
+      const { token, user } = await services.account.login({ username, password, ip: request.ip, appName });
       return { token, currentTenantId: user.currentTenantId };
     }
   );
+
+  fastify.post(
+    `${options.prefix}/modifyPassword`,
+    {
+      schema: {
+        tags: ['账号'],
+        summary: '新用户重置新密码',
+        body: {
+          oneOf: [
+            {
+              type: 'object',
+              required: ['email', 'newPwd', 'oldPwd'],
+              properties: {
+                email: { type: 'string', description: '邮箱' },
+                newPwd: { type: 'string', description: '新密码' },
+                oldPwd: { type: 'string', description: '原密码' }
+              }
+            },
+            {
+              type: 'object',
+              required: ['phone', 'newPwd', 'oldPwd'],
+              properties: {
+                phone: { type: 'string', description: '手机号' },
+                newPwd: { type: 'string', description: '新密码' },
+                oldPwd: { type: 'string', description: '原密码' }
+              }
+            }
+          ]
+        }
+      }
+    },
+    async request => {
+      await services.account.modifyPassword(request.body);
+      return {};
+    }
+  );
+
+  fastify.post(
+    `${options.prefix}/resetPassword`,
+    {
+      schema: {
+        tags: ['账号'],
+        summary: '用户重置密码',
+        body: {
+          type: 'object',
+          required: ['newPwd', 'token'],
+          properties: {
+            newPwd: { type: 'string', description: '新密码' },
+            token: { type: 'string', description: '验证token' }
+          }
+        }
+      }
+    },
+    async request => {
+      await services.account.resetPasswordByToken({
+        password: request.body.newPwd,
+        token: request.body.token
+      });
+
+      return {};
+    }
+  );
+
+  fastify.post(
+    `${options.prefix}/forgetPwd`,
+    {
+      schema: {
+        tags: ['账号'],
+        summary: '忘记密码',
+        body: {
+          oneOf: [
+            {
+              type: 'object',
+              required: ['email'],
+              properties: {
+                email: { type: 'string', description: '邮箱' }
+              }
+            },
+            {
+              type: 'object',
+              required: ['phone'],
+              properties: {
+                phone: { type: 'string', description: '手机号' }
+              }
+            }
+          ]
+        }
+      }
+    },
+    async request => {
+      const name = request.body.email || request.body.phone;
+      const token = await services.account.sendJWTVerificationCode({ name, type: 5 });
+      return options.isTest ? { token } : {};
+    }
+  );
+
+  fastify.post(
+    `${options.prefix}/parseResetToken`,
+    {
+      schema: {
+        tags: ['账号'],
+        summary: '通过token获取name',
+        body: {
+          type: 'object',
+          required: ['token'],
+          properties: {
+            token: { type: 'string' }
+          }
+        }
+      }
+    },
+    async request => {
+      const { name } = await services.account.verificationJWTCodeValidate(request.body);
+      return { name };
+    }
+  );
 });