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

package/libs/services/account.js

@@ -1,69 +1,93 @@
 const fp = require('fastify-plugin');
-const dayjs = require('dayjs');
+const crypto = require('node:crypto');
 const bcrypt = require('bcryptjs');
-const crypto = require('crypto');
+const dayjs = require('dayjs');
 
-function generateRandom6DigitNumber() {
+const generateRandom6DigitNumber = () => {
   const randomNumber = Math.random() * 1000000;
   return Math.floor(randomNumber).toString().padStart(6, '0');
-}
+};
 
-function userNameIsEmail(username) {
+const userNameIsEmail = username => {
   return /^([a-zA-Z0-9_.-])+@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]{2,4})+$/.test(username);
-}
+};
 
-module.exports = fp(async (fastify, options) => {
-  const { models, services } = fastify.account;
-  const login = async ({ username, password, ip }) => {
-    const isEmail = userNameIsEmail(username);
-    const user = await models.user.findOne({
-      where: Object.assign(
-        {},
-        isEmail
-          ? {
-              email: username
-            }
-          : {
-              phone: username
-            },
-        {
-          status: {
-            [fastify.sequelize.Sequelize.Op.or]: [0, 1]
-          }
+const md5 = value => {
+  const hash = crypto.createHash('md5');
+  hash.update(value);
+  return hash.digest('hex');
+};
+
+const accountService = fp(async (fastify, options) => {
+  const { models, services } = fastify[options.name];
+  const { Op } = fastify.sequelize.Sequelize;
+  const verificationCodeValidate = async ({ name, type, code }) => {
+    const verificationCode = await models.verificationCode.findOne({
+      where: {
+        name,
+        type,
+        code,
+        status: {
+          [fastify.sequelize.Sequelize.Op.or]: [0, 1]
         }
-      )
+      }
     });
+    const isPass = !!(verificationCode && dayjs().isBefore(dayjs(verificationCode.createdAt).add(10, 'minute')));
 
-    if (!user) {
-      throw new Error('用户名或密码错误');
+    if (verificationCode) {
+      verificationCode.status = isPass ? 1 : 2;
+      await verificationCode.save();
     }
 
-    await passwordAuthentication({ accountId: user.userAccountId, password });
+    return isPass;
+  };
 
-    await models.loginLog.create({
-      userId: user.uuid,
-      ip
+  const generateVerificationCode = async ({ name, type }) => {
+    const code = generateRandom6DigitNumber();
+    await models.verificationCode.update(
+      {
+        status: 2
+      },
+      {
+        where: {
+          name,
+          type,
+          status: 0
+        }
+      }
+    );
+    await models.verificationCode.create({
+      name,
+      type,
+      code
     });
+    return code;
+  };
 
-    return {
-      token: fastify.jwt.sign({ payload: { id: user.uuid } }),
-      user: Object.assign({}, user.get({ plain: true }), { id: user.uuid })
-    };
+  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;
   };
 
-  const passwordAuthentication = async ({ accountId, password }) => {
-    const userAccount = await models.userAccount.findOne({
-      where: {
-        uuid: accountId
-      }
-    });
-    if (!userAccount) {
-      throw new Error('账号不存在');
-    }
-    const generatedHash = await bcrypt.hash(password + userAccount.salt, userAccount.salt);
-    if (userAccount.password !== generatedHash) {
-      throw new Error('用户名或密码错误');
+  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;
+  };
+
+  const verificationJWTCodeValidate = async ({ token }) => {
+    const { iat, name, type, code } = fastify.jwt.decode(token);
+    if (!(await verificationCodeValidate({ name, type, code }))) {
+      throw new Error('验证码不正确或者已经过期');
     }
+    return { name, type, code };
   };
 
   const passwordEncryption = async password => {
@@ -77,45 +101,23 @@ module.exports = fp(async (fastify, options) => {
     };
   };
 
-  const md5 = value => {
-    const hash = crypto.createHash('md5');
-    hash.update(value);
-    return hash.digest('hex');
-  };
-
-  const resetPassword = async ({ userId, password }) => {
-    const userInfo = await models.user.findOne({
-      where: { uuid: userId }
-    });
-    if (!userInfo) {
-      throw new Error('用户不存在');
+  const passwordAuthentication = async ({ accountId, password }) => {
+    const userAccount = await models.userAccount.findByPk(accountId);
+    if (!userAccount) {
+      throw new Error('账号不存在');
+    }
+    const generatedHash = await bcrypt.hash(password + userAccount.salt, userAccount.salt);
+    if (userAccount.password !== generatedHash) {
+      throw new Error('用户名或密码错误');
     }
-    const account = await models.userAccount.create(
-      Object.assign({}, await passwordEncryption(password), {
-        belongToUserId: userId
-      })
-    );
-
-    await userInfo.update({ userAccountId: account.uuid });
   };
 
-  const register = async ({ avatar, nickname, gender, birthday, description, phone, email, code, password, status, invitationCode }) => {
+  const register = async ({ avatar, nickname, gender, birthday, description, phone, email, code, password, status }) => {
     const type = phone ? 0 : 1;
-    const verificationCode = await models.verificationCode.findOne({
-      where: {
-        name: type === 0 ? phone : email,
-        type,
-        code,
-        status: 1
-      }
-    });
-    if (!verificationCode) {
+    if (!(await verificationCodeValidate({ name: type === 0 ? phone : email, type: 0, code }))) {
       throw new Error('验证码不正确或者已经过期');
     }
 
-    verificationCode.status = 2;
-    await verificationCode.save();
-
     return await services.user.addUser({
       avatar,
       nickname,
@@ -129,90 +131,63 @@ module.exports = fp(async (fastify, options) => {
     });
   };
 
-  const sendEmailCode = async ({ email }) => {
-    const code = generateRandom6DigitNumber();
-
-    // 这里写发送逻辑
-
-    await models.verificationCode.update(
-      {
-        status: 2
-      },
-      {
-        where: {
-          name: email,
-          type: 1,
-          status: 0
-        }
+  const login = async ({ type, email, phone, password }) => {
+    const query = {
+      status: {
+        [Op.or]: [0, 1]
       }
-    );
-
-    await models.verificationCode.create({
-      name: email,
-      type: 1,
-      code
-    });
-
-    return code;
-  };
-
-  const verificationCodeValidate = async ({ name, type, code }) => {
-    const verificationCode = await models.verificationCode.findOne({
-      where: {
-        name,
-        type,
-        code,
-        status: {
-          [fastify.sequelize.Sequelize.Op.or]: [0, 1]
-        }
+    };
+    (() => {
+      if (type === 'email') {
+        query.email = email;
+        return;
       }
+      if (type === 'phone') {
+        query.phone = phone;
+        return;
+      }
+
+      throw new Error('不支持的登录类型');
+    })();
+    const user = await models.user.findOne({
+      where: query
     });
-    const isPass = !!(verificationCode && dayjs().isBefore(dayjs(verificationCode.createdAt).add(10, 'minute')));
 
-    if (verificationCode) {
-      verificationCode.status = isPass ? 1 : 2;
-      await verificationCode.save();
+    if (!user) {
+      throw new Error('用户名或密码错误');
     }
 
-    return isPass;
-  };
-
-  const sendSMSCode = async ({ phone }) => {
-    const code = generateRandom6DigitNumber();
+    await passwordAuthentication({ accountId: user.userAccountId, password });
 
-    // 这里写发送逻辑
+    return {
+      token: fastify.jwt.sign({ payload: { id: user.id } }),
+      user: Object.assign({}, user.get({ plain: true }), { id: user.id })
+    };
+  };
 
-    await models.verificationCode.update(
-      {
-        status: 2
-      },
-      {
-        where: {
-          name: phone,
-          type: 0,
-          status: 0
-        }
-      }
+  const resetPassword = async ({ password, userId }) => {
+    const user = await services.user.getUserInstance({ id: userId });
+    const account = await models.userAccount.create(
+      Object.assign({}, await passwordEncryption(password), {
+        belongToUserId: user.id
+      })
     );
-
-    await models.verificationCode.create({
-      name: phone,
-      type: 0,
-      code
-    });
-
-    return code;
+    await user.update({ userAccountId: account.id });
   };
 
   services.account = {
-    md5,
-    login,
-    register,
-    sendEmailCode,
-    sendSMSCode,
+    generateRandom6DigitNumber,
+    sendVerificationCode,
+    sendJWTVerificationCode,
     verificationCodeValidate,
+    verificationJWTCodeValidate,
     passwordEncryption,
-    passwordAuthentication,
+    register,
+    login,
+    userNameIsEmail,
+    md5,
     resetPassword
   };
 });
+
+module.exports = accountService;

package/libs/services/admin.js

@@ -1,79 +1,27 @@
 const fp = require('fastify-plugin');
 
-const ROLE = {
-  SuperAdmin: 'SuperAdmin',
-  TenantAdmin: 'TenantAdmin'
-};
-
-module.exports = fp(async (fastify, options) => {
-  const { models, services } = fastify.account;
-  const initSuperAdmin = async user => {
-    if ((await models.adminRole.count()) > 0) {
-      throw new Error('系统已经初始化完成，不能执行该操作');
-    }
-    await models.adminRole.create({
-      userId: user.id,
-      role: ROLE['SuperAdmin']
-    });
-  };
-
-  const checkIsSuperAdmin = async user => {
-    return (
-      (await models.adminRole.count({
-        where: {
-          userId: user.id,
-          role: ROLE['SuperAdmin']
-        }
-      })) === 0
-    );
-  };
-
-  const addUser = async ({ avatar, nickname, phone, email, password, description }) => {
-    return await services.user.addUser({
-      avatar,
-      nickname,
-      phone,
-      email,
-      password,
-      description,
-      status: 1
-    });
-  };
-
-  const setSuperAdmin = async targetUser => {
-    const user = await services.user.getUserInfo(targetUser);
-    if (
-      (await models.adminRole.count({
-        where: {
-          userId: user.id,
-          role: ROLE['SuperAdmin']
+const adminService = fp(async (fastify, options) => {
+    const {models, services, global} = fastify[options.name];
+
+    const initSuperAdmin = async user => {
+        if ((await models.user.count({
+            where: {
+                isSuperAdmin: true
+            }
+        })) > 0) {
+            throw new Error('系统已经初始化完成，不能执行该操作');
         }
-      })) > 0
-    ) {
-      throw new Error('当前用户已经是超级管理员');
-    }
+        const currentUser = await services.user.getUserInstance({id: user.id});
+        currentUser.isSuperAdmin = true;
+        await currentUser.save();
+    };
 
-    await models.adminRole.create({
-      userId: user.id,
-      role: ROLE['SuperAdmin']
-    });
-  };
+    const checkIsSuperAdmin = async (user) => {
+        const currentUser = await services.user.getUserInstance({id: user.id});
+        return currentUser.isSuperAdmin === true;
+    };
 
-  const generateTenantAdminVerifyCode = async () => {};
-
-  const verifyTenantAdmin = async () => {};
-
-  const resetUserPassword = async ({ userId, password }) => {
-    await services.account.resetPassword({ userId, password });
-  };
-
-  services.admin = {
-    initSuperAdmin,
-    setSuperAdmin,
-    checkIsSuperAdmin,
-    generateTenantAdminVerifyCode,
-    verifyTenantAdmin,
-    addUser,
-    resetUserPassword
-  };
+    services.admin = {initSuperAdmin, checkIsSuperAdmin};
 });
+
+module.exports = adminService;

package/libs/services/user.js

@@ -1,16 +1,15 @@
 const fp = require('fastify-plugin');
-const { Unauthorized } = require('http-errors');
-const get = require('lodash/get');
-const pick = require('lodash/pick');
-module.exports = fp(async (fastify, options) => {
-  const { models, services } = fastify.account;
+const { pick, get } = require('lodash');
+const httpErrors = require('http-errors');
+
+const { Unauthorized } = httpErrors;
+
+const userService = fp(async (fastify, options) => {
+  const { models, services } = fastify[options.name];
+  const { Op } = fastify.sequelize.Sequelize;
 
   const getUserInstance = async ({ id }) => {
-    const user = await models.user.findOne({
-      where: {
-        uuid: id
-      }
-    });
+    const user = await models.user.findByPk(id);
 
     if (!user) {
       throw new Error('用户不存在');
@@ -25,15 +24,13 @@ module.exports = fp(async (fastify, options) => {
     }
     const user = await models.user.findOne({
       where: {
-        uuid: authenticatePayload.id
+        id: authenticatePayload.id
       }
     });
     if (!user) {
       throw new Unauthorized();
     }
-    return Object.assign({}, pick(user, ['avatar', 'nickname', 'phone', 'email', 'gender', 'status', 'birthday', 'description', 'currentTenantId']), {
-      id: user.uuid
-    });
+    return Object.assign({}, pick(user, ['id', 'avatar', 'nickname', 'phone', 'email', 'gender', 'status', 'birthday', 'description']));
   };
 
   const accountIsExists = async ({ email, phone }, currentUser) => {
@@ -48,7 +45,7 @@ module.exports = fp(async (fastify, options) => {
     return (
       (await models.user.count({
         where: {
-          [fastify.sequelize.Sequelize.Op.or]: query
+          [Op.or]: query
         }
       })) > 0
     );
@@ -71,15 +68,38 @@ module.exports = fp(async (fastify, options) => {
       phone,
       email,
       status,
-      userAccountId: account.uuid
+      userAccountId: account.id
     });
-    await account.update({ belongToUserId: user.uuid });
+    await account.update({ belongToUserId: user.id });
+
+    return Object.assign({}, user.get({ pain: true }));
+  };
+
+  const getUserList = async ({ filter, perPage, currentPage }) => {
+    const queryFilter = {};
 
-    return Object.assign({}, user.get({ pain: true }), { id: user.uuid });
+    ['nickname'].forEach(key => {
+      if (filter && filter[key]) {
+        queryFilter[key] = {
+          [Op.like]: `%${filter[key]}%`
+        };
+      }
+    });
+    const { count, rows } = await models.user.findAndCountAll({
+      where: queryFilter,
+      offset: perPage * (currentPage - 1),
+      limit: perPage
+    });
+    return {
+      pageData: rows.map(item => {
+        return Object.assign({}, item.get({ pain: true }));
+      }),
+      totalCount: count
+    };
   };
 
   const saveUser = async ({ id, ...otherInfo }) => {
-    const user = await getUserInstance({ id });
+    const user = await getUserInstance(id);
 
     if ((await accountIsExists({ phone: otherInfo.phone, email: otherInfo.email }, user)) > 0) {
       throw new Error('手机号或者邮箱都不能重复');
@@ -94,54 +114,28 @@ module.exports = fp(async (fastify, options) => {
     await user.save();
   };
 
-  const closeUser = async ({ id }) => {
-    const user = await getUserInstance({ id });
-    user.status = 12;
+  const setSuperAdmin = async ({ userId, status }) => {
+    const user = await services.user.getUserInstance({ id: userId });
+    user.isSuperAdmin = status;
     await user.save();
   };
 
-  const openUser = async ({ id }) => {
-    const user = await getUserInstance({ id });
-    user.status = 0;
+  const setUserStatus = async ({ userId, status }) => {
+    const user = await services.user.getUserInstance({ id: userId });
+    user.status = status;
     await user.save();
   };
 
-  const setCurrentTenantId = async ({ id, tenantId }) => {
-    await services.tenant.getTenant({ id: tenantId });
-    const user = await getUserInstance({ id });
-    user.currentTenantId = tenantId;
-    await user.save();
-  };
-
-  const getAllUserList = async ({ filter, perPage, currentPage }) => {
-    const { count, rows } = await models.user.findAndCountAll({
-      include: [
-        {
-          attributes: ['role'],
-          model: models.adminRole
-        },
-        {
-          model: models.tenant
-        }
-      ]
-    });
-    return {
-      pageData: rows.map(item => {
-        return Object.assign({}, item.get({ pain: true }), { id: item.uuid });
-      }),
-      totalCount: count
-    };
-  };
-
   services.user = {
-    getUser,
     getUserInstance,
+    getUser,
+    addUser,
     saveUser,
     accountIsExists,
-    addUser,
-    closeUser,
-    openUser,
-    setCurrentTenantId,
-    getAllUserList
+    getUserList,
+    setSuperAdmin,
+    setUserStatus
   };
 });
+
+module.exports = userService;

package/package.json

@@ -1,23 +1,24 @@
 {
   "name": "@kne/fastify-account",
-  "version": "1.0.0-alpha.9",
-  "description": "fastify的用户管理账号等实现",
+  "version": "2.0.0-alpha.1",
+  "description": "用于用户注册登录认证.",
   "main": "index.js",
   "scripts": {
     "init": "husky",
-    "dev": "npx fastify-cli start ./index.js",
-    "start": "nodemon ./tests/server.js",
+    "dev": "nodemon ./index.js",
+    "start": "node ./index.js",
+    "doc": "node ./open-api.js",
     "build:md": "npx @kne/md-doc",
     "start:md": "npx @kne/md-doc --watch",
     "prettier": "prettier --config .prettierrc --write '{libs/**/*,index}.{js,jsx,ts,tsx,json,css,scss}'",
     "lint-staged": "npx lint-staged"
   },
   "lint-staged": {
-    "{libs/**/*,index}.{js,jsx,ts,tsx,json,css,scss}": [
-      "prettier --config .prettierrc --write",
+    "**/*.md": [
       "git add"
     ],
-    "README.md": [
+    "{libs/**/*,index}.{js,jsx,ts,tsx,json,css,scss}": [
+      "prettier --config .prettierrc --write",
       "git add"
     ]
   },
@@ -27,36 +28,31 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/kne-union/fastify-account.git"
+    "url": "git+https://github.com/kne-union/fastify-user.git"
   },
   "keywords": [],
   "author": "linzp",
   "license": "ISC",
   "bugs": {
-    "url": "https://github.com/kne-union/fastify-account/issues"
+    "url": "https://github.com/kne-union/fastify-user/issues"
   },
-  "homepage": "https://github.com/kne-union/fastify-account#readme",
-  "devDependencies": {
-    "@fastify/swagger": "^8.14.0",
-    "@kne/fastify-file-manager": "^1.1.2",
-    "@kne/fastify-response-data-format": "^0.1.0",
-    "@kne/fastify-sequelize": "^2.0.2",
-    "fastify": "^4.27.0",
-    "husky": "^9.0.11",
-    "nodemon": "^3.1.1",
-    "prettier": "^3.2.5",
-    "qs": "^6.12.1",
-    "sqlite3": "^5.1.7",
-    "widdershins": "^4.0.1"
+  "homepage": "https://github.com/kne-union/fastify-user#readme",
+  "peerDependencies": {
+    "@kne/fastify-namespace": "*",
+    "@kne/fastify-sequelize": "*",
+    "fastify-plugin": ">=5"
   },
   "dependencies": {
-    "@fastify/jwt": "^8.0.1",
-    "@kne/fastify-namespace": "^0.1.0",
-    "bcryptjs": "^2.4.3",
-    "dayjs": "^1.11.11",
-    "fastify-ip": "^1.0.0",
-    "fastify-plugin": "^4.5.1",
+    "@fastify/jwt": "^9.1.0",
+    "bcryptjs": "^3.0.2",
+    "dayjs": "^1.11.13",
+    "fs-extra": "^11.2.0",
     "http-errors": "^2.0.0",
     "lodash": "^4.17.21"
+  },
+  "devDependencies": {
+    "husky": "^9.0.11",
+    "nodemon": "^3.1.3",
+    "prettier": "^3.2.5"
   }
 }