OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3571 from matrix-org/jryans/identity-server-warnings 

Remove messages implying you need an identity server for email recovery
pull/21833/head
J. Ryan Stinnett 2019-10-28 16:33:25 +02:00 committed by GitHub
parent a0aef67793 99fa100b92
commit 54cea6a5e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/components/views/auth/RegistrationForm.js
View File

@ -97,15 +97,15 @@ module.exports = createReactClass({
const haveIs = Boolean(this.props.serverConfig.isUrl); const haveIs = Boolean(this.props.serverConfig.isUrl);
let desc; let desc;
if (haveIs) { if (this.props.serverRequiresIdServer && !haveIs) {
desc = _t( desc = _t(
"If you don't specify an email address, you won't be able to reset your password. " + "No identity server is configured so you cannot add an email address in order to " +
"Are you sure?", "reset your password in the future.",
); );
} else { } else {
desc = _t( desc = _t(
"No Identity Server is configured so you cannot add add an email address in order to " + "If you don't specify an email address, you won't be able to reset your password. " +
"reset your password in the future.", "Are you sure?",
); );
} }
@ -439,7 +439,10 @@ module.exports = createReactClass({
_showEmail() { _showEmail() {
const haveIs = Boolean(this.props.serverConfig.isUrl); const haveIs = Boolean(this.props.serverConfig.isUrl);
if ((this.props.serverRequiresIdServer && !haveIs) || !this._authStepIsUsed('m.login.email.identity')) { if (
(this.props.serverRequiresIdServer && !haveIs) ||
!this._authStepIsUsed('m.login.email.identity')
) {
return false; return false;
} }
return true; return true;
@ -448,8 +451,11 @@ module.exports = createReactClass({
_showPhoneNumber() { _showPhoneNumber() {
const threePidLogin = !SdkConfig.get().disable_3pid_login; const threePidLogin = !SdkConfig.get().disable_3pid_login;
const haveIs = Boolean(this.props.serverConfig.isUrl); const haveIs = Boolean(this.props.serverConfig.isUrl);
const haveRequiredIs = this.props.serverRequiresIdServer && !haveIs; if (
if (!threePidLogin || haveRequiredIs || !this._authStepIsUsed('m.login.msisdn')) { !threePidLogin ||
(this.props.serverRequiresIdServer && !haveIs) ||
!this._authStepIsUsed('m.login.msisdn')
) {
return false; return false;
} }
return true; return true;
@ -592,12 +598,15 @@ module.exports = createReactClass({
} }
} }
const haveIs = Boolean(this.props.serverConfig.isUrl); const haveIs = Boolean(this.props.serverConfig.isUrl);
const noIsText = haveIs ? null : <div> let noIsText = null;
{_t( if (this.props.serverRequiresIdServer && !haveIs) {
"No Identity Server is configured: no email addreses can be added. " + noIsText = <div>
"You will be unable to reset your password.", {_t(
)} "No identity server is configured so you cannot add an email address in order to " +
</div>; "reset your password in the future.",
)}
</div>;
}
return ( return (
<div> <div>

3
src/i18n/strings/en_EN.json
View File

@ -1522,8 +1522,8 @@
"Phone": "Phone", "Phone": "Phone",
"Not sure of your password? <a>Set a new one</a>": "Not sure of your password? <a>Set a new one</a>", "Not sure of your password? <a>Set a new one</a>": "Not sure of your password? <a>Set a new one</a>",
"Sign in with": "Sign in with", "Sign in with": "Sign in with",
"No identity server is configured so you cannot add an email address in order to reset your password in the future.": "No identity server is configured so you cannot add an email address in order to reset your password in the future.",
"If you don't specify an email address, you won't be able to reset your password. Are you sure?": "If you don't specify an email address, you won't be able to reset your password. Are you sure?", "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "If you don't specify an email address, you won't be able to reset your password. Are you sure?",
"No Identity Server is configured so you cannot add add an email address in order to reset your password in the future.": "No Identity Server is configured so you cannot add add an email address in order to reset your password in the future.",
"Use an email address to recover your account": "Use an email address to recover your account", "Use an email address to recover your account": "Use an email address to recover your account",
"Enter email address (required on this homeserver)": "Enter email address (required on this homeserver)", "Enter email address (required on this homeserver)": "Enter email address (required on this homeserver)",
"Doesn't look like a valid email address": "Doesn't look like a valid email address", "Doesn't look like a valid email address": "Doesn't look like a valid email address",
@ -1544,7 +1544,6 @@
"Create your Matrix account on <underlinedServerName />": "Create your Matrix account on <underlinedServerName />", "Create your Matrix account on <underlinedServerName />": "Create your Matrix account on <underlinedServerName />",
"Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.", "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.": "Set an email for account recovery. Use email or phone to optionally be discoverable by existing contacts.",
"Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.", "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.": "Set an email for account recovery. Use email to optionally be discoverable by existing contacts.",
"No Identity Server is configured: no email addreses can be added. You will be unable to reset your password.": "No Identity Server is configured: no email addreses can be added. You will be unable to reset your password.",
"Enter your custom homeserver URL <a>What does this mean?</a>": "Enter your custom homeserver URL <a>What does this mean?</a>", "Enter your custom homeserver URL <a>What does this mean?</a>": "Enter your custom homeserver URL <a>What does this mean?</a>",
"Homeserver URL": "Homeserver URL", "Homeserver URL": "Homeserver URL",
"Enter your custom identity server URL <a>What does this mean?</a>": "Enter your custom identity server URL <a>What does this mean?</a>", "Enter your custom identity server URL <a>What does this mean?</a>": "Enter your custom identity server URL <a>What does this mean?</a>",