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

Merge pull request #3425 from matrix-org/dbkr/fix_sso_flash_2 

Hide the change HS url button on SSO login flow if custom urls disabled
pull/21833/head
David Baker 2019-09-12 12:19:15 +01:00 committed by GitHub
parent 6dd0ad6e27 7c54359d3a
commit 6795da2ffa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/structures/auth/Login.js
View File

@ -568,6 +568,12 @@ module.exports = React.createClass({
_renderSsoStep: function(url) { _renderSsoStep: function(url) {
const SignInToText = sdk.getComponent('views.auth.SignInToText'); const SignInToText = sdk.getComponent('views.auth.SignInToText');
let onEditServerDetailsClick = null;
// If custom URLs are allowed, wire up the server details edit link.
if (PHASES_ENABLED && !SdkConfig.get()['disable_custom_urls']) {
onEditServerDetailsClick = this.onEditServerDetailsClick;
}
// XXX: This link does *not* have a target="_blank" because single sign-on relies on // XXX: This link does *not* have a target="_blank" because single sign-on relies on
// redirecting the user back to a URI once they're logged in. On the web, this means // redirecting the user back to a URI once they're logged in. On the web, this means
// we use the same window and redirect back to riot. On electron, this actually // we use the same window and redirect back to riot. On electron, this actually
@ -579,7 +585,7 @@ module.exports = React.createClass({
return ( return (
<div> <div>
<SignInToText serverConfig={this.props.serverConfig} <SignInToText serverConfig={this.props.serverConfig}
onEditServerDetailsClick={this.onEditServerDetailsClick} /> onEditServerDetailsClick={onEditServerDetailsClick} />
<a href={url} className="mx_Login_sso_link mx_Login_submit">{ _t('Sign in with single sign-on') }</a> <a href={url} className="mx_Login_sso_link mx_Login_submit">{ _t('Sign in with single sign-on') }</a>
</div> </div>