From 3991d8e8f7fc1c2b2c8992bdf136364dada197ed Mon Sep 17 00:00:00 2001
From: Vadim Babadzhanyan <vadim.babadzhanyan@my.games>
Date: Mon, 26 Aug 2024 12:39:08 +0300
Subject: [PATCH] Fix require prometheus password

---
 src/lib/Server.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/lib/Server.js b/src/lib/Server.js
index 17e5058b..1b924ff2 100644
--- a/src/lib/Server.js
+++ b/src/lib/Server.js
@@ -335,10 +335,6 @@ module.exports = class Server {
       });
     };
 
-    // Prometheus Metrics API
-    const routerPrometheusMetrics = createRouter();
-    app.use(routerPrometheusMetrics);
-
     // Check Prometheus credentials
     app.use(
       fromNodeMiddleware((req, res, next) => {
@@ -346,11 +342,10 @@ module.exports = class Server {
           return next();
         }
         const user = basicAuth(req);
-        if (requiresPrometheusPassword && !user) {
+        if (!user) {
           res.statusCode = 401;
           return { error: 'Not Logged In' };
         }
-
         if (user.pass) {
           if (isPasswordValid(user.pass, PROMETHEUS_METRICS_PASSWORD)) {
             return next();
@@ -363,6 +358,10 @@ module.exports = class Server {
       }),
     );
 
+    // Prometheus Metrics API
+    const routerPrometheusMetrics = createRouter();
+    app.use(routerPrometheusMetrics);
+
     // Prometheus Routes
     routerPrometheusMetrics
       .get('/metrics', defineEventHandler(async (event) => {