OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Standardise spelling of identity server 

Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
pull/21833/head
Paulo Pinto 2021-07-13 15:26:38 +01:00
parent 09d08882e3
commit 6884b2aa6d
8 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CHANGELOG.md
View File

@ -4933,7 +4933,7 @@ All Changes
[\#3869](https://github.com/matrix-org/matrix-react-sdk/pull/3869) [\#3869](https://github.com/matrix-org/matrix-react-sdk/pull/3869)
* Move feature flag check for new session toast * Move feature flag check for new session toast
[\#3865](https://github.com/matrix-org/matrix-react-sdk/pull/3865) [\#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) [\#3863](https://github.com/matrix-org/matrix-react-sdk/pull/3863)
* Catch exception if passphrase dialog cancelled * Catch exception if passphrase dialog cancelled
[\#3862](https://github.com/matrix-org/matrix-react-sdk/pull/3862) [\#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) [\#3320](https://github.com/matrix-org/matrix-react-sdk/pull/3320)
* Prompt for terms of service on identity server changes * Prompt for terms of service on identity server changes
[\#3317](https://github.com/matrix-org/matrix-react-sdk/pull/3317) [\#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) [\#3323](https://github.com/matrix-org/matrix-react-sdk/pull/3323)
* Fix up remove threepid confirmation UX * Fix up remove threepid confirmation UX
[\#3324](https://github.com/matrix-org/matrix-react-sdk/pull/3324) [\#3324](https://github.com/matrix-org/matrix-react-sdk/pull/3324)
* Improve Discovery section when no IS set * Improve Discovery section when no IS set
[\#3322](https://github.com/matrix-org/matrix-react-sdk/pull/3322) [\#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) [\#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) [\#3318](https://github.com/matrix-org/matrix-react-sdk/pull/3318)
* Update from Weblate * Update from Weblate
[\#3321](https://github.com/matrix-org/matrix-react-sdk/pull/3321) [\#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) [\#3311](https://github.com/matrix-org/matrix-react-sdk/pull/3311)
* Disconnect from IS Button * Disconnect from IS Button
[\#3305](https://github.com/matrix-org/matrix-react-sdk/pull/3305) [\#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) [\#3300](https://github.com/matrix-org/matrix-react-sdk/pull/3300)
* Read integration managers from account data (widgets) * Read integration managers from account data (widgets)
[\#3302](https://github.com/matrix-org/matrix-react-sdk/pull/3302) [\#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) [\#3288](https://github.com/matrix-org/matrix-react-sdk/pull/3288)
* Reuse DMs whenever possible instead of asking to reuse them * Reuse DMs whenever possible instead of asking to reuse them
[\#3286](https://github.com/matrix-org/matrix-react-sdk/pull/3286) [\#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) [\#3285](https://github.com/matrix-org/matrix-react-sdk/pull/3285)
* Split MessageEditor up in edit-specifics & reusable parts for main composer * Split MessageEditor up in edit-specifics & reusable parts for main composer
[\#3282](https://github.com/matrix-org/matrix-react-sdk/pull/3282) [\#3282](https://github.com/matrix-org/matrix-react-sdk/pull/3282)

2
src/AddThreepid.js
View File

@ -248,7 +248,7 @@ export default class AddThreepid {
/** /**
* Takes a phone number verification code as entered by the user and validates * 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 * @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 * @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 * with a "message" property which contains a human-readable message detailing why

2
src/components/structures/InteractiveAuth.js
View File

@ -54,7 +54,7 @@ export default class InteractiveAuthComponent extends React.Component {
// * emailSid {string} If email auth was performed, the sid of // * emailSid {string} If email auth was performed, the sid of
// the auth session. // the auth session.
// * clientSecret {string} The client secret used in auth // * clientSecret {string} The client secret used in auth
// sessions with the ID server. // sessions with the identity server.
onAuthFinished: PropTypes.func.isRequired, onAuthFinished: PropTypes.func.isRequired,
// Inputs provided by the user to the auth process // Inputs provided by the user to the auth process

2
src/components/structures/MatrixChat.tsx
View File

@ -561,7 +561,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
switch (payload.action) { switch (payload.action) {
case 'MatrixActions.accountData': case 'MatrixActions.accountData':
// XXX: This is a collection of several hacks to solve a minor problem. We want to // 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, // 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 // 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 // here, but there's no better place in the react-sdk for it. Additionally, we're

6
src/components/views/auth/InteractiveAuthEntryComponents.tsx
View File

@ -41,7 +41,7 @@ import CaptchaForm from "./CaptchaForm";
* one HS whilst beign a guest on another). * one HS whilst beign a guest on another).
* loginType: the login type of the auth stage being attempted * loginType: the login type of the auth stage being attempted
* authSessionId: session id from the server * 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 * stageParams: params from the server for the stage being attempted
* errorText: error message from a previous attempt to authenticate * errorText: error message from a previous attempt to authenticate
* submitAuthDict: a function which will be called with the new auth dict * 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: * Defined keys for stages are:
* m.login.email.identity: * m.login.email.identity:
* * emailSid: string representing the sid of the active * * emailSid: string representing the sid of the active
* verification session from the ID server, or * verification session from the identity server,
* null if no session is active. * or null if no session is active.
* fail: a function which should be called with an error object if an * fail: a function which should be called with an error object if an
* error occurred during the auth stage. This will cause the auth * error occurred during the auth stage. This will cause the auth
* session to be failed and the process to go back to the start. * session to be failed and the process to go back to the start.

6
src/components/views/settings/SetIdServer.tsx
View File

@ -63,7 +63,7 @@ async function checkIdentityServerUrl(u) {
} }
interface IProps { 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. // shown to the user.
missingTerms: boolean; missingTerms: boolean;
} }
@ -87,7 +87,7 @@ export default class SetIdServer extends React.Component<IProps, IState> {
let defaultIdServer = ''; let defaultIdServer = '';
if (!MatrixClientPeg.get().getIdentityServerUrl() && getDefaultIdentityServerUrl()) { 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. // the field to help the user.
defaultIdServer = abbreviateUrl(getDefaultIdentityServerUrl()); defaultIdServer = abbreviateUrl(getDefaultIdentityServerUrl());
} }
@ -112,7 +112,7 @@ export default class SetIdServer extends React.Component<IProps, IState> {
} }
private onAction = (payload: ActionPayload) => { 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. // when changing their identity server on another device.
if (payload.action !== "id_server_changed") return; if (payload.action !== "id_server_changed") return;

4
src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
View File

@ -364,7 +364,7 @@ export default class GeneralUserSettingsTab extends React.Component {
onFinished={this.state.requiredPolicyInfo.resolve} onFinished={this.state.requiredPolicyInfo.resolve}
introElement={intro} introElement={intro}
/> />
{ /* has its own heading as it includes the current ID server */ } { /* has its own heading as it includes the current identity server */ }
<SetIdServer missingTerms={true} /> <SetIdServer missingTerms={true} />
</div> </div>
); );
@ -387,7 +387,7 @@ export default class GeneralUserSettingsTab extends React.Component {
return ( return (
<div className="mx_SettingsTab_section"> <div className="mx_SettingsTab_section">
{threepidSection} {threepidSection}
{ /* has its own heading as it includes the current ID server */ } { /* has its own heading as it includes the current identity server */ }
<SetIdServer /> <SetIdServer />
</div> </div>
); );

2
test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml
View File

@ -685,7 +685,7 @@ registration_shared_secret: "{{REGISTRATION_SHARED_SECRET}}"
# The list of identity servers trusted to verify third party # The list of identity servers trusted to verify third party
# identifiers by this server. # 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). # deactivated (one will be picked arbitrarily).
# #
#trusted_third_party_id_servers: #trusted_third_party_id_servers: