From 6bb98f2b236e8fa71ca179457c2fc70d35076214 Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Thu, 11 Apr 2024 11:41:51 +0100
Subject: [PATCH] Merge pull request #17871 from overleaf/jpa-bind-v4-v6

[misc] align the host for binding and requesting in tests

GitOrigin-RevId: 916521c56928329ff2cbf2817f3a0a27aeaf8c3d
---
 services/clsi/app.js                                |  4 ++--
 services/clsi/test/acceptance/js/helpers/ClsiApp.js | 12 ++----------
 services/web/test/acceptance/src/helpers/InitApp.js |  2 +-
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/services/clsi/app.js b/services/clsi/app.js
index 2339c78ab7..e1c6f5e04f 100644
--- a/services/clsi/app.js
+++ b/services/clsi/app.js
@@ -368,8 +368,8 @@ loadHttpServer.post('/state/maint', function (req, res, next) {
   res.sendStatus(204)
 })
 
-const port = Settings.internal?.clsi?.port || 3013
-const host = Settings.internal?.clsi?.host || 'localhost'
+const port = Settings.internal.clsi.port
+const host = Settings.internal.clsi.host
 
 const loadTcpPort = Settings.internal.load_balancer_agent.load_port
 const loadHttpPort = Settings.internal.load_balancer_agent.local_port
diff --git a/services/clsi/test/acceptance/js/helpers/ClsiApp.js b/services/clsi/test/acceptance/js/helpers/ClsiApp.js
index d0394453bd..4736315df8 100644
--- a/services/clsi/test/acceptance/js/helpers/ClsiApp.js
+++ b/services/clsi/test/acceptance/js/helpers/ClsiApp.js
@@ -30,11 +30,8 @@ module.exports = {
       this.initing = true
       this.callbacks.push(callback)
       return app.listen(
-        __guard__(
-          Settings.internal != null ? Settings.internal.clsi : undefined,
-          x => x.port
-        ),
-        'localhost',
+        Settings.internal.clsi.port,
+        Settings.internal.clsi.host,
         error => {
           if (error != null) {
             throw error
@@ -54,8 +51,3 @@ module.exports = {
     }
   },
 }
-function __guard__(value, transform) {
-  return typeof value !== 'undefined' && value !== null
-    ? transform(value)
-    : undefined
-}
diff --git a/services/web/test/acceptance/src/helpers/InitApp.js b/services/web/test/acceptance/src/helpers/InitApp.js
index 7c7f770c3c..f4922c8644 100644
--- a/services/web/test/acceptance/src/helpers/InitApp.js
+++ b/services/web/test/acceptance/src/helpers/InitApp.js
@@ -63,7 +63,7 @@ let server
 
 before('start main app', function (done) {
   addSessionEndpoint(app)
-  server = App.listen(23000, 'localhost', done)
+  server = App.listen(23000, '127.0.0.1', done)
 })
 
 before('start queue workers', function () {