Merge pull request #1357 from fabiovincenzi/failing-tests

fix: enable skipped proxy tests

Author: jescalada

src/proxy/index.ts

@@ -91,28 +91,42 @@ export class Proxy {
   }
 
   public stop(): Promise<void> {
-    return new Promise((resolve, reject) => {
-      try {
-        // Close HTTP server if it exists
-        if (this.httpServer) {
-          this.httpServer.close(() => {
-            console.log('HTTP server closed');
-            this.httpServer = null;
+    const closePromises: Promise<void>[] = [];
+
+    // Close HTTP server if it exists
+    if (this.httpServer) {
+      closePromises.push(
+        new Promise((resolve, reject) => {
+          this.httpServer!.close((err) => {
+            if (err) {
+              reject(err);
+            } else {
+              console.log('HTTP server closed');
+              this.httpServer = null;
+              resolve();
+            }
           });
-        }
+        }),
+      );
+    }
 
-        // Close HTTPS server if it exists
-        if (this.httpsServer) {
-          this.httpsServer.close(() => {
-            console.log('HTTPS server closed');
-            this.httpsServer = null;
+    // Close HTTPS server if it exists
+    if (this.httpsServer) {
+      closePromises.push(
+        new Promise((resolve, reject) => {
+          this.httpsServer!.close((err) => {
+            if (err) {
+              reject(err);
+            } else {
+              console.log('HTTPS server closed');
+              this.httpsServer = null;
+              resolve();
+            }
           });
-        }
+        }),
+      );
+    }
 
-        resolve();
-      } catch (error) {
-        reject(error);
-      }
-    });
+    return Promise.all(closePromises).then(() => {});
   }
 }

src/service/index.ts

@@ -20,7 +20,7 @@ const { GIT_PROXY_UI_PORT: uiPort } = serverConfig;
 const DEFAULT_SESSION_MAX_AGE_HOURS = 12;
 
 const app: Express = express();
-const _httpServer = http.createServer(app);
+let _httpServer: http.Server | null = null;
 
 /**
  * CORS Configuration
@@ -170,6 +170,7 @@ async function start(proxy: Proxy) {
 
   const app = await createApp(proxy);
 
+  _httpServer = http.createServer(app);
   _httpServer.listen(uiPort);
 
   console.log(`Service Listening on ${uiPort}`);
@@ -181,13 +182,28 @@ async function start(proxy: Proxy) {
 /**
  * Stops the proxy service.
  */
-async function stop() {
-  console.log(`Stopping Service Listening on ${uiPort}`);
-  _httpServer.close();
+async function stop(): Promise<void> {
+  if (!_httpServer) {
+    return Promise.resolve();
+  }
+
+  return new Promise((resolve, reject) => {
+    console.log(`Stopping Service Listening on ${uiPort}`);
+    _httpServer!.close((err) => {
+      if (err) {
+        reject(err);
+      } else {
+        console.log('Service stopped');
+        resolve();
+      }
+    });
+  });
 }
 
 export const Service = {
   start,
   stop,
-  httpServer: _httpServer,
+  get httpServer() {
+    return _httpServer;
+  },
 };

src/service/passport/local.ts

@@ -5,6 +5,10 @@ import * as db from '../../db';
 
 export const type = 'local';
 
+// Dynamic import to always get the current db module instance
+// This is necessary for test environments where modules may be reset
+const getDb = () => import('../../db');
+
 export const configure = async (passport: PassportStatic): Promise<PassportStatic> => {
   passport.use(
     new LocalStrategy(
@@ -14,7 +18,8 @@ export const configure = async (passport: PassportStatic): Promise<PassportStati
         done: (err: any, user?: any, info?: any) => void,
       ) => {
         try {
-          const user = await db.findUser(username);
+          const dbModule = await getDb();
+          const user = await dbModule.findUser(username);
           if (!user) {
             return done(null, false, { message: 'Incorrect username.' });
           }
@@ -38,7 +43,8 @@ export const configure = async (passport: PassportStatic): Promise<PassportStati
 
   passport.deserializeUser(async (username: string, done) => {
     try {
-      const user = await db.findUser(username);
+      const dbModule = await getDb();
+      const user = await dbModule.findUser(username);
       done(null, user);
     } catch (err) {
       done(err, null);

test/proxy.test.ts

@@ -1,3 +1,4 @@
+import http from 'http';
 import https from 'https';
 import { describe, it, beforeEach, afterEach, expect, vi } from 'vitest';
 import fs from 'fs';
@@ -15,7 +16,7 @@ import fs from 'fs';
   TODO: Find root cause of this error and fix it 
   https://github.com/finos/git-proxy/issues/1294
 */
-describe.skip('Proxy Module TLS Certificate Loading', () => {
+describe('Proxy Module TLS Certificate Loading', () => {
   let proxyModule: any;
   let mockConfig: any;
   let mockHttpServer: any;
@@ -82,12 +83,17 @@ describe.skip('Proxy Module TLS Certificate Loading', () => {
       };
     });
 
-    vi.doMock('../src/db', () => ({
-      getRepos: mockDb.getRepos,
-      createRepo: mockDb.createRepo,
-      addUserCanPush: mockDb.addUserCanPush,
-      addUserCanAuthorise: mockDb.addUserCanAuthorise,
-    }));
+    vi.doMock('../src/db', async (importOriginal) => {
+      const actual: any = await importOriginal();
+      return {
+        ...actual,
+        getRepos: mockDb.getRepos,
+        createRepo: mockDb.createRepo,
+        addUserCanPush: mockDb.addUserCanPush,
+        addUserCanAuthorise: mockDb.addUserCanAuthorise,
+        getAllProxiedHosts: vi.fn().mockResolvedValue([]),
+      };
+    });
 
     vi.doMock('../src/proxy/chain', async (importOriginal) => {
       const actual: any = await importOriginal();
@@ -97,10 +103,9 @@ describe.skip('Proxy Module TLS Certificate Loading', () => {
       };
     });
 
-    vi.spyOn(https, 'createServer').mockReturnValue({
-      listen: vi.fn().mockReturnThis(),
-      close: vi.fn(),
-    } as any);
+    vi.spyOn(http, 'createServer').mockReturnValue(mockHttpServer);
+
+    vi.spyOn(https, 'createServer').mockReturnValue(mockHttpsServer);
 
     const ProxyClass = (await import('../src/proxy/index')).Proxy;
     proxyModule = new ProxyClass();

test/testProxyRoute.test.ts

@@ -46,7 +46,7 @@ afterAll(() => {
   vi.resetModules();
 });
 
-describe.skip('proxy express application', () => {
+describe('proxy express application', () => {
   let apiApp: Express;
   let proxy: Proxy;
   let cookie: string;