feat: update database configuration for test environment and refactor encryption key handling

Author: JasonKrik

services/backend/src/db/config.ts

@@ -5,7 +5,8 @@ import path from 'node:path';
 // Storing it in the 'persistent_data' directory within services/backend
 // __dirname is services/backend/src/db, so ../../persistent_data points to services/backend/persistent_data
 const CONFIG_DIR = path.join(__dirname, '..', '..', 'persistent_data');
-const CONFIG_FILE_PATH = path.join(CONFIG_DIR, 'db.selection.json');
+const DB_SELECTION_FILE_NAME = process.env.NODE_ENV === 'test' ? 'db.selection.test.json' : 'db.selection.json';
+const CONFIG_FILE_PATH = path.join(CONFIG_DIR, DB_SELECTION_FILE_NAME);
 
 // Helper function to check if we're in test mode
 function isTestMode(): boolean {

services/backend/src/routes/globalSettings/index.ts

@@ -1,6 +1,7 @@
 import type { FastifyInstance, FastifyRequest, FastifyReply } from 'fastify';
 import { ZodError } from 'zod';
 import { GlobalSettingsService } from '../../services/globalSettingsService';
+import { validateEncryption } from '../../utils/encryption'; // Static import
 import { requirePermission } from '../../middleware/roleMiddleware';
 import {
   CreateGlobalSettingSchema,
@@ -310,8 +311,8 @@ export default async function globalSettingsRoute(fastify: FastifyInstance) {
     preHandler: requirePermission('settings.view'),
   }, async (request, reply) => {
     try {
-      const { validateEncryption } = await import('../../utils/encryption');
-      const encryptionWorking = validateEncryption();
+      // const { validateEncryption } = await import('@src/utils/encryption'); // Removed dynamic import
+      const encryptionWorking = validateEncryption(); // Use statically imported function
 
       return reply.status(200).send({
         success: true,

services/backend/src/test/testServer.ts

@@ -10,10 +10,18 @@ const TAG_LENGTH = 16; // 128 bits
  * Uses scrypt for key derivation with a fixed salt
  */
 function getEncryptionKey(): Buffer {
-  const secret = process.env.DEPLOYSTACK_ENCRYPTION_SECRET || 'fallback-secret-key-change-in-production-immediately';
+  const secretFromEnv = process.env.DEPLOYSTACK_ENCRYPTION_SECRET;
+  if (process.env.NODE_ENV === 'test') {
+    console.log(`[TEST_ENV_ENCRYPTION_DEBUG] getEncryptionKey() using DEPLOYSTACK_ENCRYPTION_SECRET: "${secretFromEnv}"`);
+  }
+  const secret = secretFromEnv || 'fallback-secret-key-change-in-production-immediately';
   // Use a fixed salt for consistent key derivation
   const salt = 'deploystack-global-settings-salt';
-  return crypto.scryptSync(secret, salt, KEY_LENGTH);
+  const derivedKey = crypto.scryptSync(secret, salt, KEY_LENGTH);
+  // if (process.env.NODE_ENV === 'test') {
+  //   console.log(`[TEST_ENV_ENCRYPTION_DEBUG] Derived key (first 4 bytes hex): ${derivedKey.subarray(0,4).toString('hex')}`);
+  // }
+  return derivedKey;
 }
 
 /**

services/backend/src/utils/encryption.ts

@@ -1,34 +1,43 @@
 import { FastifyInstance } from 'fastify';
-import { createTestServer } from '../src/test/testServer'; // Use simplified test server
+import { createServer } from '../src/server'; // Use main server
 import * as fs from 'fs-extra';
 import * as path from 'path';
 import { setTestContext } from './testContext';
 
 const TEST_PORT = 3002; // Use a different port for testing
-const PERSISTENT_DATA_PATH = path.join(__dirname, '..', 'persistent_data');
-const DB_FILE_PATH = path.join(PERSISTENT_DATA_PATH, 'database', 'deploystack.db');
-const DB_SELECTION_PATH = path.join(PERSISTENT_DATA_PATH, 'db.selection.json');
+const PERSISTENT_DATA_PATH = path.join(__dirname, '..', 'persistent_data'); // This is services/backend/persistent_data
+const TEST_DB_FILE_PATH = path.join(PERSISTENT_DATA_PATH, 'database', 'deploystack.test.db'); // Test-specific DB
+const TEST_DB_SELECTION_PATH = path.join(PERSISTENT_DATA_PATH, 'db.selection.test.json'); // Test-specific selection
 
 export default async function globalSetup() {
   try {
     // Set environment variables for testing
     process.env.NODE_ENV = 'test';
     process.env.PORT = String(TEST_PORT);
     process.env.DEPLOYSTACK_ENCRYPTION_SECRET = 'test-super-secret-key-for-jest';
+    process.env.COOKIE_SECRET = 'test-cookie-secret-for-jest'; // Add cookie secret for tests
+    process.env.DEPLOYSTACK_FRONTEND_URL = 'http://localhost:5174'; // Add dummy frontend URL for tests
 
     // Clean up persistent data before tests
-    if (await fs.pathExists(DB_FILE_PATH)) {
-      await fs.remove(DB_FILE_PATH);
+    if (await fs.pathExists(TEST_DB_FILE_PATH)) {
+      await fs.remove(TEST_DB_FILE_PATH);
     }
-    if (await fs.pathExists(DB_SELECTION_PATH)) {
-      await fs.remove(DB_SELECTION_PATH);
+    if (await fs.pathExists(TEST_DB_SELECTION_PATH)) {
+      await fs.remove(TEST_DB_SELECTION_PATH);
     }
 
-    // Ensure the database directory exists
+    // Ensure the database directory exists (it's shared, but files are separate)
     await fs.ensureDir(path.join(PERSISTENT_DATA_PATH, 'database'));
 
-    // Create simplified test server
-    const server = await createTestServer();
+    // IMPORTANT: We need to tell the application to USE this test database file.
+    // The db/config.ts now uses 'db.selection.test.json' when NODE_ENV is 'test'.
+    // globalSetup.ts deletes this file, so the DB system will likely see no config.
+    // The db/index.ts or related setup logic should handle creating/using the
+    // 'deploystack.test.db' when in test mode and no db.selection.test.json is found.
+    // The line `process.env.DB_FILE_NAME = 'deploystack.test.db';` was removed as db/config.ts doesn't use it.
+
+    // Create main server instance for testing
+    const server = await createServer();
 
     // Start the server
     await server.listen({ port: TEST_PORT, host: '0.0.0.0' });