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

Merge pull request #432 from wunter8/428-server-url-trailing-slash 

strip trailing slash in "use another server" URL
pull/518/head
Philipp C. Heckel 2022-10-09 08:45:09 -04:00 committed by GitHub
parent cbc912d1e3 dd689fd4a6
commit d48619a940
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/src/components/SubscribeDialog.js
View File

@ -90,6 +90,13 @@ const SubscribePage = (props) => {
return validTopic(topic) && !isExistingTopicUrl; return validTopic(topic) && !isExistingTopicUrl;
} }
})(); })();
const updateBaseUrl = (ev, newVal) => {
if (validUrl(newVal)) {
props.setBaseUrl(newVal.replace(/\/$/, '')); // strip traililng / after https?://
} else {
props.setBaseUrl(newVal);
}
};
return ( return (
<> <>
<DialogTitle>{t("subscribe_dialog_subscribe_title")}</DialogTitle> <DialogTitle>{t("subscribe_dialog_subscribe_title")}</DialogTitle>
@ -128,7 +135,7 @@ const SubscribePage = (props) => {
options={existingBaseUrls} options={existingBaseUrls}
sx={{ maxWidth: 400 }} sx={{ maxWidth: 400 }}
inputValue={props.baseUrl} inputValue={props.baseUrl}
onInputChange={(ev, newVal) => props.setBaseUrl(newVal)} onInputChange={updateBaseUrl}
renderInput={ (params) => renderInput={ (params) =>
<TextField <TextField
{...params} {...params}