From 11419845e86e363a03e466b071e4677ae8197cde Mon Sep 17 00:00:00 2001
From: Miguel Serrano <mserranom@users.noreply.github.com>
Date: Thu, 21 Nov 2019 11:08:26 +0100
Subject: [PATCH] Remove v1 defaults (#2391)

GitOrigin-RevId: e9812c9d7785ac64500dcd3925a6b5be4cb04d7c
---
 services/web/config/settings.defaults.coffee       | 14 ++++++++++----
 .../test/acceptance/config/settings.test.coffee    |  8 +++++++-
 .../unit/src/Analytics/AnalyticsControllerTests.js |  5 +++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee
index 641bef5d9b..e9b3f38707 100644
--- a/services/web/config/settings.defaults.coffee
+++ b/services/web/config/settings.defaults.coffee
@@ -15,10 +15,16 @@ httpAuthUsers[httpAuthUser] = httpAuthPass
 
 sessionSecret = process.env['SESSION_SECRET'] or "secret-please-change"
 
-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'
+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
 
 module.exports = settings =
 
diff --git a/services/web/test/acceptance/config/settings.test.coffee b/services/web/test/acceptance/config/settings.test.coffee
index 9f659f22e1..b550da5627 100644
--- a/services/web/test/acceptance/config/settings.test.coffee
+++ b/services/web/test/acceptance/config/settings.test.coffee
@@ -1,10 +1,16 @@
 v1Api =
-	url: "http://#{process.env['V1_HOST'] or 'localhost'}:5000"
+	url: "http://localhost:5000"
+	user: 'overleaf'
+	pass: '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'
diff --git a/services/web/test/unit/src/Analytics/AnalyticsControllerTests.js b/services/web/test/unit/src/Analytics/AnalyticsControllerTests.js
index 9d2a2cad4e..292687f0a7 100644
--- a/services/web/test/unit/src/Analytics/AnalyticsControllerTests.js
+++ b/services/web/test/unit/src/Analytics/AnalyticsControllerTests.js
@@ -19,6 +19,10 @@ describe('AnalyticsController', function() {
       getInstitutionLicences: sinon.stub().callsArgWith(4)
     }
 
+    this.Features = {
+      hasFeature: sinon.stub().returns(true)
+    }
+
     this.controller = SandboxedModule.require(modulePath, {
       globals: {
         console: console
@@ -28,6 +32,7 @@ describe('AnalyticsController', function() {
         '../Authentication/AuthenticationController': this
           .AuthenticationController,
         '../Institutions/InstitutionsAPI': this.InstitutionsAPI,
+        '../../infrastructure/Features': this.Features,
         'logger-sharelatex': {
           log() {}
         },