Skip .well-known discovery for free server type
This commit is contained in:
parent
6597db6328
commit
f58055c778
1 changed files with 14 additions and 0 deletions
|
@ -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({
|
||||||
|
|
Loading…
Reference in a new issue