fix(core.gbapp): /logs working again.

GeneralBots · Mar 27, 2023 · d08e11f · d08e11f
1 parent 0c44361
commit d08e11f
Showing 1 changed file with 16 additions and 17 deletions.
diff --git a/src/app.ts b/src/app.ts
@@ -212,32 +212,31 @@ export class GBServer {
           await minService.buildMin(instances);
 
           if (process.env.ENABLE_WEBLOG) {
-            const admins = {
-              admin: { password: process.env.ADMIN_PASS }
-            };
+            // If global log enabled, reorders transports adding web logging.
+
+            const loggers = GBLog.getLogger();
+            winston.default(server, loggers[1]);
+          }
 
-            // ... some not authenticated middlewares
+          server.get('*', async (req, res, next) => {
+            if (req.originalUrl.startsWith('/logs')) {
+              if (process.env.ENABLE_WEBLOG) {
+                const admins = {
+                  admin: { password: process.env.ADMIN_PASS }
+                };
 
-            server.use(async (req, res, next) => {
-              if (req.originalUrl.startsWith('/logs')) {
+                // ... some not authenticated middlewares.
                 const user = auth(req);
                 if (!user || !admins[user.name] || admins[user.name].password !== user.pass) {
                   res.set('WWW-Authenticate', 'Basic realm="example"');
                   return res.status(401).send();
                 }
               } else {
-                return next();
+                await GBSSR.ssrFilter(req, res, next);
               }
-            });
-
-            // If global log enabled, reorders transports adding web logging.
-
-            const loggers = GBLog.getLogger();
-            winston.default(server, loggers[1]);
-          }
-
-          server.get('*', async (req, res, next) => {
-            await GBSSR.ssrFilter(req, res, next);
+            } else {
+              await GBSSR.ssrFilter(req, res, next);
+            }
           });
 
           GBLog.info(`The Bot Server is in RUNNING mode...`);