@kne/fastify-account 1.0.0-alpha.17 → 1.0.0-alpha.18

package/index.js

@@ -17,11 +17,10 @@ module.exports = fp(
           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,
@@ -46,14 +45,41 @@ module.exports = fp(
               }
               request.authenticatePayload = info.payload;
               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.tenantUser.getTenantUserByUserId(request.userInfo);
+              request.tenantInfo = await fastify.account.services.tenantUser.getTenantUserByUserId({
+                userInfo: request.userInfo,
+                appName: request.appName
+              });
+              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 => {
               if (!(await fastify.account.services.admin.checkIsSuperAdmin(request.userInfo))) {
                 throw Unauthorized('不能执行该操作，需要超级管理员权限');
               }
+              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');

package/libs/controllers/account.js

@@ -32,7 +32,7 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { email } = request.body;
-      const code = await services.account.sendVerificationCode({ name: email, type: 0, messageType: 1 });
+      const code = await services.account.sendVerificationCode({ name: email, type: 0 });
       return options.isTest ? { code } : {};
     }
   );
@@ -68,7 +68,7 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { phone } = request.body;
-      const code = await services.account.sendVerificationCode({ name: phone, type: 0, messageType: 0 });
+      const code = await services.account.sendVerificationCode({ name: phone, type: 0 });
       return options.isTest ? { code } : {};
     }
   );
@@ -249,7 +249,8 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { username, password } = request.body;
-      const { token, user } = await 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 };
     }
   );
