matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-07 10:46:24 +03:00
Code Activity

Skip .well-known discovery for free server type

Browse Source
This commit is contained in:
J. Ryan Stinnett
2019-01-31 12:01:58 -06:00
parent 6597db6328
commit f58055c778
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/structures/auth/Login.js
View File

@@ -263,6 +263,11 @@ module.exports = React.createClass({
username: username, username: username,
discoveryError: null, discoveryError: null,
}); });
// If the free server type is selected, we don't show server details at all,
// so it doesn't make sense to try .well-known discovery.
if (this.state.serverType === ServerType.FREE) {
return;
}
if (username[0] === "@") { if (username[0] === "@") {
const serverName = username.split(':').slice(1).join(':'); const serverName = username.split(':').slice(1).join(':');
try { try {
@@ -385,6 +390,15 @@ module.exports = React.createClass({
this.setState({findingHomeserver: true}); this.setState({findingHomeserver: true});
try { try {
const discovery = await AutoDiscovery.findClientConfig(serverName); const discovery = await AutoDiscovery.findClientConfig(serverName);
// The server type may have changed while discovery began in the background.
// If it has become the free server type which doesn't show server details,
// ignore discovery results.
if (this.state.serverType === ServerType.FREE) {
this.setState({findingHomeserver: false});
return;
}
const state = discovery["m.homeserver"].state; const state = discovery["m.homeserver"].state;
if (state !== AutoDiscovery.SUCCESS && state !== AutoDiscovery.PROMPT) { if (state !== AutoDiscovery.SUCCESS && state !== AutoDiscovery.PROMPT) {
this.setState({ this.setState({