From 475e6971a2fe0561e8808162fa7226d7f49d2e6f Mon Sep 17 00:00:00 2001
From: Miguel Serrano <mserranom@users.noreply.github.com>
Date: Wed, 20 Nov 2019 12:45:31 +0100
Subject: [PATCH] Revert "Remove settings.apis.v1 defaults (#2365)" (#2388)

This reverts commit 53d191a080fd50b83236f4e16a0dd10e72e705ad.

GitOrigin-RevId: 15b703670efd1cb13ebe9bd12015ec1109f60bb8
---
 services/web/config/settings.defaults.coffee       | 14 ++++----------
 .../test/acceptance/config/settings.test.coffee    |  6 ------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee
index e9b3f38707..641bef5d9b 100644
--- a/services/web/config/settings.defaults.coffee
+++ b/services/web/config/settings.defaults.coffee
@@ -15,16 +15,10 @@ httpAuthUsers[httpAuthUser] = httpAuthPass
 
 sessionSecret = process.env['SESSION_SECRET'] or "secret-please-change"
 
-if process.env['V1_API_URL'] or process.env['V1_HOST']
-	v1Api =
-		url: process.env['V1_API_URL'] or "http://#{process.env['V1_HOST']}:5000"
-		user: process.env['V1_API_USER']
-		pass: process.env['V1_API_PASSWORD']
-else
-	v1Api =
-		url: undefined
-		user: undefined
-		pass: undefined
+v1Api =
+	url: process.env['V1_API_URL'] or "http://#{process.env['V1_HOST'] or 'localhost'}:5000"
+	user: process.env['V1_API_USER'] or 'overleaf'
+	pass: process.env['V1_API_PASSWORD'] or 'password'
 
 module.exports = settings =
 
diff --git a/services/web/test/acceptance/config/settings.test.coffee b/services/web/test/acceptance/config/settings.test.coffee
index 9c6f72cbad..9f659f22e1 100644
--- a/services/web/test/acceptance/config/settings.test.coffee
+++ b/services/web/test/acceptance/config/settings.test.coffee
@@ -1,16 +1,10 @@
 v1Api =
 	url: "http://#{process.env['V1_HOST'] or 'localhost'}:5000"
-	user: process.env['V1_API_USER'] or 'overleaf'
-	pass: process.env['V1_API_PASSWORD'] or 'password'
 
 module.exports =
 	enableSubscriptions: true
 
 	apis:
-		v1:
-			url: v1Api.url
-			user: v1Api.user
-			pass: v1Api.pass
 		recurly:
 			# Set up our own mock recurly server
 			url: 'http://localhost:6034'