Fixed a bug that prevented the mfa to be enabled

This commit is contained in:
Julian Gassner 2025-02-06 17:01:46 +00:00
parent 0bfd2f901d
commit da22e0777e
3 changed files with 27 additions and 20 deletions

View File

@ -33,9 +33,9 @@ module.exports = Mn.View.extend({
let view = this;
let data = this.ui.form.serializeJSON();
// Save "mfa_validation" value and remove it from data
let mfaToken = data.mfa_validation;
delete data.mfa_validation;
delete data.mfa_password;
let show_password = this.model.get('email') === 'admin@example.com';
@ -77,7 +77,12 @@ module.exports = Mn.View.extend({
if (mfaToken) {
return App.Api.Mfa.enable(mfaToken)
.then(() => result);
.then(() => result)
.catch(err => {
view.ui.mfaError.text(err.message).show();
err.mfaHandled = true;
return Promise.reject(err);
});
}
return result;
})
@ -92,7 +97,9 @@ module.exports = Mn.View.extend({
});
})
.catch(err => {
if (!err.mfaHandled) {
this.ui.error.text(err.message).show();
}
this.ui.buttons.prop('disabled', false).removeClass('btn-disabled');
});
},