From 548e9184372d9a7c8a74a07841f97134ee55fbb4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 27 Mar 2020 12:01:10 +0000
Subject: [PATCH] only auto-sso when disable_custom_urls is true

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/auth/Login.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index 6c6a8bedbd..134f6fa6f3 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -435,7 +435,8 @@ export default createReactClass({
 
                 // if this is the initial render and the flow we choose is SSO/CAS then go to it automatically
                 // we do not do this when the user has changed to the server manually as that may be jarring.
-                if (initial && SSO_FLOWS.includes(flows[i].type)) {
+                // Only allow it when disable_custom_urls is asserted so that we don't prevent user from changing HS URL
+                if (initial && SdkConfig.get()['disable_custom_urls'] && SSO_FLOWS.includes(flows[i].type)) {
                     const tmpCli = this._loginLogic.createTemporaryClient();
                     PlatformPeg.get().startSingleSignOn(tmpCli, flows[i].type === M_LOGIN_SSO ? "sso": "cas", true);
                 }