diff --git a/CHANGELOG.md b/CHANGELOG.md index 22b35b7c59..7f2cb2824e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4933,7 +4933,7 @@ All Changes [\#3869](https://github.com/matrix-org/matrix-react-sdk/pull/3869) * Move feature flag check for new session toast [\#3865](https://github.com/matrix-org/matrix-react-sdk/pull/3865) - * Catch exception in checkTerms if no ID server + * Catch exception in checkTerms if no identity server [\#3863](https://github.com/matrix-org/matrix-react-sdk/pull/3863) * Catch exception if passphrase dialog cancelled [\#3862](https://github.com/matrix-org/matrix-react-sdk/pull/3862) @@ -6049,15 +6049,15 @@ Changes in [1.6.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/ [\#3320](https://github.com/matrix-org/matrix-react-sdk/pull/3320) * Prompt for terms of service on identity server changes [\#3317](https://github.com/matrix-org/matrix-react-sdk/pull/3317) - * Allow 3pids to be added with no ID server set + * Allow 3pids to be added with no identity server set [\#3323](https://github.com/matrix-org/matrix-react-sdk/pull/3323) * Fix up remove threepid confirmation UX [\#3324](https://github.com/matrix-org/matrix-react-sdk/pull/3324) * Improve Discovery section when no IS set [\#3322](https://github.com/matrix-org/matrix-react-sdk/pull/3322) - * Allow password reset without an ID Server + * Allow password reset without an identity server [\#3319](https://github.com/matrix-org/matrix-react-sdk/pull/3319) - * Allow registering with email if no ID Server + * Allow registering with email if no identity server [\#3318](https://github.com/matrix-org/matrix-react-sdk/pull/3318) * Update from Weblate [\#3321](https://github.com/matrix-org/matrix-react-sdk/pull/3321) @@ -6081,7 +6081,7 @@ Changes in [1.6.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/ [\#3311](https://github.com/matrix-org/matrix-react-sdk/pull/3311) * Disconnect from IS Button [\#3305](https://github.com/matrix-org/matrix-react-sdk/pull/3305) - * Add UI in settings to change ID Server + * Add UI in settings to change identity server [\#3300](https://github.com/matrix-org/matrix-react-sdk/pull/3300) * Read integration managers from account data (widgets) [\#3302](https://github.com/matrix-org/matrix-react-sdk/pull/3302) @@ -6117,7 +6117,7 @@ Changes in [1.6.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/ [\#3288](https://github.com/matrix-org/matrix-react-sdk/pull/3288) * Reuse DMs whenever possible instead of asking to reuse them [\#3286](https://github.com/matrix-org/matrix-react-sdk/pull/3286) - * Work with no ID server set + * Work with no identity server set [\#3285](https://github.com/matrix-org/matrix-react-sdk/pull/3285) * Split MessageEditor up in edit-specifics & reusable parts for main composer [\#3282](https://github.com/matrix-org/matrix-react-sdk/pull/3282) diff --git a/src/AddThreepid.js b/src/AddThreepid.js index eb822c6d75..ab291128a7 100644 --- a/src/AddThreepid.js +++ b/src/AddThreepid.js @@ -248,7 +248,7 @@ export default class AddThreepid { /** * Takes a phone number verification code as entered by the user and validates - * it with the ID server, then if successful, adds the phone number. + * it with the identity server, then if successful, adds the phone number. * @param {string} msisdnToken phone number verification code as entered by the user * @return {Promise} Resolves if the phone number was added. Rejects with an object * with a "message" property which contains a human-readable message detailing why diff --git a/src/components/structures/InteractiveAuth.js b/src/components/structures/InteractiveAuth.js index 9ff830f66a..61ae1882df 100644 --- a/src/components/structures/InteractiveAuth.js +++ b/src/components/structures/InteractiveAuth.js @@ -54,7 +54,7 @@ export default class InteractiveAuthComponent extends React.Component { // * emailSid {string} If email auth was performed, the sid of // the auth session. // * clientSecret {string} The client secret used in auth - // sessions with the ID server. + // sessions with the identity server. onAuthFinished: PropTypes.func.isRequired, // Inputs provided by the user to the auth process diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx index d692b0fa7f..8ca3e6f213 100644 --- a/src/components/structures/MatrixChat.tsx +++ b/src/components/structures/MatrixChat.tsx @@ -561,7 +561,7 @@ export default class MatrixChat extends React.PureComponent { switch (payload.action) { case 'MatrixActions.accountData': // XXX: This is a collection of several hacks to solve a minor problem. We want to - // update our local state when the ID server changes, but don't want to put that in + // update our local state when the identity server changes, but don't want to put that in // the js-sdk as we'd be then dictating how all consumers need to behave. However, // this component is already bloated and we probably don't want this tiny logic in // here, but there's no better place in the react-sdk for it. Additionally, we're diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.tsx b/src/components/views/auth/InteractiveAuthEntryComponents.tsx index 4b1ecec740..d9af2c2b77 100644 --- a/src/components/views/auth/InteractiveAuthEntryComponents.tsx +++ b/src/components/views/auth/InteractiveAuthEntryComponents.tsx @@ -41,7 +41,7 @@ import CaptchaForm from "./CaptchaForm"; * one HS whilst beign a guest on another). * loginType: the login type of the auth stage being attempted * authSessionId: session id from the server - * clientSecret: The client secret in use for ID server auth sessions + * clientSecret: The client secret in use for identity server auth sessions * stageParams: params from the server for the stage being attempted * errorText: error message from a previous attempt to authenticate * submitAuthDict: a function which will be called with the new auth dict @@ -54,8 +54,8 @@ import CaptchaForm from "./CaptchaForm"; * Defined keys for stages are: * m.login.email.identity: * * emailSid: string representing the sid of the active - * verification session from the ID server, or - * null if no session is active. + * verification session from the identity server, + * or null if no session is active. * fail: a function which should be called with an error object if an * error occurred during the auth stage. This will cause the auth * session to be failed and the process to go back to the start. diff --git a/src/components/views/settings/SetIdServer.tsx b/src/components/views/settings/SetIdServer.tsx index 981daac6c8..7788aa1c07 100644 --- a/src/components/views/settings/SetIdServer.tsx +++ b/src/components/views/settings/SetIdServer.tsx @@ -63,7 +63,7 @@ async function checkIdentityServerUrl(u) { } interface IProps { - // Whether or not the ID server is missing terms. This affects the text + // Whether or not the identity server is missing terms. This affects the text // shown to the user. missingTerms: boolean; } @@ -87,7 +87,7 @@ export default class SetIdServer extends React.Component { let defaultIdServer = ''; if (!MatrixClientPeg.get().getIdentityServerUrl() && getDefaultIdentityServerUrl()) { - // If no ID server is configured but there's one in the config, prepopulate + // If no identity server is configured but there's one in the config, prepopulate // the field to help the user. defaultIdServer = abbreviateUrl(getDefaultIdentityServerUrl()); } @@ -112,7 +112,7 @@ export default class SetIdServer extends React.Component { } private onAction = (payload: ActionPayload) => { - // We react to changes in the ID server in the event the user is staring at this form + // We react to changes in the identity server in the event the user is staring at this form // when changing their identity server on another device. if (payload.action !== "id_server_changed") return; diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js index 44ddaf08e4..f1b7df3eb5 100644 --- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js +++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js @@ -364,7 +364,7 @@ export default class GeneralUserSettingsTab extends React.Component { onFinished={this.state.requiredPolicyInfo.resolve} introElement={intro} /> - { /* has its own heading as it includes the current ID server */ } + { /* has its own heading as it includes the current identity server */ } ); @@ -387,7 +387,7 @@ export default class GeneralUserSettingsTab extends React.Component { return (
{threepidSection} - { /* has its own heading as it includes the current ID server */ } + { /* has its own heading as it includes the current identity server */ }
); diff --git a/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml b/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml index 61b446babe..13aea8d18d 100644 --- a/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml +++ b/test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml @@ -685,7 +685,7 @@ registration_shared_secret: "{{REGISTRATION_SHARED_SECRET}}" # The list of identity servers trusted to verify third party # identifiers by this server. # -# Also defines the ID server which will be called when an account is +# Also defines the identity server which will be called when an account is # deactivated (one will be picked arbitrarily). # #trusted_third_party_id_servers: