still allow overriding

guardian · Dec 5, 2024 · 814ab7c · 814ab7c
1 parent 133db01
commit 814ab7c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/common/app/common/configuration.scala b/common/app/common/configuration.scala
@@ -525,7 +525,6 @@ class GuardianConfiguration extends GuLogging {
       if (environment.isDev) configuration.getStringProperty("commercial.overrideCommercialBundleUrl")
       else None
 
-    def getBundlePath = configuration.getMandatoryStringProperty("commercial.bundlePath")
   }
 
   object journalism {

diff --git a/common/app/views/support/JavaScriptPage.scala b/common/app/views/support/JavaScriptPage.scala
@@ -74,12 +74,11 @@ object JavaScriptPage {
 
     val commercialBundleUrl =
       if (ActiveExperiments.isParticipating(CommercialBundleUpdater)(request))
-        JsString(CommercialBundle.bundleUrl)
+        Configuration.commercial.overrideCommercialBundleUrl
+          .getOrElse(CommercialBundle.bundleUrl)
       else
-        JsString(
-          Configuration.commercial.overrideCommercialBundleUrl
-            .getOrElse(assetURL("javascripts/commercial/graun.standalone.commercial.js")),
-        )
+        Configuration.commercial.overrideCommercialBundleUrl
+          .getOrElse(assetURL("javascripts/commercial/graun.standalone.commercial.js"))
 
     javascriptConfig ++ config ++ commercialMetaData ++ journalismMetaData ++ Map(
       ("edition", JsString(edition.id)),
@@ -101,7 +100,7 @@ object JavaScriptPage {
       ("brazeApiKey", JsString(Configuration.braze.apiKey)),
       ("ipsosTag", JsString(ipsos)),
       ("isAdFree", JsBoolean(isAdFree(request))),
-      ("commercialBundleUrl", commercialBundleUrl),
+      ("commercialBundleUrl", JsString(commercialBundleUrl)),
       ("stage", JsString(Configuration.environment.stage)),
     )
   }.toMap