astra/ntfy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

strip trailing slash after server url in publish dialog

Browse source 
fixes #441
This commit is contained in:
Hunter Kehoe 2022-10-18 22:02:04 -06:00
parent 0d46bfa76e
commit cf370bfdda
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
web/src/components/PublishDialog.js
View file

@ -90,6 +90,14 @@ const PublishDialog = (props) => {
setMessage(props.message); setMessage(props.message);
}, [props.message]); }, [props.message]);
const updateBaseUrl = (newVal) => {
if (validUrl(newVal)) {
setBaseUrl(newVal.replace(/\/$/, '')); // strip traililng slash after https?://
} else {
setBaseUrl(newVal);
}
};
const handleSubmit = async () => { const handleSubmit = async () => {
const url = new URL(topicUrl(baseUrl, topic)); const url = new URL(topicUrl(baseUrl, topic));
if (title.trim()) { if (title.trim()) {
@ -242,7 +250,7 @@ const PublishDialog = (props) => {
label={t("publish_dialog_base_url_label")} label={t("publish_dialog_base_url_label")}
placeholder={t("publish_dialog_base_url_placeholder")} placeholder={t("publish_dialog_base_url_placeholder")}
value={baseUrl} value={baseUrl}
onChange={ev => setBaseUrl(ev.target.value)} onChange={ev => updateBaseUrl(ev.target.value)}
disabled={disabled} disabled={disabled}
type="url" type="url"
variant="standard" variant="standard"