From 1c7f9bbaa09a88b26c01317e60d675cd0755c564 Mon Sep 17 00:00:00 2001
From: Dinawo <dinawo@30rdr.fr>
Date: Wed, 8 May 2024 13:49:45 +0200
Subject: [PATCH] Refactor discordWebhookSuspisiousAlertMiddleware.js to use
 setupData variable within the sendDiscordWebhook function

---
 .drone.yml                                     | 18 ++++++++++++++++--
 .../discordWebhookSuspisiousAlertMiddleware.js |  8 ++------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 9dddba6..a9d0c13 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -13,13 +13,27 @@ steps:
       - npm install
       - node -v
 
+  - name: extract-version
+    image: node:alpine
+    commands:
+      - npm install -g json
+      - echo $(json -f package.json version) > .version
+    volumes:
+      - name: shared
+        path: /drone/src
+
   - name: build-docker-image
     image: plugins/docker
     settings:
       repo: swiftlogiclabs/cdn-app-insider
-      tags: latest
+      tags: 
+        - latest
+        - $(cat .version)
       dockerfile: Dockerfile
       username:
         from_secret: docker_username
       password:
-        from_secret: docker_password
\ No newline at end of file
+        from_secret: docker_password
+    volumes:
+      - name: shared
+        path: /drone/src
\ No newline at end of file
diff --git a/Middlewares/discordWebhookSuspisiousAlertMiddleware.js b/Middlewares/discordWebhookSuspisiousAlertMiddleware.js
index f53f9c7..6e5a6ca 100644
--- a/Middlewares/discordWebhookSuspisiousAlertMiddleware.js
+++ b/Middlewares/discordWebhookSuspisiousAlertMiddleware.js
@@ -2,7 +2,6 @@ const axios = require('axios');
 const fs = require('fs');
 const path = require('path');
 const setupFilePath = path.join(__dirname, '../data', 'setup.json');
-const setupData = JSON.parse(fs.readFileSync(setupFilePath, 'utf-8'));
 
 function sendDiscordWebhook(url, req, statusCode) {
     const fullUrl = `${req.protocol}://${req.get('host')}${req.originalUrl}`;
@@ -37,14 +36,11 @@ function sendDiscordWebhook(url, req, statusCode) {
             }
         }]
     };
-
-    axios.post(url, data)
-        .catch((error) => {
-            console.error(`Erreur lors de l'envoi du webhook à Discord: ${error}`);
-        });
 }
 
 function discordWebhookSuspisiousAlertMiddleware(req, res, next) {
+    const setupData = JSON.parse(fs.readFileSync(setupFilePath, 'utf-8'));
+
     res.on('finish', () => {
         const discordWebhookUrl = setupData[0].webhooks_discord;
         sendDiscordWebhook(discordWebhookUrl, req, res.statusCode);