From e1b7af39dc315ec74a24682d6f62fffb464552d9 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Thu, 7 Feb 2019 09:36:43 +0000 Subject: [PATCH] Basic validation of HS URL for reset password --- src/components/structures/auth/ForgotPassword.js | 7 ++++++- src/i18n/strings/en_EN.json | 11 ++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/components/structures/auth/ForgotPassword.js b/src/components/structures/auth/ForgotPassword.js index 9b7b1cf54f..143df85018 100644 --- a/src/components/structures/auth/ForgotPassword.js +++ b/src/components/structures/auth/ForgotPassword.js @@ -241,7 +241,12 @@ module.exports = React.createClass({ serverName: parsedHsUrl.hostname, }); } catch (e) { - // ignore + errorText =
{_t( + "The homeserver URL %(hsUrl)s doesn't seem to be valid URL. Please " + + "enter a valid URL including the protocol prefix.", + { + hsUrl: this.state.enteredHsUrl, + })}
; } // If custom URLs are allowed, wire up the server details edit link. diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 790e261f90..d6bf9dd096 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1374,16 +1374,17 @@ "A new password must be entered.": "A new password must be entered.", "New passwords must match each other.": "New passwords must match each other.", "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.", + "Your account": "Your account", + "Your account on %(serverName)s": "Your account on %(serverName)s", + "The homeserver URL %(hsUrl)s doesn't seem to be valid URL. Please enter a valid URL including the protocol prefix.": "The homeserver URL %(hsUrl)s doesn't seem to be valid URL. Please enter a valid URL including the protocol prefix.", + "A verification email will be sent to your inbox to confirm setting your new password.": "A verification email will be sent to your inbox to confirm setting your new password.", + "Send Reset Email": "Send Reset Email", + "Sign in instead": "Sign in instead", "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.", "I have verified my email address": "I have verified my email address", "Your password has been reset": "Your password has been reset", "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device", "Return to login screen": "Return to login screen", - "Your account": "Your account", - "Your account on %(serverName)s": "Your account on %(serverName)s", - "A verification email will be sent to your inbox to confirm setting your new password.": "A verification email will be sent to your inbox to confirm setting your new password.", - "Send Reset Email": "Send Reset Email", - "Sign in instead": "Sign in instead", "Set a new password": "Set a new password", "Invalid homeserver discovery response": "Invalid homeserver discovery response", "Invalid identity server discovery response": "Invalid identity server discovery response",