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

---
 server/middleware/multi-tenant-auth.js | 23 +----------------------
 server/tests/setup.js                  | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/server/middleware/multi-tenant-auth.js b/server/middleware/multi-tenant-auth.js
index 6d66627..cc694a5 100644
--- a/server/middleware/multi-tenant-auth.js
+++ b/server/middleware/multi-tenant-auth.js
@@ -366,8 +366,6 @@ class MultiTenantAuth {
     try {
       const { User, Tenant } = this.models || require('../models');
       
-      console.log('🔍 validateTenantAccess called with:', { userId, tenantSlug });
-      
       // Find the user
       const user = await User.findByPk(userId, {
         include: [{
@@ -376,31 +374,12 @@ class MultiTenantAuth {
         }]
       });
       
-      console.log('🔍 Found user:', user ? {
-        id: user.id,
-        username: user.username,
-        tenant_id: user.tenant_id,
-        tenant: user.tenant ? {
-          id: user.tenant.id,
-          slug: user.tenant.slug,
-          name: user.tenant.name
-        } : null
-      } : null);
-      
       if (!user) {
-        console.log('❌ User not found');
         return false;
       }
       
       // Check if user's tenant matches the requested tenant
-      const result = user.tenant && user.tenant.slug === tenantSlug;
-      console.log('🔍 Validation result:', {
-        userTenantSlug: user.tenant?.slug,
-        requestedSlug: tenantSlug,
-        result
-      });
-      
-      return result;
+      return user.tenant && user.tenant.slug === tenantSlug;
     } catch (error) {
       console.error('Error validating tenant access:', error);
       return false;
diff --git a/server/tests/setup.js b/server/tests/setup.js
index fbc688f..36f0c57 100644
--- a/server/tests/setup.js
+++ b/server/tests/setup.js
@@ -267,7 +267,22 @@ async function createTestDetection(detectionData = {}) {
     ...detectionData
   };
   
-  return await DroneDetection.create(defaultDetectionData);
+  // Remove any id field to let Sequelize auto-generate UUID
+  delete defaultDetectionData.id;
+  
+  // Additional safety check - remove any UUIDV4 function objects
+  Object.keys(defaultDetectionData).forEach(key => {
+    if (defaultDetectionData[key] && typeof defaultDetectionData[key] === 'object' && 
+        defaultDetectionData[key].constructor && defaultDetectionData[key].constructor.name === 'UUIDV4') {
+      delete defaultDetectionData[key];
+    }
+  });
+  
+  // Try manual UUID generation as a workaround
+  const { v4: uuidv4 } = require('uuid');
+  const detectionWithId = { ...defaultDetectionData, id: uuidv4() };
+  
+  return await DroneDetection.create(detectionWithId);
 }
 
 /**