@joystick.js/db-canary 0.0.0-canary.2294 → 0.0.0-canary.2296

package/tests/server/integration/production_safety_integration.test.js

@@ -3,21 +3,17 @@ import net from 'net';
 import { create_server } from '../../../src/server/index.js';
 import { encode_message, create_message_parser } from '../../../src/server/lib/tcp_protocol.js';
 import { initialize_database } from '../../../src/server/lib/query_engine.js';
-import { setup_authentication } from '../../../src/server/lib/auth_manager.js';
+import { setup_initial_admin, reset_auth_state } from '../../../src/server/lib/user_auth_manager.js';
 
 let server;
 let port;
-let shared_password;
+let admin_username = 'admin';
+let admin_password = 'admin123';
 
 test.before(async () => {
   try {
-    // Clean up authentication file for fresh tests
-    try {
-      const { unlinkSync } = await import('fs');
-      unlinkSync('authentication.json');
-    } catch (error) {
-      // File doesn't exist, which is fine
-    }
+    // Reset auth state
+    await reset_auth_state();
     
     // Initialize database for testing
     initialize_database();
@@ -38,17 +34,8 @@ test.before(async () => {
       });
     });
     
-    // Set up authentication once for all tests
-    const { client, send, receive, close } = await create_client();
-    try {
-      send({ op: 'setup' });
-      const setup_response = await receive();
-      if (setup_response.ok === 1 || setup_response.ok === true) {
-        shared_password = setup_response.password;
-      }
-    } finally {
-      close();
-    }
+    // Set up initial admin user for all tests
+    await setup_initial_admin(admin_username, admin_password, 'admin@test.com');
   } catch (error) {
     throw error;
   }
@@ -61,6 +48,9 @@ test.after.always(async () => {
       server.close(resolve);
     });
   }
