Merge pull request #2971 from matrix-org/travis/wk/fallback_hs

Only expose the fallback_hs_url if the homeserver is the default homeserver
matrix-org · May 16, 2019 · f75dc9c · f75dc9c
2 parents 8c326bf + 34719b9
commit f75dc9c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
@@ -203,9 +203,12 @@ export default React.createClass({
         };
     },
 
-    // TODO: TravisR - Remove this or put it somewhere else
     getFallbackHsUrl: function() {
-        return this.props.config.fallback_hs_url;
+        if (this.props.serverConfig.isDefault) {
+            return this.props.config.fallback_hs_url;
+        } else {
+            return null;
+        }
     },
 
     getServerProperties() {

diff --git a/src/utils/AutoDiscoveryUtils.js b/src/utils/AutoDiscoveryUtils.js
@@ -26,6 +26,8 @@ export class ValidatedServerConfig {
 
     isUrl: string;
     identityEnabled: boolean;
+
+    isDefault: boolean;
 }
 
 export default class AutoDiscoveryUtils {
@@ -99,6 +101,7 @@ export default class AutoDiscoveryUtils {
             hsNameIsDifferent: url.hostname !== preferredHomeserverName,
             isUrl: preferredIdentityUrl,
             identityEnabled: !SdkConfig.get()['disable_identity_server'],
+            isDefault: false,
         });
     }
 }