From 7a3aa9be2e5deacbc374a6a71257c7fad946a48e Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 11 Jul 2019 15:11:09 -0600 Subject: [PATCH] Remove unused identityEnabled property from ValidatedServerConfig See https://github.com/vector-im/riot-web/issues/10229 --- src/components/views/auth/ServerTypeSelector.js | 1 - src/utils/AutoDiscoveryUtils.js | 2 -- test/test-utils.js | 1 - 3 files changed, 4 deletions(-) diff --git a/src/components/views/auth/ServerTypeSelector.js b/src/components/views/auth/ServerTypeSelector.js index 602de72f3f..fa76bc8512 100644 --- a/src/components/views/auth/ServerTypeSelector.js +++ b/src/components/views/auth/ServerTypeSelector.js @@ -39,7 +39,6 @@ export const TYPES = { hsName: "matrix.org", hsNameIsDifferent: false, isUrl: "https://vector.im", - identityEnabled: true, }), }, PREMIUM: { diff --git a/src/utils/AutoDiscoveryUtils.js b/src/utils/AutoDiscoveryUtils.js index e83e0348ca..990a84a6b5 100644 --- a/src/utils/AutoDiscoveryUtils.js +++ b/src/utils/AutoDiscoveryUtils.js @@ -31,7 +31,6 @@ export class ValidatedServerConfig { hsNameIsDifferent: string; isUrl: string; - identityEnabled: boolean; isDefault: boolean; } @@ -236,7 +235,6 @@ export default class AutoDiscoveryUtils { hsName: preferredHomeserverName, hsNameIsDifferent: url.hostname !== preferredHomeserverName, isUrl: preferredIdentityUrl, - identityEnabled: !SdkConfig.get()['disable_identity_server'], isDefault: false, }); } diff --git a/test/test-utils.js b/test/test-utils.js index 54705434e2..5f78508f46 100644 --- a/test/test-utils.js +++ b/test/test-utils.js @@ -268,7 +268,6 @@ export function mkServerConfig(hsUrl, isUrl) { hsName: "TEST_ENVIRONMENT", hsNameIsDifferent: false, // yes, we lie isUrl, - identityEnabled: true, }); }