+  
+  // Clean up auth state
+  await reset_auth_state();
 });
 
 const create_client = () => {
@@ -122,8 +112,8 @@ test('production safety - admin stats include comprehensive monitoring', async t
   const { client, send, receive, close } = await create_client();
   
   try {
-    // Authenticate using shared password
-    send({ op: 'authentication', data: { password: shared_password } });
+    // Authenticate using username and password
+    send({ op: 'authentication', data: { username: admin_username, password: admin_password } });
     const auth_response = await receive();
     t.is(auth_response.ok, 1);
     
@@ -187,8 +177,8 @@ test('production safety - request timeout handling', async t => {
   const { client, send, receive, close } = await create_client();
   
   try {
-    // Authenticate using shared password
-    send({ op: 'authentication', data: { password: shared_password } });
+    // Authenticate using username and password
+    send({ op: 'authentication', data: { username: admin_username, password: admin_password } });
     const auth_response = await receive();
     t.is(auth_response.ok, 1);
     
@@ -226,8 +216,8 @@ test('production safety - structured logging for operations', async t => {
   const { client, send, receive, close } = await create_client();
   
   try {
-    // Authenticate using shared password
-    send({ op: 'authentication', data: { password: shared_password } });
+    // Authenticate using username and password
+    send({ op: 'authentication', data: { username: admin_username, password: admin_password } });
     const auth_response = await receive();
     t.is(auth_response.ok, 1);
     
@@ -250,8 +240,8 @@ test('production safety - error handling and categorization', async t => {
   const { client, send, receive, close } = await create_client();
   
   try {
-    // Authenticate using shared password
-    send({ op: 'authentication', data: { password: shared_password } });
+    // Authenticate using username and password
+    send({ op: 'authentication', data: { username: admin_username, password: admin_password } });
     const auth_response = await receive();
     t.is(auth_response.ok, 1);
     
@@ -271,8 +261,8 @@ test('production safety - performance metrics tracking', async t => {
   const { client, send, receive, close } = await create_client();
   
   try {
-    // Authenticate using shared password
-    send({ op: 'authentication', data: { password: shared_password } });
+    // Authenticate using username and password
+    send({ op: 'authentication', data: { username: admin_username, password: admin_password } });
     const auth_response = await receive();
     t.is(auth_response.ok, 1);
     
@@ -298,8 +288,8 @@ test('production safety - memory and resource monitoring', async t => {
   const { client, send, receive, close } = await create_client();
   
   try {
-    // Authenticate using shared password
-    send({ op: 'authentication', data: { password: shared_password } });
+    // Authenticate using username and password
+    send({ op: 'authentication', data: { username: admin_username, password: admin_password } });
     const auth_response = await receive();
     t.is(auth_response.ok, 1);
     
@@ -332,8 +322,8 @@ test('production safety - connection management stats', async t => {
   const { client, send, receive, close } = await create_client();
   
   try {
-    // Authenticate using shared password
-    send({ op: 'authentication', data: { password: shared_password } });
+    // Authenticate using username and password
+    send({ op: 'authentication', data: { username: admin_username, password: admin_password } });
     const auth_response = await receive();
     t.is(auth_response.ok, 1);
     

package/tests/server/integration/replication_integration.test.js

@@ -2,7 +2,7 @@ import test from 'ava';
 import fs from 'fs';
 import net from 'net';
 import { create_server } from '../../../src/server/index.js';
-import { setup_authentication, reset_auth_state } from '../../../src/server/lib/auth_manager.js';
+import { setup_initial_admin, reset_auth_state } from '../../../src/server/lib/user_auth_manager.js';
 import { initialize_database } from '../../../src/server/lib/query_engine.js';
 import { encode_message, create_message_parser } from '../../../src/server/lib/tcp_protocol.js';
 
@@ -11,14 +11,15 @@ const AUTH_FILE_PATH = './settings.db.json';
 // Shared server instance
 let shared_server = null;
 let shared_port = null;
-let shared_password = null;
+let admin_username = 'admin';
+let admin_password = 'admin123';
 
 test.before(async () => {
   // Set test environment
   process.env.NODE_ENV = 'test';
   
   // Reset auth state and clean up any existing auth files
-  reset_auth_state();
+  await reset_auth_state();
   if (fs.existsSync(AUTH_FILE_PATH)) {
     fs.unlinkSync(AUTH_FILE_PATH);
   }
@@ -45,6 +46,9 @@ test.before(async () => {
       }
     });
   });
+  
+  // Set up initial admin user
+  await setup_initial_admin(admin_username, admin_password, 'admin@test.com');
 });
 
 test.after.always(async () => {
@@ -83,7 +87,7 @@ test.after.always(async () => {
   }
   
   // Reset auth state and clean up auth files
-  reset_auth_state();
+  await reset_auth_state();
   if (fs.existsSync(AUTH_FILE_PATH)) {
     try {
       fs.unlinkSync(AUTH_FILE_PATH);
@@ -98,12 +102,9 @@ test.after.always(async () => {
   }
 });
 
-test.beforeEach(() => {
-  // Reset auth state before each test
-  reset_auth_state();
-  if (fs.existsSync(AUTH_FILE_PATH)) {
-    fs.unlinkSync(AUTH_FILE_PATH);
-  }
+test.beforeEach(async () => {
+  // Ensure admin user is set up for each test
+  await setup_initial_admin(admin_username, admin_password, 'admin@test.com');
 });
 
 const create_client = () => {
@@ -146,14 +147,11 @@ const create_client = () => {
 };
 
 test('replication admin operations - get status when disabled', async t => {
-  // Setup authentication first
-  const password = setup_authentication();
-  
   const { client, send, receive, close } = await create_client();
   
   try {
-    // First authenticate
-    send({ op: 'authentication', data: { password } });
+    // First authenticate with username and password
+    send({ op: 'authentication', data: { username: admin_username, password: admin_password } });
     const auth_response = await receive();
     t.is(auth_response.ok, 1);
     
@@ -171,14 +169,11 @@ test('replication admin operations - get status when disabled', async t => {
 });
 
 test('replication integration - basic server functionality works', async t => {
-  // Setup authentication first
-  const password = setup_authentication();
-  
   const { client, send, receive, close } = await create_client();
   
   try {
-    // First authenticate
-    send({ op: 'authentication', data: { password } });
+    // First authenticate with username and password
+    send({ op: 'authentication', data: { username: admin_username, password: admin_password } });
     const auth_response = await receive();
     t.is(auth_response.ok, 1);
     
@@ -200,14 +195,11 @@ test('replication integration - basic server functionality works', async t => {
 });
 
 test('replication integration - database operations work normally', async t => {
-  // Setup authentication first
-  const password = setup_authentication();
-  
   const { client, send, receive, close } = await create_client();
   
   try {
-    // First authenticate
-    send({ op: 'authentication', data: { password } });
+    // First authenticate with username and password
+    send({ op: 'authentication', data: { username: admin_username, password: admin_password } });
     const auth_response = await receive();
     t.is(auth_response.ok, 1);
     

package/tests/server/lib/operations/admin.test.js

@@ -4,7 +4,7 @@ import fs from 'fs';
 import { encode as encode_messagepack, decode as decode_messagepack } from 'msgpackr';
 import { create_server } from '../../../../src/server/index.js';
 import { initialize_database, get_database, cleanup_database } from '../../../../src/server/lib/query_engine.js';
-import { reset_auth_state } from '../../../../src/server/lib/auth_manager.js';
+import { reset_auth_state } from '../../../../src/server/lib/user_auth_manager.js';
 
 // Dynamic port allocation
 let current_port = 4000;
@@ -17,7 +17,7 @@ let port;
 
 test.beforeEach(async () => {
   // Reset auth state
-  reset_auth_state();
+  await reset_auth_state();
   
   // Initialize test database and clear it for clean state between tests
   initialize_database('./test_data');
@@ -51,7 +51,7 @@ test.afterEach(async () => {
   }
   
   // Clean up auth state after each test
-  reset_auth_state();
+  await reset_auth_state();
   
   // Clean up database
   await cleanup_database();
@@ -112,7 +112,41 @@ const send_message = (client, message) => {
 };
 
 const authenticate_client = async (client) => {
-  // First setup authentication
+  // Try to setup initial admin user first (since tests clean database)
+  try {
+    const setup_admin_response = await send_message(client, {
+      op: 'admin',
+      data: {
+        admin_action: 'setup_initial_admin',
+        username: 'admin',
+        password: 'admin123',
+        email: 'admin@test.com'
+      }
+    });
+    
+    // If successful or already exists, proceed with authentication
+    if (setup_admin_response.ok || setup_admin_response.error?.includes('already exists')) {
+      // Now authenticate with username/password
+      const auth_response = await send_message(client, {
+        op: 'authentication',
+        data: { 
+          username: 'admin',
+          password: 'admin123'
+        }
+      });
+      
+      if (!auth_response.ok) {
+        throw new Error(`Authentication failed: ${JSON.stringify(auth_response.error || auth_response)}`);
+      }
+      
+      return 'admin123';
+    }
+  } catch (error) {
+    // If admin setup fails, fall back to old setup method for backward compatibility
+    console.log('Admin setup failed, trying legacy setup method:', error.message);
+  }
+  
+  // Fallback: try legacy setup method
   const setup_response = await send_message(client, {
     op: 'setup',
     data: {}
@@ -127,7 +161,7 @@ const authenticate_client = async (client) => {
     throw new Error(`Setup response did not contain password: ${JSON.stringify(setup_response)}`);
   }
   
-  // Then authenticate
+  // Legacy authentication with just password
   const auth_response = await send_message(client, {
     op: 'authentication',
     data: { password }