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

package/libs/controllers/tenant.js

@@ -20,50 +20,4 @@ module.exports = fp(async (fastify, options) => {
       return request.tenantInfo;
     }
   );
-
-  fastify.get(
-    `${options.prefix}/tenant/getTenantUserList`,
-    {
-      onRequest: [authenticate.user, authenticate.tenant],
-      schema: {
-        query: {
-          type: 'object',
-          properties: {
-            filter: {
-              type: 'object',
-              properties: {
-                name: { type: 'string' }
-              }
-            },
-            currentPage: { type: 'number' },
-            perPage: { type: 'number' }
-          }
-        }
-      }
-    },
-    async request => {
-      const { id: tenantId } = request.tenantInfo.tenant;
-      const { filter, currentPage, perPage } = Object.assign(
-        {},
-        {
-          filter: {},
-          currentPage: 1,
-          perPage: 20
-        },
-        request.query
-      );
-      return await services.tenantUser.getTenantUserList({ tenantId, currentPage, perPage, filter });
-    }
-  );
-
-  fastify.get(
-    `${options.prefix}/tenant/orgList`,
-    {
-      onRequest: [authenticate.user, authenticate.tenant]
-    },
-    async request => {
-      const { id: tenantId } = request.tenantInfo.tenant;
-      return await services.tenantOrg.getTenantOrgList({ tenantId });
-    }
-  );
 });

package/libs/controllers/tenantOrg.js

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

package/libs/controllers/tenantRole.js

