@kne/fastify-signature 1.0.0-alpha.5 → 1.0.0

package/index.js

@@ -31,6 +31,10 @@ module.exports = fp(async (fastify, options) => {
           throw new Error('fastify-account plugin must be registered before fastify-trtc-conference,or set options.getUserModel');
         }
         return fastify.account.models.user;
+      },
+      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);
       }
     },
     options
@@ -53,13 +57,7 @@ module.exports = fp(async (fastify, options) => {
         'authenticate',
         {
           openApi: async request => {
-            const { appId, timestamp, expire, signature } = request.headers;
-            const { result, message, userId } = await fastify[options.name].services.verify({
-              appId,
-              timestamp,
-              expire,
-              signature
-            });
+            const { result, message, userId } = await fastify[options.name].services.verify(options.getOpenApiParams(request));
             if (result !== true) {
               throw new Unauthorized(message);
             }

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}]`
       };
     }
 

package/package.json

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