Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Remove unused identityEnabled property from ValidatedServerConfig #3213

Merged
merged 2 commits into from
Jul 12, 2019
Merged

Remove unused identityEnabled property from ValidatedServerConfig #3213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a3aa9b
Remove unused identityEnabled property from ValidatedServerConfig
turt2live Jul 11, 2019
285b126
Appease the linter
turt2live Jul 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/components/views/auth/ServerTypeSelector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ export const TYPES = {
hsName: "matrix.org",
hsNameIsDifferent: false,
isUrl: "https://vector.im",
identityEnabled: true,
}),
},
PREMIUM: {
Expand Down
3 changes: 0 additions & 3 deletions src/utils/AutoDiscoveryUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import React from 'react';
import {AutoDiscovery} from "matrix-js-sdk";
import {_t, _td, newTranslatableError} from "../languageHandler";
import {makeType} from "./TypeUtils";
import SdkConfig from "../SdkConfig";

const LIVELINESS_DISCOVERY_ERRORS = [
AutoDiscovery.ERROR_INVALID_HOMESERVER,
Expand All @@ -31,7 +30,6 @@ export class ValidatedServerConfig {
hsNameIsDifferent: string;

isUrl: string;
identityEnabled: boolean;

isDefault: boolean;
}
Expand Down Expand Up @@ -236,7 +234,6 @@ export default class AutoDiscoveryUtils {
hsName: preferredHomeserverName,
hsNameIsDifferent: url.hostname !== preferredHomeserverName,
isUrl: preferredIdentityUrl,
identityEnabled: !SdkConfig.get()['disable_identity_server'],
isDefault: false,
});
}
Expand Down
1 change: 0 additions & 1 deletion test/test-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,6 @@ export function mkServerConfig(hsUrl, isUrl) {
hsName: "TEST_ENVIRONMENT",
hsNameIsDifferent: false, // yes, we lie
isUrl,
identityEnabled: true,
});
}

Expand Down