@@ -0,0 +1,219 @@
+const fp = require('fastify-plugin');
+
+module.exports = fp(async (fastify, options) => {
+  const { authenticate, services } = fastify.account;
+  fastify.get(
+    `${options.prefix}/tenant/getRoleList`,
+    {
+      onRequest: [authenticate.user, authenticate.tenant],
+      schema: {
+        query: {
+          type: 'object',
+          properties: {
+            perPage: { type: 'number' },
+            currentPage: { type: 'number' },
+            filter: {
+              type: 'object',
+              properties: {
+                type: { type: 'number' }
+              }
+            }
+          }
+        }
+      }
+    },
+    async request => {
+      const { id: tenantId } = request.tenantInfo.tenant;
+      const { filter, perPage, currentPage } = Object.assign(
+        {
+          perPage: 20,
+          currentPage: 1,
+          filter: {}
+        },
+        request.query
+      );
+      return await services.tenantRole.getTenantRoleList({ tenantId, perPage, currentPage, filter });
+    }
+  );
+
+  fastify.post(
+    `${options.prefix}/tenant/addRole`,
+    {
+      onRequest: [authenticate.user, authenticate.tenant],
+      schema: {
+        body: {
+          type: 'object',
+          required: ['name'],
+          properties: {
+            name: { type: 'string' },
+            description: { type: 'string' }
+          }
+        }
+      }
+    },
+    async request => {
+      const { id: tenantId } = request.tenantInfo.tenant;
+      const { name, description } = request.body;
+      await services.tenantRole.addTenantRole({ tenantId, name, description });
+
+      return {};
+    }
+  );
+
+  fastify.post(
+    `${options.prefix}/tenant/saveRole`,
+    {
+      onRequest: [authenticate.user, authenticate.tenant],
+      schema: {
+        body: {
+          type: 'object',
+          required: ['name', 'id'],
+          properties: {
+            id: { type: 'number' },
+            name: { type: 'string' },
+            description: { type: 'string' }
+          }
+        }
+      }
+    },
+    async request => {
+      const { id: tenantId } = request.tenantInfo.tenant;
+      await services.tenantRole.saveTenantRole(Object.assign({}, request.body, { tenantId }));
+      return {};
+    }
+  );
+
+  fastify.post(
+    `${options.prefix}/tenant/removeRole`,
+    {
+      onRequest: [authenticate.user, authenticate.tenant],
+      schema: {
+        body: {
+          type: 'object',
+          required: ['id'],
+          properties: {
+            id: { type: 'number' }
+          }
+        }
+      }
+    },
+    async request => {
+      const { id: tenantId } = request.tenantInfo.tenant;
+      const { id } = request.body;
+      await services.tenantRole.removeTenantRole({ id, tenantId });
+      return {};
+    }
+  );
+
+  fastify.get(
+    `${options.prefix}/tenant/getRolePermissionList`,
+    {
+      onRequest: [authenticate.user, authenticate.tenant],
+      schema: {
+        query: {
+          type: 'object',
+          required: ['id'],
+          properties: {
+            id: { type: 'number' }
+          }
+        }
+      }
+    },
+    async request => {
+      const { id: tenantId } = request.tenantInfo.tenant;
+      const { id } = request.query;
+      return await services.permission.getRolePermissionList({ roleId: id, tenantId });
+    }
+  );
+
+  fastify.post(
+    `${options.prefix}/tenant/saveRolePermissionList`,
+    {
+      onRequest: [authenticate.user, authenticate.tenant],
+      schema: {
+        roleId: { type: 'string' },
+        applications: {
+          type: 'array',
+          items: { type: 'string' }
+        },
+        permissions: {
+          type: 'array',
+          items: { type: 'number' }
+        }
+      }
+    },
+    async request => {
+      const { id: tenantId } = request.tenantInfo.tenant;
+      await services.permission.saveRolePermissionList(Object.assign({}, request.body, { tenantId }));
+      return {};
+    }
+  );
+
+  fastify.get(
+    `${options.prefix}/tenant/getApplicationList`,
+    {
+      onRequest: [authenticate.user, authenticate.tenant],
+      schema: {
+        tags: ['租户管理-权限'],
+        summary: '获取应用列表'
+      }
+    },
+    async request => {
+      const { id: tenantId } = request.tenantInfo.tenant;
+      const appName = request.headers['x-app-name'];
+      return await services.application.getApplicationList({ tenantId, appName });
+    }
+  );
+
+  fastify.get(
+    `${options.prefix}/tenant/getPermissionList`,
+    {
+      onRequest: [authenticate.user, authenticate.tenant],
+      schema: {
+        tags: ['租户管理-权限'],
+        summary: '获取应用权限列表',
+        query: {
+          type: 'object',
+          required: ['applicationId'],
+          properties: {
+            applicationId: { type: 'string' }
+          }
+        },
+        response: {
+          200: {
+            content: {
+              'application/json': {
+                schema: {
+                  type: 'array',
+                  items: {
+                    type: 'object',
+                    properties: {
+                      id: { type: 'number' },
+                      code: { type: 'string' },
+                      name: { type: 'string' },
+                      isModule: { type: 'number' },
+                      isMust: { type: 'number' },
+                      type: { type: 'number' },
+                      pid: { type: 'number' },
+                      paths: { type: 'array', items: { type: 'number' } },
+                      description: { type: 'string' },
+                      status: { type: 'number' },
+                      createdAt: { type: 'string' },
+                      updatedAt: { type: 'string' },
+                      deletedAt: { type: 'string' }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    async request => {
+      const { id: tenantId } = request.tenantInfo.tenant;
+      const { applicationId } = request.query;
+      return await services.permission.getPermissionList({ applicationId, tenantId });
+    }
+  );
+});

package/libs/controllers/tenantUser.js

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

package/libs/models/company-info.js

@@ -0,0 +1,25 @@
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
+      tenantId: {
+        type: DataTypes.UUID,
+        allowNull: false
+      },
+      name: {
+        type: DataTypes.STRING
+      },
+      shortName: {
+        type: DataTypes.STRING
+      },
+      themeColor: {
+        type: DataTypes.STRING
+      },
+      logo: {
+        type: DataTypes.STRING
+      },
+      description: {
+        type: DataTypes.TEXT
+      }
+    }
+  };
+};

package/libs/models/login-log.js

@@ -5,7 +5,13 @@ module.exports = ({ DataTypes }) => {
         type: DataTypes.UUID,
         allowNull: false
       },
-      ip: DataTypes.STRING
+      ip: DataTypes.STRING,
+      currentTenantId: {
+        type: DataTypes.UUID
+      },
+      applicationId: {
+        type: DataTypes.UUID
+      }
     }
   };
 };

package/libs/models/request-log.js

@@ -0,0 +1,27 @@
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
+      userId: {
+        type: DataTypes.UUID, allowNull: false
+      }, tenantId: {
+        type: DataTypes.UUID
+      }, type: {
+        type: DataTypes.STRING, comment: 'user,tenant,admin'
+      }, applicationId: {
+        type: DataTypes.UUID
+      }, action: {
+        type: DataTypes.TEXT
+      }, summary: {
+        type: DataTypes.TEXT
+      }
+    }, options: {
+      indexes: [{
+        fields: ['user_id', 'type']
+      }, {
+        fields: ['tenant_id', 'type']
+      }, {
+        fields: ['action', 'type']
+      }]
+    }
+  };
+};

package/libs/services/account.js

