From ea5ae88019e42b1274802cb5461767fa330f8bc0 Mon Sep 17 00:00:00 2001
From: Alexander Borg <borg@servernet.se>
Date: Mon, 15 Sep 2025 05:23:00 +0200
Subject: [PATCH] Fix jwt-token

---
 server/tests/middleware/auth.test.js | 6 ++++--
 server/tests/setup.js                | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/server/tests/middleware/auth.test.js b/server/tests/middleware/auth.test.js
index 9892a1a..8963610 100644
--- a/server/tests/middleware/auth.test.js
+++ b/server/tests/middleware/auth.test.js
@@ -2,14 +2,16 @@ const { describe, it, beforeEach, afterEach, before, after } = require('mocha');
 const { expect } = require('chai');
 const sinon = require('sinon');
 const jwt = require('jsonwebtoken');
-const { authenticateToken } = require('../../middleware/auth');
 const { setupTestEnvironment, teardownTestEnvironment, cleanDatabase, mockRequest, mockResponse, mockNext, createTestUser, createTestTenant } = require('../setup');
 
 describe('Authentication Middleware', () => {
-  let models, sequelize;
+  let models, sequelize, authenticateToken;
 
   before(async () => {
     ({ models, sequelize } = await setupTestEnvironment());
+    // Import middleware after setup to ensure it uses test models
+    const authMiddleware = require('../../middleware/auth');
+    authenticateToken = authMiddleware.authenticateToken;
   });
 
   after(async () => {
diff --git a/server/tests/setup.js b/server/tests/setup.js
index 4ae6799..148bb75 100644
--- a/server/tests/setup.js
+++ b/server/tests/setup.js
@@ -83,6 +83,10 @@ async function setupTestEnvironment() {
     id: mainModelsPath
   };
   
+  // Clear cache for middleware modules so they re-import the overridden models
+  const authMiddlewarePath = path.resolve(__dirname, '../middleware/auth.js');
+  delete require.cache[authMiddlewarePath];
+  
   // Sync database
   await sequelize.sync({ force: true });