PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

PR feedback

Browse source
This commit is contained in:
David Baker 2017-02-13 19:09:43 +00:00
parent 8fc3104507
commit 36d126f3a9
4 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/components/structures/InteractiveAuth.js
View file

@ -38,6 +38,10 @@ export default React.createClass({
// callback // callback
makeRequest: React.PropTypes.func.isRequired, makeRequest: React.PropTypes.func.isRequired,
// callback called when the auth process has finished
// @param {bool} status True if the operation requiring
// auth was completed sucessfully, false if canceled.
// @param result The result of the authenticated call
onFinished: React.PropTypes.func.isRequired, onFinished: React.PropTypes.func.isRequired,
}, },
@ -107,10 +111,6 @@ export default React.createClass({
} }
}, },
_onCancel: function() {
this.props.onFinished(false);
},
_submitAuthDict: function(authData) { _submitAuthDict: function(authData) {
this._authLogic.submitAuthDict(authData); this._authLogic.submitAuthDict(authData);
}, },
@ -131,8 +131,6 @@ export default React.createClass({
}, },
render: function() { render: function() {
const Loader = sdk.getComponent("elements.Spinner");
let error = null; let error = null;
if (this.state.errorText) { if (this.state.errorText) {
error = ( error = (

2
src/components/views/dialogs/BaseDialog.js
View file

@ -61,8 +61,6 @@ export default React.createClass({
}, },
_onCancelClick: function(e) { _onCancelClick: function(e) {
e.stopPropagation();
e.preventDefault();
this.props.onFinished(); this.props.onFinished();
}, },

4
src/components/views/dialogs/InteractiveAuthDialog.js
View file

@ -49,10 +49,6 @@ export default React.createClass({
}; };
}, },
_onCancelClick: function() {
this.props.onFinished(false);
},
render: function() { render: function() {
const InteractiveAuth = sdk.getComponent("structures.InteractiveAuth"); const InteractiveAuth = sdk.getComponent("structures.InteractiveAuth");
const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog'); const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');

6
src/components/views/login/InteractiveAuthEntryComponents.js
View file

@ -21,7 +21,7 @@ import sdk from '../../../index';
import MatrixClientPeg from '../../../MatrixClientPeg'; import MatrixClientPeg from '../../../MatrixClientPeg';
/* This file contains a collection of components which are used by the /* This file contains a collection of components which are used by the
* InteractiveAuthDialog to prompt the user to enter the information needed * InteractiveAuth to prompt the user to enter the information needed
* for an auth stage. (The intention is that they could also be used for other * for an auth stage. (The intention is that they could also be used for other
* components, such as the registration flow). * components, such as the registration flow).
* *
@ -187,7 +187,7 @@ export const FallbackAuthEntry = React.createClass({
} }
}, },
onSubmitClick: function() { _onShowFallbackClick: function() {
var url = MatrixClientPeg.get().getFallbackAuthUrl( var url = MatrixClientPeg.get().getFallbackAuthUrl(
this.props.loginType, this.props.loginType,
this.props.authSessionId this.props.authSessionId
@ -207,7 +207,7 @@ export const FallbackAuthEntry = React.createClass({
render: function() { render: function() {
return ( return (
<div> <div>
Click "Submit" to authenticate <a onClick={this._onShowFallbackClick}>Start authentication</a>
<div className="error"> <div className="error">
{this.props.errorText} {this.props.errorText}
</div> </div>