@@ -297,32 +298,17 @@ module.exports = fp(async (fastify, options) => {
         tags: ['账号'],
         summary: '用户重置密码',
         body: {
-          oneOf: [
-            {
-              type: 'object',
-              required: ['email', 'newPwd', 'token'],
-              properties: {
-                email: { type: 'string', description: '邮箱' },
-                newPwd: { type: 'string', description: '新密码' },
-                token: { type: 'string', description: '验证token' }
-              }
-            },
-            {
-              type: 'object',
-              required: ['phone', 'newPwd'],
-              properties: {
-                phone: { type: 'string', description: '手机号' },
-                newPwd: { type: 'string', description: '新密码' },
-                token: { type: 'string', description: '验证token' }
-              }
-            }
-          ]
+          type: 'object',
+          required: ['newPwd', 'token'],
+          properties: {
+            newPwd: { type: 'string', description: '新密码' },
+            token: { type: 'string', description: '验证token' }
+          }
         }
       }
     },
     async request => {
-      await services.account.resetPassword({
-        email: request.body.email,
+      await services.account.resetPasswordByToken({
         password: request.body.newPwd,
         token: request.body.token
       });
@@ -359,7 +345,7 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const name = request.body.email || request.body.phone;
-      const token = await services.account.sendJWTVerificationCode({ name, type: 5, messageType: 3 });
+      const token = await services.account.sendJWTVerificationCode({ name, type: 5 });
       return options.isTest ? { token } : {};
     }
   );

package/libs/controllers/adminTenant.js

@@ -66,253 +66,6 @@ module.exports = fp(async (fastify, options) => {
     }
   );
 
-  fastify.post(
-    `${options.prefix}/admin/addTenant`,
-    {
-      onRequest: [authenticate.user, 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 services.tenant.addTenant(request.body);
-      return {};
-    }
-  );
-
-  fastify.post(
-    `${options.prefix}/admin/saveTenant`,
-    {
-      onRequest: [authenticate.user, 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 services.tenant.saveTenant(request.body);
-      return {};
-    }
-  );
-
-  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: ['tenantId', 'id'],
-      properties: {
-        tenantId: { type: 'string' },
-        id: { type: 'number' }
-      }
-    },
-    async request => {
-      await services.tenantOrg.deleteTenantOrg(request.body);
-      return {};
-    }
-  );
-
-  fastify.get(
-    `${options.prefix}/admin/getTenantUserList`,
-    {
-      onRequest: [authenticate.user, authenticate.admin],
-      schema: {
-        query: {
-          type: 'object',
-          properties: {
-            tenantId: { type: 'string' },
-            filter: {
-              type: 'object',
-              properties: {
-                name: { type: 'string' }
-              }
-            },
-            currentPage: { type: 'number' },
-            perPage: { type: 'number' }
-          }
-        }
-      }
-    },
-    async request => {
-      const { filter, tenantId, currentPage, perPage } = Object.assign(
-        {},
-        {
-          filter: {},
-          currentPage: 1,
-          perPage: 20
-        },
-        request.query
-      );
-      return await services.tenantUser.getTenantUserList({ tenantId, filter, currentPage, perPage });
-    }
-  );
-
-  fastify.post(
-    `${options.prefix}/admin/addTenantUser`,
-    {
-      onRequest: [authenticate.user, authenticate.admin],
-      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 services.tenantUser.addTenantUser(request.body);
-      return {};
-    }
-  );
-
-  fastify.post(
-    `${options.prefix}/admin/saveTenantUser`,
-    {
-      onRequest: [authenticate.user, authenticate.admin],
-      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 services.tenantUser.saveTenantUser(request.body);
-      return {};
-    }
-  );
-
-  fastify.post(
-    `${options.prefix}/admin/deleteTenantUser`,
-    {
-      onRequest: [authenticate.user, authenticate.admin],
-      schema: {
-        body: {
-          type: 'object',
-          required: ['tenantId', 'tenantUserId'],
-          properties: {
-            tenantId: { type: 'string' },
-            tenantUserId: { type: 'string' }
-          }
-        }
-      }
-    },
-    async request => {
-      const { tenantId, tenantUserId } = request.body;
-      await services.tenantUser.deleteTenantUser({ tenantId, tenantUserId });
-      return {};
-    }
-  );
-
   fastify.post(
     `${options.prefix}/admin/closeTenant`,
     {
@@ -356,45 +109,60 @@ module.exports = fp(async (fastify, options) => {
   );
 
   fastify.post(
-    `${options.prefix}/admin/closeTenantUser`,
+    `${options.prefix}/admin/addTenant`,
     {
       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 services.tenantUser.closeTenantUser({ tenantId, tenantUserId });
+      await services.tenant.addTenant(request.body);
       return {};
     }
   );
 
   fastify.post(
-    `${options.prefix}/admin/openTenantUser`,
+    `${options.prefix}/admin/saveTenant`,
     {
       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 services.tenantUser.openTenantUser({ tenantId, tenantUserId });
+      await services.tenant.saveTenant(request.body);
       return {};
     }
   );

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/adminTenantUser.js

@@ -0,0 +1,168 @@
+const fp = require('fastify-plugin');
+
+module.exports = fp(async (fastify, options) => {
+  const { authenticate, services } = fastify.account;
+  fastify.get(
+    `${options.prefix}/admin/getTenantUserList`,
+    {
+      onRequest: [authenticate.user, authenticate.admin],
+      schema: {
+        query: {
+          type: 'object',
+          properties: {
+            tenantId: { type: 'string' },
+            filter: {
+              type: 'object',
+              properties: {
+                name: { type: 'string' }
+              }
+            },
+            currentPage: { type: 'number' },
+            perPage: { type: 'number' }
+          }
+        }
+      }
+    },
+    async request => {
+      const { filter, tenantId, currentPage, perPage } = Object.assign(
+        {},
+        {
+          filter: {},
+          currentPage: 1,
+          perPage: 20
+        },
+        request.query
+      );
+      return await services.tenantUser.getTenantUserList({ tenantId, filter, currentPage, perPage });
+    }
+  );
+
+  fastify.post(
+    `${options.prefix}/admin/addTenantUser`,
+    {
+      onRequest: [authenticate.user, authenticate.admin],
+      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 services.tenantUser.addTenantUser(request.body);
+      return {};
+    }
+  );
+
+  fastify.post(
+    `${options.prefix}/admin/saveTenantUser`,
+    {
+      onRequest: [authenticate.user, authenticate.admin],
+      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 services.tenantUser.saveTenantUser(request.body);
+      return {};
+    }
+  );
+
+  fastify.post(
+    `${options.prefix}/admin/deleteTenantUser`,
+    {
+      onRequest: [authenticate.user, authenticate.admin],
+      schema: {
+        body: {
+          type: 'object',
+          required: ['tenantId', 'tenantUserId'],
+          properties: {
+            tenantId: { type: 'string' },
+            tenantUserId: { type: 'string' }
+          }
+        }
+      }
+    },
+    async request => {
+      const { tenantId, tenantUserId } = request.body;
+      await services.tenantUser.deleteTenantUser({ tenantId, tenantUserId });
+      return {};
+    }
+  );
+
+  fastify.post(
+    `${options.prefix}/admin/closeTenantUser`,
+    {
+      onRequest: [authenticate.user, authenticate.admin],
+      schema: {
+        body: {
+          type: 'object',
+          required: ['tenantId', 'tenantUserId'],
+          properties: {
+            tenantId: { type: 'string' },
+            tenantUserId: { type: 'string' }
+          }
+        }
+      }
+    },
+    async request => {
+      const { tenantId, tenantUserId } = request.body;
+      await services.tenantUser.closeTenantUser({ tenantId, tenantUserId });
+      return {};
+    }
+  );
+
+  fastify.post(
+    `${options.prefix}/admin/openTenantUser`,
+    {
+      onRequest: [authenticate.user, authenticate.admin],
+      schema: {
+        body: {
+          type: 'object',
+          required: ['tenantId', 'tenantUserId'],
+          properties: {
+            tenantId: { type: 'string' },
+            tenantUserId: { type: 'string' }
+          }
+        }
+      }
+    },
+    async request => {
+      const { tenantId, tenantUserId } = request.body;
+      await services.tenantUser.openTenantUser({ tenantId, tenantUserId });
+      return {};
+    }
+  );
+});