From e894dbc4e810cbcfca116876c574534b082a623e Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Tue, 13 Apr 2021 14:34:30 -0400 Subject: [PATCH] fix: Trim origin url in desktop --- ui/desktop/app/services/origin.js | 3 ++- ui/desktop/tests/unit/services/origin-test.js | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ui/desktop/app/services/origin.js b/ui/desktop/app/services/origin.js index 9ca0895f2..c6f6a4580 100644 --- a/ui/desktop/app/services/origin.js +++ b/ui/desktop/app/services/origin.js @@ -66,7 +66,8 @@ export default class OriginService extends Service { // Silently drop trailing slashes if present. // This is important since API paths that will be appended to the origin // will include preceeding slashes already. - origin = origin.replace(/\/*$/, ''); + // Trim whitespaces around origin. + origin = origin.replace(/\/*$/, '').trim(); this.adapter.host = origin; this.rendererOrigin = origin; if (origin !== (await this.mainOrigin)) { diff --git a/ui/desktop/tests/unit/services/origin-test.js b/ui/desktop/tests/unit/services/origin-test.js index cc6cdfa69..88746b92a 100644 --- a/ui/desktop/tests/unit/services/origin-test.js +++ b/ui/desktop/tests/unit/services/origin-test.js @@ -35,4 +35,15 @@ module('Unit | Service | origin', function (hooks) { assert.equal(service.rendererOrigin, window.location.origin); assert.equal(service.adapter.host, window.location.origin); }); + + test('trim spaces from origin on setOrigin', async function (assert) { + assert.expect(4); + sinon.stub(ipcService, 'invoke'); + await service.setOrigin(` ${window.location.origin} `); + assert.equal(service.rendererOrigin, window.location.origin); + assert.equal(service.adapter.host, window.location.origin); + await service.setOrigin(` ${window.location.origin} `); + assert.equal(service.rendererOrigin, window.location.origin); + assert.equal(service.adapter.host, window.location.origin); + }); });