Remove unused disable_identity_server config flag

turt2live · turt2live · commit f3e82b56e987 · 2019-07-11T15:11:59.000-06:00
Fixes element-hq#10229
diff --git 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
@@ -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
@@ -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
@@ -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==',

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`"base_url": "https://vector.im"`
`9`	`9`	`}`
`10`	`10`	`},`
`11`		`- "disable_identity_server": false,`
`12`	`11`	`"disable_custom_urls": false,`
`13`	`12`	`"disable_guests": false,`
`14`	`13`	`"disable_login_language_selector": false,`