Rename basic auth middleware

server.js

@@ -37,7 +37,7 @@ util.inspect.defaultOptions.maxArrayLength = null;
 util.inspect.defaultOptions.maxStringLength = null;
 
 // local library imports
-const basicAuthMiddleware = require('./src/middleware/basicAuthMiddleware');
+const basicAuthMiddleware = require('./src/middleware/basicAuth');
 const whitelistMiddleware = require('./src/middleware/whitelist');
 const { jsonParser, urlencodedParser } = require('./src/express-common.js');
 const contentManager = require('./src/endpoints/content-manager');

src/middleware/basicAuth.js

@@ -2,7 +2,7 @@
  * When applied, this middleware will ensure the request contains the required header for basic authentication and only
  * allow access to the endpoint after successful authentication.
  */
-const { getConfig } = require('./../util.js');
+const { getConfig } = require('../util.js');
 
 const unauthorizedResponse = (res) => {
     res.set('WWW-Authenticate', 'Basic realm="SillyTavern", charset="UTF-8"');

src/middleware/whitelist.js

@@ -7,7 +7,9 @@ const { color, getConfigValue } = require('../util');
 
 const whitelistPath = path.join(process.cwd(), './whitelist.txt');
 let whitelist = getConfigValue('whitelist', []);
+let knownIPs = new Set();
 const listen = getConfigValue('listen', false);
+const whitelistMode = getConfigValue('whitelistMode', true);
 
 if (fs.existsSync(whitelistPath)) {
     try {
@@ -18,11 +20,6 @@ if (fs.existsSync(whitelistPath)) {
     }
 }
 
-const whitelistMode = getConfigValue('whitelistMode', true);
-
-// IP Whitelist //
-let knownIPs = new Set();
-
 function getIpFromRequest(req) {
     let clientIp = req.connection.remoteAddress;
     let ip = ipaddr.parse(clientIp);