@kne/fastify-account 1.0.0-alpha.9 → 2.0.0-alpha.1

package/libs/controllers/admin.js

@@ -1,154 +1,63 @@
 const fp = require('fastify-plugin');
 
-module.exports = fp(async (fastify, options) => {
-  const { authenticate, services } = fastify.account;
-  // 用于系统初始化时，设置第一个用户，只能使用一次，其他用户由该用户创建
-  fastify.post(
-    `${options.prefix}/initSuperAdmin`,
-    {
-      onRequest: [authenticate.user]
-    },
-    async request => {
-      await services.admin.initSuperAdmin(await services.user.getUser(request.authenticatePayload));
-      return {};
-    }
-  );
-
-  fastify.get(
-    `${options.prefix}/admin/getSuperAdminInfo`,
-    {
-      onRequest: [authenticate.user, authenticate.admin]
-    },
-    async request => {
-      return { userInfo: request.userInfo };
-    }
-  );
-
-  fastify.post(
-    `${options.prefix}/admin/addUser`,
-    {
-      onRequest: [authenticate.user, authenticate.admin],
-      schema: {
-        body: {}
-      }
-    },
-    async request => {
-      const userInfo = request.body;
-      await services.admin.addUser(Object.assign({}, userInfo, { password: services.account.md5(options.defaultPassword) }));
-      return {};
-    }
-  );
-
-  fastify.get(
-    `${options.prefix}/admin/getAllUserList`,
-    {
-      onRequest: [authenticate.user, authenticate.admin],
-      schema: {
-        query: {}
-      }
-    },
-    async request => {
-      const { filter, perPage, currentPage } = Object.assign(
+const adminController = fp(async (fastify, options) => {
+    const {services, authenticate} = fastify[options.name];
+    fastify.post(
+        `${options.prefix}/admin/initSuperAdmin`,
         {
-          perPage: 20,
-          currentPage: 1
+            onRequest: [authenticate.user],
+            schema: {
+                tags: ['管理后台'],
+                summary: '初始化用户为管理员',
+                description: '用于系统初始化时，设置第一个用户，只能使用一次，其他用户由该用户创建'
+            }
         },
-        request.query
-      );
-      return await services.user.getAllUserList({
-        filter,
-        perPage,
-        currentPage
-      });
-    }
-  );
-
-  fastify.post(
-    `${options.prefix}/admin/resetUserPassword`,
-    {
-      onRequest: [authenticate.user, authenticate.admin],
-      schema: {
-        body: {
-          type: 'object',
-          required: ['userId', 'password'],
-          properties: {
-            password: { type: 'string' },
-            userId: { type: 'string' }
-          }
-        }
-      }
-    },
-    async request => {
-      await services.admin.resetUserPassword(request.body);
-      return {};
-    }
-  );
-
-  fastify.post(
-    `${options.prefix}/admin/saveUser`,
-    {
-      onRequest: [authenticate.user, authenticate.admin],
-      schema: {
-        body: {
-          type: 'object',
-          required: ['id'],
-          properties: {
-            id: { type: 'string' },
-            avatar: { type: 'string' },
-            nickname: { type: 'string' },
-            phone: { type: 'string' },
-            email: { type: 'string' },
-            description: { type: 'string' }
-          }
+        async request => {
+            await services.admin.initSuperAdmin(request.userInfo);
+            return {};
         }
-      }
-    },
-    async request => {
-      const user = request.body;
-      await services.user.saveUser(user);
-      return {};
-    }
-  );
+    );
 
-  fastify.post(
-    `${options.prefix}/admin/closeUser`,
-    {
-      onRequest: [authenticate.user, authenticate.admin],
-      schema: {
-        body: {
-          type: 'object',
-          required: ['id'],
-          properties: {
-            id: { type: 'string' }
-          }
-        }
-      }
-    },
-    async request => {
-      const { id } = request.body;
-      await services.user.closeUser({ id });
-      return {};
-    }
-  );
-
-  fastify.post(
-    `${options.prefix}/admin/openUser`,
-    {
-      onRequest: [authenticate.user, authenticate.admin],
-      schema: {
-        body: {
-          type: 'object',
-          required: ['id'],
-          properties: {
-            id: { type: 'string' }
-          }
+    fastify.get(
+        `${options.prefix}/admin/getSuperAdminInfo`,
+        {
+            onRequest: [authenticate.user, authenticate.admin],
+            schema: {
+                tags: ['管理后台'],
+                summary: '获取管理员信息',
+                response: {
+                    200: {
+                        content: {
+                            'application/json': {
+                                schema: {
+                                    type: 'object',
+                                    properties: {
+                                        userInfo: {
+                                            type: 'object',
+                                            properties: {
+                                                id: {type: 'string', description: '用户id'},
+                                                nickname: {type: 'string', description: '用户昵称'},
+                                                email: {type: 'string', description: '邮箱'},
+                                                phone: {type: 'string', description: '电话'},
+                                                gender: {type: 'string', description: '性别'},
+                                                birthday: {type: 'string', format: 'date', description: '出生日期'},
+                                                description: {type: 'string', description: '个人简介'},
+                                                currentTenantId: {type: 'string', description: '当前租户ID'},
+                                                status: {type: 'number', description: '状态'}
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        async request => {
+            return {userInfo: request.userInfo};
         }
-      }
-    },
-    async request => {
-      const { id } = request.body;
-      await services.user.openUser({ id });
-      return {};
-    }
-  );
+    );
 });
+
+module.exports = adminController;

package/libs/controllers/user.js

@@ -1,8 +1,10 @@
 const fp = require('fastify-plugin');
-module.exports = fp(async (fastify, options) => {
-  const { authenticate, services } = fastify.account;
+
+const userController = fp(async (fastify, options) => {
+  const { authenticate } = fastify[options.name];
+
   fastify.get(
-    `${options.prefix}/getUserInfo`,
+    `${options.prefix}/user/getUserInfo`,
     {
       onRequest: [authenticate.user]
     },
@@ -10,25 +12,6 @@ module.exports = fp(async (fastify, options) => {
       return { userInfo: request.userInfo };
     }
   );
-
-  fastify.post(
-    `${options.prefix}/setCurrentTenantId`,
-    {
-      onRequest: [authenticate.user],
-      schema: {
-        body: {
-          type: 'object',
-          required: ['tenantId'],
-          properties: {
-            tenantId: { type: 'string' }
-          }
-        }
-      }
-    },
-    async request => {
-      const { tenantId } = request.body;
-      await services.user.setCurrentTenantId({ id: request.userInfo.id, tenantId });
-      return {};
-    }
-  );
 });
+
+module.exports = userController;

package/libs/models/example._js

@@ -0,0 +1,13 @@
+module.exports = ({DataTypes}) => {
+    return {
+        name: 'modelName',//此处定义modelName，默认根据文件名转驼峰命名，可以缺省
+        model: {
+            name: DataTypes.STRING
+        }, associate: ({/*这里可以获取models*/}, fastify) => {
+            //可以这样获取某个namespace的models fastify.account.models
+        }, options: {
+            indexed: []
+        }
+    };
+};
+

package/libs/models/user-account.js

@@ -1,34 +1,15 @@
-module.exports = ({ DataTypes }) => {
-  return {
-    model: {
-      id: {
-        type: DataTypes.INTEGER,
-        autoIncrement: true,
-        primaryKey: true
-      },
-      uuid: {
-        type: DataTypes.UUID,
-        defaultValue: DataTypes.UUIDV4
-      },
-      password: {
-        type: DataTypes.STRING,
-        allowNull: false
-      },
-      salt: {
-        type: DataTypes.STRING,
-        allowNull: false
-      },
-      belongToUserId: {
-        type: DataTypes.UUID //用户修改密码时重新生成一条数据，该字段用于记录这个账号之前是属于哪个账号的
-      }
-    },
-    options: {
-      indexes: [
-        {
-          unique: true,
-          fields: ['uuid', 'deleted_at']
+const userAccount = ({DataTypes, definePrimaryType}) => {
+    return {
+        model: {
+            password: {
+                type: DataTypes.STRING, allowNull: false, comment: '加密后的密钥'
+            }, salt: {
+                type: DataTypes.STRING, allowNull: false, comment: '用来加密的盐'
+            }, belongToUserId: definePrimaryType('belongToUserId', {
+                comment: '账号所属的userId，用来追踪用户之前设置的密码记录'
+            })
         }
-      ]
-    }
-  };
+    };
 };
+
+module.exports = userAccount;

package/libs/models/user.js

@@ -1,40 +1,50 @@
-module.exports = ({ DataTypes }) => {
+const user = ({ DataTypes, definePrimaryType }) => {
   return {
     model: {
-      id: {
-        type: DataTypes.INTEGER,
-        autoIncrement: true,
-        primaryKey: true
+      nickname: {
+        type: DataTypes.STRING,
+        comment: '用户昵称'
       },
-      uuid: {
-        type: DataTypes.UUID,
-        defaultValue: DataTypes.UUIDV4
+      email: {
+        type: DataTypes.STRING,
+        comment: '用户邮箱'
       },
-      nickname: DataTypes.STRING,
-      email: DataTypes.STRING,
-      phone: DataTypes.STRING,
-      userAccountId: {
-        type: DataTypes.UUID,
-        allowNull: false
+      phone: {
+        type: DataTypes.STRING,
+        comment: '用户手机号'
       },
+      userAccountId: definePrimaryType('userAccountId', {
+        allowNull: false,
+        comment: '当前账号id'
+      }),
       status: {
         type: DataTypes.INTEGER,
-        defaultValue: 0 //0:正常,10:初始化未激活，需要用户设置密码后使用,11:已禁用,12:已关闭,
+        defaultValue: 0,
+        comment: '0:正常,10:初始化未激活，需要用户设置密码后使用,11:已禁用,12:已关闭'
+      },
+      avatar: {
+        type: DataTypes.STRING,
+        comment: '头像fileId'
+      },
+      gender: {
+        type: DataTypes.STRING,
+        comment: 'F:女,M:男'
+      },
+      birthday: {
+        type: DataTypes.DATE,
+        comment: '出生日期'
       },
-      currentTenantId: {
-        type: DataTypes.UUID
+      description: {
+        type: DataTypes.TEXT,
+        comment: '个人描述'
       },
-      avatar: DataTypes.STRING,
-      gender: DataTypes.STRING, //F:女,M男
-      birthday: DataTypes.DATE,
-      description: DataTypes.TEXT
+      isSuperAdmin: {
+        type: DataTypes.BOOLEAN,
+        comment: '是否是平台超级管理员'
+      }
     },
     options: {
       indexes: [
-        {
-          unique: true,
-          fields: ['uuid', 'deleted_at']
-        },
         {
           unique: true,
           fields: ['email', 'deleted_at']
@@ -44,17 +54,8 @@ module.exports = ({ DataTypes }) => {
           fields: ['phone', 'deleted_at']
         }
       ]
-    },
-    associate: ({ adminRole, user, tenant, tenantUser }) => {
-      user.hasOne(adminRole, { foreignKey: 'userId', sourceKey: 'uuid', constraints: false });
-      user.belongsToMany(tenant, {
-        through: { model: tenantUser, unique: false },
-        otherKey: 'tenantId',
-        foreignKey: 'userId',
-        targetKey: 'uuid',
-        sourceKey: 'uuid',
-        constraints: false
-      });
     }
   };
 };
+
+module.exports = user;

package/libs/models/verification-code.js

@@ -1,22 +1,17 @@
-module.exports = ({ DataTypes }) => {
-  return {
-    model: {
-      name: {
-        type: DataTypes.STRING,
-        allowNull: false
-      },
-      type: {
-        type: DataTypes.INTEGER,
-        allowNull: false //0:手机注册,1:邮箱注册,2:手机登录,3:邮箱登录,4:验证租户管理员
-      },
-      code: {
-        type: DataTypes.STRING,
-        allowNull: false
-      },
-      status: {
-        type: DataTypes.INTEGER,
-        defaultValue: 0 //0:未验证,1:已验证,2:已过期
-      }
-    }
-  };
+const verificationCode = ({DataTypes}) => {
+    return {
+        model: {
+            name: {
+                type: DataTypes.STRING, allowNull: false
+            }, type: {
+                type: DataTypes.INTEGER.UNSIGNED, allowNull: false, comment: '0:注册,2:登录,4:验证租户管理员,5:忘记密码'
+            }, code: {
+                type: DataTypes.STRING, allowNull: false
+            }, status: {
+                type: DataTypes.INTEGER.UNSIGNED, defaultValue: 0, comment: '0:未验证,1:已验证,2:已过期'
+            }
+        }
+    };
 };
+
+module.exports = verificationCode;