mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-27 05:05:56 +03:00
Code Issues Projects Releases Packages Wiki Activity

Make confirmation optional on ChangePassword

Browse source 
Add option to disable password change confirmation (`disabledConfirmation`). Style fixes, use `<button>` element on ChangePassword submit button.
This commit is contained in:
Luke Barnard 2017-05-16 11:45:01 +01:00
parent 81806e23bf
commit 93ecdc90a9
1 changed files with 41 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
src/components/views/settings/ChangePassword.js
View file

@ -64,10 +64,15 @@ module.exports = React.createClass({
}; };
}, },
changePassword: function(old_password, new_password) { changePassword: function(oldPassword, newPassword) {
var cli = MatrixClientPeg.get(); const cli = MatrixClientPeg.get();
var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog"); if (this.props.disableConfirmation) {
this._changePassword(cli, oldPassword, newPassword);
return;
}
const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
Modal.createDialog(QuestionDialog, { Modal.createDialog(QuestionDialog, {
title: "Warning", title: "Warning",
description: description:
@ -86,31 +91,34 @@ module.exports = React.createClass({
], ],
onFinished: (confirmed) => { onFinished: (confirmed) => {
if (confirmed) { if (confirmed) {
var authDict = { this._changePassword(cli, oldPassword, newPassword);
type: 'm.login.password',
user: cli.credentials.userId,
password: old_password
};
this.setState({
phase: this.Phases.Uploading
});
var self = this;
cli.setPassword(authDict, new_password).then(function() {
self.props.onFinished();
}, function(err) {
self.props.onError(err);
}).finally(function() {
self.setState({
phase: self.Phases.Edit
});
}).done();
} }
}, },
}); });
}, },
_changePassword: function(cli, oldPassword, newPassword) {
const authDict = {
type: 'm.login.password',
user: cli.credentials.userId,
password: oldPassword,
};
this.setState({
phase: this.Phases.Uploading,
});
cli.setPassword(authDict, newPassword).then(() => {
this.props.onFinished();
}, (err) => {
this.props.onError(err);
}).finally(() => {
this.setState({
phase: this.Phases.Edit,
});
}).done();
},
_onExportE2eKeysClicked: function() { _onExportE2eKeysClicked: function() {
Modal.createDialogAsync( Modal.createDialogAsync(
(cb) => { (cb) => {
@ -121,20 +129,19 @@ module.exports = React.createClass({
matrixClient: MatrixClientPeg.get(), matrixClient: MatrixClientPeg.get(),
} }
); );
}, },
onClickChange: function() { onClickChange: function() {
var old_password = this.refs.old_input.value; const oldPassword = this.refs.old_input.value;
var new_password = this.refs.new_input.value; const newPassword = this.refs.new_input.value;
var confirm_password = this.refs.confirm_input.value; const confirmPassword = this.refs.confirm_input.value;
var err = this.props.onCheckPassword( const err = this.props.onCheckPassword(
old_password, new_password, confirm_password oldPassword, newPassword, confirmPassword,
); );
if (err) { if (err) {
this.props.onError(err); this.props.onError(err);
} } else {
else { this.changePassword(oldPassword, newPassword);
this.changePassword(old_password, new_password);
} }
}, },
@ -173,7 +180,8 @@ module.exports = React.createClass({
</div> </div>
</div> </div>
<AccessibleButton className={buttonClassName} <AccessibleButton className={buttonClassName}
onClick={this.onClickChange}> onClick={this.onClickChange}
element="button">
Change Password Change Password
</AccessibleButton> </AccessibleButton>
</div> </div>