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

Apply PR feedback 

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/21833/head
Michael Telatynski 2019-09-11 17:34:29 +01:00 committed by David Baker
parent 7c5e6ef2c5
commit 9c1fb13d5f
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -576,12 +576,14 @@ module.exports = React.createClass({
// If this bug gets fixed, it will break SSO since it will open the SSO page in the // If this bug gets fixed, it will break SSO since it will open the SSO page in the
// user's browser, let them log into their SSO provider, then redirect their browser // user's browser, let them log into their SSO provider, then redirect their browser
// to vector://vector which, of course, will not work. // to vector://vector which, of course, will not work.
return <div> return (
<SignInToText serverConfig={this.props.serverConfig} <div>
onEditServerDetailsClick={this.onEditServerDetailsClick} /> <SignInToText serverConfig={this.props.serverConfig}
onEditServerDetailsClick={this.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>
);
}, },
render: function() { render: function() {

2
src/components/views/auth/SignInToText.js
View File

@ -1,5 +1,5 @@
/* /*
Copyright 2019 New Vector Ltd Copyright 2019 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.