@kne/fastify-signature 1.0.0 → 1.0.3

package/index.js

@@ -34,7 +34,7 @@ module.exports = fp(async (fastify, options) => {
       },
       getOpenApiParams: request => {
         const { ['x-openapi-appid']: appId, ['x-openapi-timestamp']: timestamp, ['x-openapi-expire']: expire, ['x-openapi-signature']: signature } = request.headers;
-        return Object.assign({}, { appId, timestamp, expire, signature }, request.body);
+        return Object.assign({}, { appId, timestamp, expire, signature }, request.body?.openApiParams);
       }
     },
     options

package/libs/controllers/main.js

@@ -23,6 +23,15 @@ module.exports = fp(async (fastify, options) => {
               type: 'number',
               description: '每页数量',
               default: 20
+            },
+            filter: {
+              type: 'object',
+              additionalProperties: true,
+              properties: {
+                keyword: { type: 'string', description: '关键字（AppId/描述/所属用户）' },
+                appId: { type: 'string', description: 'AppId' },
+                status: { description: '状态: 0开启，1禁用' }
+              }
             }
           }
         }

package/libs/services/main.js

@@ -3,16 +3,27 @@ const crypto = require('crypto');
 
 module.exports = fp(async (fastify, options) => {
   const { models, services } = fastify[options.name];
+  const { Op } = fastify.sequelize.Sequelize;
+
+  const escapeLike = value => String(value).replace(/[\\%_]/g, '\\$&');
+
+  const resolveAppId = appId => {
+    if (appId == null || appId === '') {
+      throw new Error('Invalid appId');
+    }
+    // 雪花 id 超过 Number.MAX_SAFE_INTEGER，必须始终按字符串查，禁止 Number(appId)
+    return String(appId);
+  };
 
   const create = async (authenticatePayload, { description, userId: targetUserId }) => {
     const { id: userId } = authenticatePayload;
     const secretKey = crypto.randomBytes(options.secretLength).toString('hex');
     const newSecret = await models.secret.create({ secretKey, description, userId: targetUserId || userId });
-    return { appId: newSecret.id, secretKey: newSecret.secretKey };
+    return { appId: String(newSecret.id), secretKey: newSecret.secretKey };
   };
 
   const verify = async ({ appId, timestamp, expire, signature }) => {
-    const secret = await models.secret.findByPk(appId);
+    const secret = await models.secret.findByPk(resolveAppId(appId));
     if (!secret) {
       throw new Error('Invalid appId');
     }
@@ -47,21 +58,51 @@ module.exports = fp(async (fastify, options) => {
     };
   };
 
-  const list = async (authenticatePayload, { perPage, currentPage }) => {
-    const { id: userId } = authenticatePayload;
+  const list = async (authenticatePayload, { perPage = 20, currentPage = 1, filter }) => {
+    filter = Object.assign({}, filter);
+    const whereQuery = {};
+    const sequelize = fastify.sequelize;
+    const castIdLike = value =>
+      sequelize.where(sequelize.cast(sequelize.col('secret.id'), 'TEXT'), {
+        [Op.iLike]: `%${escapeLike(value)}%`
+      });
+
+    const keyword = filter.keyword != null ? String(filter.keyword).trim() : '';
+    if (keyword) {
+      const like = { [Op.iLike]: `%${escapeLike(keyword)}%` };
+      whereQuery[Op.or] = [castIdLike(keyword), { description: like }, { '$user.nickname$': like }, { '$user.email$': like }, { '$user.phone$': like }];
+    }
+
+    const appId = filter.appId != null ? String(filter.appId).trim() : '';
+    if (appId) {
+      whereQuery[Op.and] = [...(whereQuery[Op.and] || []), castIdLike(appId)];
+    }
+
+    if (filter.status !== undefined && filter.status !== null && filter.status !== '') {
+      whereQuery.status = Number(filter.status);
+    }
+
     const { count, rows } = await models.secret.findAndCountAll({
-      where: {
-        userId
-      },
+      include: [
+        {
+          model: options.getUserModel(),
+          required: false
+        }
+      ],
+      where: whereQuery,
       limit: perPage,
-      offset: (currentPage - 1) * perPage
+      offset: (currentPage - 1) * perPage,
+      order: [['createdAt', 'DESC']],
+      distinct: true
     });
     return {
       pageData: rows.map(item => {
+        const id = String(item.id);
         return {
-          id: item.id,
-          appId: item.id,
+          id,
+          appId: id,
           secretKey: item.secretKey.substring(0, 3) + '*'.repeat(8) + item.secretKey.substring(item.secretKey.length - 3),
+          user: item.user,
           description: item.description,
           lastVisitedAt: item.lastVisitedAt,
           status: item.status,
@@ -73,27 +114,20 @@ module.exports = fp(async (fastify, options) => {
     };
   };
 
+  // list/update/remove 均为 admin 接口，可管理任意用户密钥；勿再按创建者校验归属
   const remove = async (authenticatePayload, { appId }) => {
-    const { id: userId } = authenticatePayload;
-    const secret = await models.secret.findByPk(appId);
+    const secret = await models.secret.findByPk(resolveAppId(appId));
     if (!secret) {
       throw new Error('Invalid appId');
     }
-    if (secret.userId !== userId) {
-      throw new Error('Invalid appId');
-    }
     await secret.destroy();
   };
 
   const update = async (authenticatePayload, { appId, status, description }) => {
-    const { id: userId } = authenticatePayload;
-    const secret = await models.secret.findByPk(appId);
+    const secret = await models.secret.findByPk(resolveAppId(appId));
     if (!secret) {
       throw new Error('Invalid appId');
     }
-    if (secret.userId !== userId) {
-      throw new Error('Invalid appId');
-    }
     await secret.update({ status, description });
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kne/fastify-signature",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "description": "用于实现一个签名和验证算法",
   "main": "index.js",
   "scripts": {