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

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/controllers/user.js

@@ -1,9 +1,10 @@
 const fp = require('fastify-plugin');
 module.exports = fp(async (fastify, options) => {
+  const { authenticate, services } = fastify.account;
   fastify.get(
     `${options.prefix}/getUserInfo`,
     {
-      onRequest: [fastify.account.authenticate.user]
+      onRequest: [authenticate.user]
     },
     async request => {
       return { userInfo: request.userInfo };
@@ -13,7 +14,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/setCurrentTenantId`,
     {
-      onRequest: [fastify.account.authenticate.user],
+      onRequest: [authenticate.user],
       schema: {
         body: {
           type: 'object',
@@ -26,7 +27,7 @@ module.exports = fp(async (fastify, options) => {
     },
     async request => {
       const { tenantId } = request.body;
-      await fastify.account.services.user.setCurrentTenantId({ id: request.userInfo.id, tenantId });
+      await services.user.setCurrentTenantId({ id: request.userInfo.id, tenantId });
       return {};
     }
   );

package/libs/models/admin-role.js

@@ -1,7 +1,6 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'adminRole',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       userId: {
         type: DataTypes.UUID,
         allowNull: false
@@ -11,9 +10,6 @@ module.exports = (sequelize, DataTypes) => {
         allowNull: false
       },
       target: DataTypes.STRING
-    },
-    {
-      paranoid: true
     }
-  );
+  };
 };

package/libs/models/application.js

@@ -1,12 +1,15 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'application',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       id: {
-        type: DataTypes.UUID,
-        defaultValue: DataTypes.UUIDV4,
+        type: DataTypes.INTEGER,
+        autoIncrement: true,
         primaryKey: true
       },
+      uuid: {
+        type: DataTypes.UUID,
+        defaultValue: DataTypes.UUIDV4
+      },
       avatar: DataTypes.STRING,
       name: {
         type: DataTypes.STRING,
@@ -23,14 +26,17 @@ module.exports = (sequelize, DataTypes) => {
         defaultValue: 0
       }
     },
-    {
-      paranoid: true,
+    options: {
       indexes: [
         {
           unique: true,
-          fields: ['code', 'deletedAt']
+          fields: ['code', 'deleted_at']
+        },
+        {
+          unique: true,
+          fields: ['uuid', 'deleted_at']
         }
       ]
     }
-  );
+  };
 };

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

@@ -1,15 +1,17 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'loginLog',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       userId: {
         type: DataTypes.UUID,
         allowNull: false
       },
-      ip: DataTypes.STRING
-    },
-    {
-      paranoid: true
+      ip: DataTypes.STRING,
+      currentTenantId: {
+        type: DataTypes.UUID
+      },
+      applicationId: {
+        type: DataTypes.UUID
+      }
     }
-  );
+  };
 };

package/libs/models/permission.js

@@ -1,9 +1,8 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'permission',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       applicationId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       code: {
@@ -40,14 +39,13 @@ module.exports = (sequelize, DataTypes) => {
         defaultValue: 0
       }
     },
-    {
-      paranoid: true,
+    options: {
       indexes: [
         {
           unique: true,
-          fields: ['code', 'applicationId', 'pid', 'deletedAt']
+          fields: ['code', 'application_id', 'pid', 'deleted_at']
         }
       ]
     }
-  );
+  };
 };

package/libs/models/request-log.js

@@ -0,0 +1,43 @@
+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.STRING
+      },
+      summary: {
+        type: DataTypes.TEXT
+      }
+    },
+    options: {
+      indexes: [
+        {
+          fields: ['user_id', 'type']
+        },
+        {
+          fields: ['tenant_id', 'type']
+        },
+        {
+          fields: ['action', 'type']
+        }
+      ]
+    },
+    associate: ({ requestLog, application, user }) => {
+      requestLog.belongsTo(application, { targetKey: 'uuid', constraints: false });
+      requestLog.belongsTo(user, { targetKey: 'uuid', constraints: false });
+    }
+  };
+};

package/libs/models/tenant-application.js

@@ -1,13 +1,12 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'tenantApplication',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       tenantId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       applicationId: {
-        type: DataTypes.INTEGER,
+        type: DataTypes.UUID,
         allowNull: false
       },
       status: {
@@ -15,14 +14,13 @@ module.exports = (sequelize, DataTypes) => {
         defaultValue: 0 //0:开启  11:关闭
       }
     },
-    {
-      paranoid: true,
+    options: {
       indexes: [
         {
           unique: true,
-          fields: ['tenantId', 'applicationId', 'deletedAt']
+          fields: ['tenant_id', 'application_id', 'deleted_at']
         }
       ]
     }
-  );
+  };
 };

package/libs/models/tenant-org.js

@@ -1,9 +1,8 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'tenantOrg',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       tenantId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       name: {
@@ -22,9 +21,6 @@ module.exports = (sequelize, DataTypes) => {
         type: DataTypes.INTEGER,
         defaultValue: 0
       }
-    },
-    {
-      paranoid: true
     }
-  );
+  };
 };

package/libs/models/tenant-permission.js

@@ -1,9 +1,8 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'tenantPermission',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       tenantId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       permissionId: {
@@ -15,14 +14,13 @@ module.exports = (sequelize, DataTypes) => {
         defaultValue: 0 //0:开启  11:关闭
       }
     },
-    {
-      paranoid: true,
+    options: {
       indexes: [
         {
           unique: true,
-          fields: ['tenantId', 'permissionId', 'deletedAt']
+          fields: ['tenant_id', 'permission_id', 'deleted_at']
         }
       ]
     }
-  );
+  };
 };

package/libs/models/tenant-role-application.js

@@ -1,13 +1,12 @@
-module.exports = (sequelize, DataTypes) => {
-  const tenantRoleApplication = sequelize.define(
-    'tenantRoleApplication',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       tenantId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       applicationId: {
-        type: DataTypes.INTEGER,
+        type: DataTypes.UUID,
         allowNull: false
       },
       roleId: {
@@ -19,19 +18,20 @@ module.exports = (sequelize, DataTypes) => {
         defaultValue: 0 //0:开启  11:关闭
       }
     },
-    {
-      paranoid: true,
+    options: {
       indexes: [
         {
           name: 'application_key',
           unique: true,
-          fields: ['tenantId', 'applicationId', 'roleId', 'deletedAt']
+          fields: ['tenant_id', 'application_id', 'role_id', 'deleted_at']
         }
       ]
+    },
+    associate: ({ tenantRoleApplication, application }) => {
+      tenantRoleApplication.belongsTo(application, {
+        targetKey: 'uuid',
+        constraints: false
+      });
     }
-  );
-  tenantRoleApplication.associate = ({ tenantRoleApplication, application }) => {
-    tenantRoleApplication.belongsTo(application);
   };
-  return tenantRoleApplication;
 };

package/libs/models/tenant-role-permission.js

@@ -1,9 +1,8 @@
-module.exports = (sequelize, DataTypes) => {
-  const tenantRolePermission = sequelize.define(
-    'tenantRolePermission',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       tenantId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       permissionId: {
@@ -19,21 +18,17 @@ module.exports = (sequelize, DataTypes) => {
         defaultValue: 0 //0:开启  11:关闭
       }
     },
-    {
-      paranoid: true,
+    options: {
       indexes: [
         {
           name: 'permission_key',
           unique: true,
-          fields: ['tenantId', 'permissionId', 'roleId', 'deletedAt']
+          fields: ['tenant_id', 'permission_id', 'role_id', 'deleted_at']
         }
       ]
+    },
+    associate: ({ tenantRolePermission, permission }) => {
+      tenantRolePermission.belongsTo(permission, { constraints: false });
     }
-  );
-
-  tenantRolePermission.associate = ({ tenantRolePermission, permission }) => {
-    tenantRolePermission.belongsTo(permission);
   };
-
-  return tenantRolePermission;
 };

package/libs/models/tenant-role.js

@@ -1,9 +1,8 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'tenantRole',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       tenantId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       name: {
@@ -19,9 +18,6 @@ module.exports = (sequelize, DataTypes) => {
         defaultValue: 0 //0:用户自定义,1:系统默认
       },
       description: DataTypes.TEXT
-    },
-    {
-      paranoid: true
     }
-  );
+  };
 };

package/libs/models/tenant-share-group-permission.js

@@ -1,9 +1,8 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'tenantShareGroup',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       tenantId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       tenantShareGroupId: {
@@ -14,9 +13,6 @@ module.exports = (sequelize, DataTypes) => {
         type: DataTypes.INTEGER,
         allowNull: false
       }
-    },
-    {
-      paranoid: true
     }
-  );
+  };
 };

package/libs/models/tenant-share-group.js

@@ -1,9 +1,8 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'tenantShareGroup',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       tenantId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       name: {
@@ -14,9 +13,6 @@ module.exports = (sequelize, DataTypes) => {
         type: DataTypes.INTEGER,
         defaultValue: 0
       }
-    },
-    {
-      paranoid: true
     }
-  );
+  };
 };

package/libs/models/tenant-source-user-share-group.js

@@ -1,9 +1,8 @@
-module.exports = (sequelize, DataTypes) => {
-  return sequelize.define(
-    'tenantUserShareGroup',
-    {
+module.exports = ({ DataTypes }) => {
+  return {
+    model: {
       tenantId: {
-        type: DataTypes.STRING,
+        type: DataTypes.UUID,
         allowNull: false
       },
       tenantUserId: {
@@ -14,9 +13,6 @@ module.exports = (sequelize, DataTypes) => {
         type: DataTypes.INTEGER,
         allowNull: false
       }
-    },
-    {
-      paranoid: true
     }
-  );
+  };
 };