From 73225223236b25567bc574875786b09ffc3e3cc2 Mon Sep 17 00:00:00 2001
From: Alasdair Smith <ali@alasdairsmith.co.uk>
Date: Thu, 14 Dec 2017 17:05:12 +0000
Subject: [PATCH] Use freeTrialBaseUrl instead of potentially fragile v1BaseUrl

---
 services/web/app/views/layout.pug                      | 5 ++++-
 services/web/public/coffee/main/account-upgrade.coffee | 9 +++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/services/web/app/views/layout.pug b/services/web/app/views/layout.pug
index fc14c2030b..dd93b0b0fa 100644
--- a/services/web/app/views/layout.pug
+++ b/services/web/app/views/layout.pug
@@ -98,7 +98,10 @@ html(itemscope, itemtype='http://schema.org/Product')
 
 		- if (settings.overleaf && settings.overleaf.host)
 			script.
-				window.v1BaseUrl = '!{settings.overleaf.host}'
+				window.freeTrialBaseUrl = '!{settings.overleaf.host}/users/trial'
+		- else
+			script.
+				window.freeTrialBaseUrl = '/user/subscription/new'
 				
 	body
 		if(settings.recaptcha)
diff --git a/services/web/public/coffee/main/account-upgrade.coffee b/services/web/public/coffee/main/account-upgrade.coffee
index 29bc472505..8356458ef9 100644
--- a/services/web/public/coffee/main/account-upgrade.coffee
+++ b/services/web/public/coffee/main/account-upgrade.coffee
@@ -11,12 +11,9 @@ define [
 			w = window.open()
 			go = () ->
 				ga?('send', 'event', 'subscription-funnel', 'upgraded-free-trial', source)
-				if window.v1BaseUrl?
-					url = "#{window.v1BaseUrl}/users/trial"
-				else
-					url = "/user/subscription/new?planCode=#{plan}&ssp=true"
-					if couponCode?
-						url = "#{url}&cc=#{couponCode}"
+				url = "#{window.freeTrialBaseUrl}?planCode=#{plan}&ssp=true"
+				if couponCode?
+					url = "#{url}&cc=#{couponCode}"
 				$scope.startedFreeTrial = true
 
 				switch source