From f3e82b56e987298be47a16e5aae9da369c674baa Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 11 Jul 2019 15:11:59 -0600
Subject: [PATCH] Remove unused disable_identity_server config flag

Fixes https://github.com/vector-im/riot-web/issues/10229
---
 config.sample.json        | 1 -
 docs/config.md            | 8 ++++----
 test/app-tests/joining.js | 1 -
 test/app-tests/loading.js | 1 -
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/config.sample.json b/config.sample.json
index 55bf12c36f..ac22b5bfa1 100644
--- a/config.sample.json
+++ b/config.sample.json
@@ -8,7 +8,6 @@
             "base_url": "https://vector.im"
         }
     },
-    "disable_identity_server": false,
     "disable_custom_urls": false,
     "disable_guests": false,
     "disable_login_language_selector": false,
diff --git a/docs/config.md b/docs/config.md
index e68789118b..d0667a1473 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -20,10 +20,10 @@ For a good example, see https://riot.im/develop/config.json.
      if `default_hs_url` is used.
    * The identity server is used for verifying third party identifiers like emails
      and phone numbers. It is not used to store your password or account information.
-     If not provided, the identity server defaults to vector.im unless `disable_identity_server`
-     is set to true in the config. Currently the only two public identity servers
-     are https://matrix.org and https://vector.im, however in future identity servers
-     will be decentralised.
+     If not provided, the identity server defaults to vector.im. Currently the only 
+     two public identity servers are https://matrix.org and https://vector.im, however 
+     in future identity servers will be decentralised. In the future it will be possible
+     to disable the identity server functionality.
    * Riot will fail to load if a mix of `default_server_config`, `default_server_name`, or
      `default_hs_url` is specified. When multiple sources are specified, it is unclear
      which should take priority and therefore the application cannot continue.
diff --git a/test/app-tests/joining.js b/test/app-tests/joining.js
index f348e8989f..048f6d3c18 100644
--- a/test/app-tests/joining.js
+++ b/test/app-tests/joining.js
@@ -104,7 +104,6 @@ describe('joining a room', function() {
                     hsName: "TEST_ENVIRONMENT",
                     hsNameIsDifferent: false, // yes, we lie
                     isUrl: IS_URL,
-                    identityEnabled: true,
                 }),
             };
 
diff --git a/test/app-tests/loading.js b/test/app-tests/loading.js
index 0450d9fc05..6bf8341ee9 100644
--- a/test/app-tests/loading.js
+++ b/test/app-tests/loading.js
@@ -153,7 +153,6 @@ describe('loading:', function() {
                 hsName: "TEST_ENVIRONMENT",
                 hsNameIsDifferent: false, // yes, we lie
                 isUrl: DEFAULT_IS_URL,
-                identityEnabled: true,
             }),
             embeddedPages: {
                 homeUrl: 'data:text/html;charset=utf-8;base64,PGh0bWw+PC9odG1sPg==',