From 6dd9a0213cf77623900102334d5ed30b20068cbf Mon Sep 17 00:00:00 2001 From: Mira Nord Date: Sun, 16 Mar 2025 21:40:52 +0100 Subject: [PATCH] Trim whitespace and protocol / path information --- src/open/ClientView.js | 2 +- src/open/ClientViewModel.js | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/open/ClientView.js b/src/open/ClientView.js index 37c2b9e..c73b682 100644 --- a/src/open/ClientView.js +++ b/src/open/ClientView.js @@ -144,7 +144,7 @@ export class SetCustomWebInstanceView extends TemplateView { evt.preventDefault(); const form = evt.target; const {instanceHostname} = form.elements; - this.value.setCustomWebInstance(instanceHostname.value || undefined); + this.value.setCustomWebInstance(instanceHostname.value); this.value.closeCustomWebInstanceForm(); } diff --git a/src/open/ClientViewModel.js b/src/open/ClientViewModel.js index b2e5f87..210e30b 100644 --- a/src/open/ClientViewModel.js +++ b/src/open/ClientViewModel.js @@ -262,8 +262,11 @@ export class ClientViewModel extends ViewModel { } setCustomWebInstance(hostname) { + if (hostname) { + hostname = hostname.trim().replace(/^https:\/\//, '').replace(/\/.*$/, ''); + } this.preferences.setClient(this._client.id, hostname ? this._webPlatform : (this._nativePlatform || this._webPlatform)); - this.preferences.setCustomWebInstance(this._client.id, hostname); + this.preferences.setCustomWebInstance(this._client.id, hostname || undefined); this._update(); } }