@kne/fastify-signature 1.0.0-alpha.2 → 1.0.0-alpha.4

package/index.js

@@ -1,5 +1,6 @@
 const fp = require('fastify-plugin');
 const path = require('node:path');
+const { Unauthorized } = require('http-error');
 
 module.exports = fp(async (fastify, options) => {
   options = Object.assign(
@@ -12,10 +13,16 @@ module.exports = fp(async (fastify, options) => {
       dbTableNamePrefix: 't_signature_',
       getAdminAuthenticate: () => {
         if (!fastify.account) {
-          throw new Error('fastify-account plugin must be registered before fastify-trtc-conference,or set options.getUserAuthenticate');
+          throw new Error('fastify-account plugin must be registered before fastify-trtc-conference,or set options.getAdminAuthenticate');
         }
         return fastify.account.authenticate.admin;
       },
+      getUserAuthenticate: () => {
+        if (!fastify.account) {
+          throw new Error('fastify-account plugin must be registered before fastify-trtc-conference,or set options.getUserAuthenticate');
+        }
+        return fastify.account.authenticate.user;
+      },
       getUserInfo: request => {
         return request.userInfo;
       },
@@ -33,6 +40,7 @@ module.exports = fp(async (fastify, options) => {
     name: options.name,
     options,
     modules: [
+      ['controllers', path.resolve(__dirname, './libs/controllers')],
       [
         'models',
         await fastify.sequelize.addModels(path.resolve(__dirname, './libs/models'), {
@@ -40,7 +48,24 @@ module.exports = fp(async (fastify, options) => {
           getUserModel: options.getUserModel
         })
       ],
-      ['services', path.resolve(__dirname, './libs/services')]
+      ['services', path.resolve(__dirname, './libs/services')],
+      [
+        'authenticate',
+        {
+          openApi: async request => {
+            const { appId, timestamp, expire, signature } = request.headers;
+            const { result, message } = await fastify[options.name].services.verify({
+              appId,
+              timestamp,
+              expire,
+              signature
+            });
+            if (result !== true) {
+              throw new Unauthorized(message);
+            }
+          }
+        }
+      ]
     ]
   });
 });

package/libs/controllers/main.js

@@ -3,23 +3,27 @@ const fp = require('fastify-plugin');
 module.exports = fp(async (fastify, options) => {
   const { services } = fastify[options.name];
   const adminAuth = options.getAdminAuthenticate();
+  const userAuth = options.getUserAuthenticate();
   fastify.get(
     `${options.prefix}/list`,
     {
-      onRequest: [adminAuth],
+      onRequest: [userAuth, adminAuth],
       schema: {
         description: '获取密钥列表',
         summary: '获取密钥列表',
         query: {
-          currentPage: {
-            type: 'number',
-            description: '页码',
-            default: 1
-          },
-          perPage: {
-            type: 'number',
-            description: '每页数量',
-            default: 20
+          type: 'object',
+          properties: {
+            currentPage: {
+              type: 'number',
+              description: '页码',
+              default: 1
+            },
+            perPage: {
+              type: 'number',
+              description: '每页数量',
+              default: 20
+            }
           }
         }
       }
@@ -32,7 +36,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/create`,
     {
-      onRequest: [adminAuth],
+      onRequest: [userAuth, adminAuth],
       schema: {
         description: '创建密钥',
         summary: '创建密钥',
@@ -55,7 +59,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/remove`,
     {
-      onRequest: [adminAuth],
+      onRequest: [userAuth, adminAuth],
       schema: {
         description: '删除密钥',
         summary: '删除密钥',
@@ -63,7 +67,7 @@ module.exports = fp(async (fastify, options) => {
           type: 'object',
           properties: {
             appId: {
-              type: 'number',
+              type: 'string',
               description: '密钥ID'
             }
           }
@@ -79,7 +83,7 @@ module.exports = fp(async (fastify, options) => {
   fastify.post(
     `${options.prefix}/update`,
     {
-      onRequest: [adminAuth],
+      onRequest: [userAuth, adminAuth],
       schema: {
         description: '更新密钥',
         summary: '更新密钥',
@@ -87,7 +91,7 @@ module.exports = fp(async (fastify, options) => {
           type: 'object',
           properties: {
             appId: {
-              type: 'number',
+              type: 'string',
               description: '密钥ID'
             },
             status: {
@@ -118,7 +122,7 @@ module.exports = fp(async (fastify, options) => {
           type: 'object',
           properties: {
             appId: {
-              type: 'number',
+              type: 'string',
               description: '密钥ID'
             },
             timestamp: {

package/libs/services/main.js

@@ -1,9 +1,10 @@
 const fp = require('fastify-plugin');
+const crypto = require('crypto');
 
 module.exports = fp(async (fastify, options) => {
-  const { models, services } = [options.name];
+  const { models, services } = fastify[options.name];
 
-  const add = async (authenticatePayload, { description }) => {
+  const create = async (authenticatePayload, { description }) => {
     const { id: userId } = authenticatePayload;
     const secretKey = crypto.randomBytes(options.secretLength).toString('hex');
     const newSecret = await models.secret.create({ secretKey, description, userId });
@@ -59,7 +60,7 @@ module.exports = fp(async (fastify, options) => {
         return {
           id: item.id,
           appId: item.id,
-          secretKey: item.secretKey.substring(0, 3) + '*'.repeat(item.secretKey.length - 6) + item.secretKey.substring(item.secretKey.length - 3),
+          secretKey: item.secretKey.substring(0, 3) + '*'.repeat(8) + item.secretKey.substring(item.secretKey.length - 3),
           description: item.description,
           lastVisitedAt: item.lastVisitedAt,
           status: item.status,
@@ -96,7 +97,7 @@ module.exports = fp(async (fastify, options) => {
   };
 
   Object.assign(fastify[options.name].services, {
-    add,
+    create,
     verify,
     list,
     remove,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kne/fastify-signature",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.4",
   "description": "用于实现一个签名和验证算法",
   "main": "index.js",
   "scripts": {
@@ -51,5 +51,8 @@
     "nodemon": "^3.1.3",
     "prettier": "^3.2.5",
     "sqlite3": "^5.1.7"
+  },
+  "dependencies": {
+    "http-error": "^0.0.6"
   }
 }