imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change how the default server name and HS URL interact

Browse source 
They are now independent of each other. If both are specified in the config, the user will see an error and be prevented from logging in. The expected behaviour is that when a default server name is given, we do a .well-known lookup to find the default homeserver (and block the UI while we do this to prevent it from using matrix.org while we go out and find more information). If the config specifies just a default homeserver URL however, we don't do anything special.
This commit is contained in:
Travis Ralston 2018-12-07 15:36:49 -07:00
parent 0a32570026
commit 6707186edc
5 changed files with 24 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/views/login/PasswordLogin.js
View file

@ -252,21 +252,12 @@ class PasswordLogin extends React.Component {
}
let matrixIdText = _t('Matrix ID');
let matrixIdSubtext = null;
if (this.props.hsName) {
matrixIdText = _t('%(serverName)s Matrix ID', {serverName: this.props.hsName});
}
if (this.props.hsUrl) {
} else {
try {
const parsedHsUrl = new URL(this.props.hsUrl);
if (!this.props.hsName) {
matrixIdText = _t('%(serverName)s Matrix ID', {serverName: parsedHsUrl.hostname});
} else if (parsedHsUrl.hostname !== this.props.hsName) {
matrixIdSubtext = _t('%(serverName)s is located at %(homeserverUrl)s', {
serverName: this.props.hsName,
homeserverUrl: this.props.hsUrl,
});
}
matrixIdText = _t('%(serverName)s Matrix ID', {serverName: parsedHsUrl.hostname});
} catch (e) {
// ignore
}
@ -304,7 +295,6 @@ class PasswordLogin extends React.Component {
<div>
<form onSubmit={this.onSubmitForm}>
{ loginType }
<span className="mx_Login_subtext">{ matrixIdSubtext }</span>
{ loginField }
<input className={pwFieldClass} ref={(e) => {this._passwordField = e;}} type="password"
name="password"