@kne/fastify-signature 1.0.0-alpha.6 → 1.0.2

package/index.js

@@ -33,8 +33,8 @@ module.exports = fp(async (fastify, options) => {
         return fastify.account.models.user;
       },
       getOpenApiParams: request => {
-        const { appid: appId, timestamp, expire, signature } = request.headers;
-        return { appId, timestamp, expire, signature };
+        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?.openApiParams);
       }
     },
     options

package/libs/services/main.js

@@ -4,10 +4,10 @@ const crypto = require('crypto');
 module.exports = fp(async (fastify, options) => {
   const { models, services } = fastify[options.name];
 
-  const create = async (authenticatePayload, { description }) => {
+  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 });
+    const newSecret = await models.secret.create({ secretKey, description, userId: targetUserId || userId });
     return { appId: newSecret.id, secretKey: newSecret.secretKey };
   };
 
@@ -34,7 +34,7 @@ module.exports = fp(async (fastify, options) => {
     if (expectedSignature !== signature) {
       return {
         result: false,
-        message: 'Invalid signature'
+        message: `Invalid signature [${appId},${signature},${timestamp},${expire}]`
       };
     }
 
@@ -50,9 +50,8 @@ module.exports = fp(async (fastify, options) => {
   const list = async (authenticatePayload, { perPage, currentPage }) => {
     const { id: userId } = authenticatePayload;
     const { count, rows } = await models.secret.findAndCountAll({
-      where: {
-        userId
-      },
+      include: options.getUserModel(),
+      where: {},
       limit: perPage,
       offset: (currentPage - 1) * perPage
     });
@@ -62,6 +61,7 @@ module.exports = fp(async (fastify, options) => {
           id: item.id,
           appId: item.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,

package/package.json

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