@@ -14,7 +14,7 @@ function userNameIsEmail(username) {
 
 module.exports = fp(async (fastify, options) => {
   const { models, services } = fastify.account;
-  const login = async ({ username, password, ip }) => {
+  const login = async ({ username, password, ip, appName }) => {
     const isEmail = userNameIsEmail(username);
     const user = await models.user.findOne({
       where: Object.assign(
@@ -40,9 +40,13 @@ module.exports = fp(async (fastify, options) => {
 
     await passwordAuthentication({ accountId: user.userAccountId, password });
 
+    const application = appName && (await services.application.getApplicationByCode({ code: appName }));
+
     await models.loginLog.create({
       userId: user.uuid,
-      ip
+      ip,
+      currentTenantId: user.currentTenantId,
+      applicationId: application?.id
     });
 
     return {
@@ -51,22 +55,25 @@ module.exports = fp(async (fastify, options) => {
     };
   };
 
+  const resetPassword = async ({ password, userId }) => {
+    const userInfo = await services.user.getUserInstance({ id: userId });
+    const account = await models.userAccount.create(
+      Object.assign({}, await passwordEncryption(password), {
+        belongToUserId: userInfo.uuid
+      })
+    );
+
+    await userInfo.update({ userAccountId: account.uuid });
+  };
+
+  const resetPasswordByToken = async ({ password, token }) => {
+    const { name } = await verificationJWTCodeValidate({ token });
+    const user = await services.user.getUserInstanceByName({ name, status: [0, 1] });
+    await resetPassword({ password, userId: user.uuid });
+  };
+
   const modifyPassword = async ({ email, phone, oldPwd, newPwd }) => {
-    const user = await models.user.findOne({
-      where: Object.assign(
-        {},
-        email
-          ? {
-              email
-            }
-          : {
-              phone
-            },
-        {
-          status: 1
-        }
-      )
-    });
+    const user = await services.user.getUserInstanceByName({ name: email || phone, status: 1 });
     if (!user) {
       throw new Error('新用户密码只能初始化一次');
     }
@@ -111,30 +118,9 @@ module.exports = fp(async (fastify, options) => {
     return hash.digest('hex');
   };
 
-  const resetPassword = async ({ password, token }) => {
-    const { name } = await verificationJWTCodeValidate({ token });
-
-    const isEmail = userNameIsEmail(name);
-
-    const userInfo = await models.user.findOne({
-      where: isEmail ? { email: name } : { phone: name }
-    });
-    if (!userInfo) {
-      throw new Error('用户不存在');
-    }
-    const account = await models.userAccount.create(
-      Object.assign({}, await passwordEncryption(password), {
-        belongToUserId: userInfo.uuid
-      })
-    );
-
-    await userInfo.update({ userAccountId: account.uuid });
-  };
-
   const register = async ({ avatar, nickname, gender, birthday, description, phone, email, code, password, status, invitationCode }) => {
     const type = phone ? 0 : 1;
-
-    if (!(await verificationCodeValidate({ name: type === 0 ? phone : email, type, code }))) {
+    if (!(await verificationCodeValidate({ name: type === 0 ? phone : email, type: 0, code }))) {
       throw new Error('验证码不正确或者已经过期');
     }
 
@@ -173,9 +159,12 @@ module.exports = fp(async (fastify, options) => {
     return code;
   };
 
-  const sendVerificationCode = async ({ name, type, messageType }) => {
+  const sendVerificationCode = async ({ name, type }) => {
+    // messageType: 0:短信验证码，1:邮件验证码 type: 0:注册,2:登录,4:验证租户管理员,5:忘记密码
     const code = await generateVerificationCode({ name, type });
+    const isEmail = userNameIsEmail(name);
     // 这里写发送逻辑
+    await options.sendMessage({ name, type, messageType: isEmail ? 1 : 0, props: { code } });
     return code;
   };
 
@@ -200,10 +189,12 @@ module.exports = fp(async (fastify, options) => {
     return isPass;
   };
 
-  const sendJWTVerificationCode = async ({ name, type, messageType }) => {
+  const sendJWTVerificationCode = async ({ name, type }) => {
     const code = await generateVerificationCode({ name, type });
     const token = fastify.jwt.sign({ name, type, code });
+    const isEmail = userNameIsEmail(name);
     // 这里写发送逻辑
+    await options.sendMessage({ name, type, messageType: isEmail ? 1 : 0, props: { token } });
     return token;
   };
 
@@ -227,6 +218,7 @@ module.exports = fp(async (fastify, options) => {
     verificationJWTCodeValidate,
     passwordEncryption,
     passwordAuthentication,
-    resetPassword
+    resetPassword,
+    resetPasswordByToken
   };
 });