From 51f5f80e2d098c6c080f5b6a33abd996b764b4af Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Fri, 20 May 2022 12:08:35 +0100 Subject: [PATCH] Merge pull request #7630 from overleaf/csh-issue-7543-rails-v1-run-in-GKE Run rails-v1 on GKE GitOrigin-RevId: b8138a40da6279b7df68e3b9e0d308939c843679 --- .../src/Features/BrandVariations/BrandVariationsHandler.js | 2 +- .../unit/src/BrandVariations/BrandVariationsHandlerTests.js | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/services/web/app/src/Features/BrandVariations/BrandVariationsHandler.js b/services/web/app/src/Features/BrandVariations/BrandVariationsHandler.js index a3c3b452e4..a9c30d07c9 100644 --- a/services/web/app/src/Features/BrandVariations/BrandVariationsHandler.js +++ b/services/web/app/src/Features/BrandVariations/BrandVariationsHandler.js @@ -78,5 +78,5 @@ function setV1AsHostIfRelativeURL(urlString) { // As it only applies if the second argument is not absolute, we can use it to transform relative URLs into // absolute ones using v1 as the host. If the URL is absolute (e.g. a filepicker one), then the base // argument is just ignored - return new URL(urlString, settings.apis.v1.url).href + return new URL(urlString, settings.apis.v1.publicUrl).href } diff --git a/services/web/test/unit/src/BrandVariations/BrandVariationsHandlerTests.js b/services/web/test/unit/src/BrandVariations/BrandVariationsHandlerTests.js index 264be584aa..08491cc511 100644 --- a/services/web/test/unit/src/BrandVariations/BrandVariationsHandlerTests.js +++ b/services/web/test/unit/src/BrandVariations/BrandVariationsHandlerTests.js @@ -26,7 +26,7 @@ describe('BrandVariationsHandler', function () { this.settings = { apis: { v1: { - url: 'http://overleaf.example.com', + publicUrl: 'http://overleaf.example.com', }, }, modules: { @@ -111,7 +111,9 @@ describe('BrandVariationsHandler', function () { '12', (err, brandVariationDetails) => { expect( - brandVariationDetails.logo_url.startsWith(this.settings.apis.v1.url) + brandVariationDetails.logo_url.startsWith( + this.settings.apis.v1.publicUrl + ) ).to.be.true return done() }