mirror of
https://github.com/NginxProxyManager/nginx-proxy-manager.git
synced 2025-06-15 00:44:27 +00:00
Fixed a bug that prevented the mfa to be enabled
This commit is contained in:
parent
0bfd2f901d
commit
da22e0777e
@ -33,9 +33,9 @@ module.exports = Mn.View.extend({
|
|||||||
let view = this;
|
let view = this;
|
||||||
let data = this.ui.form.serializeJSON();
|
let data = this.ui.form.serializeJSON();
|
||||||
|
|
||||||
// Save "mfa_validation" value and remove it from data
|
|
||||||
let mfaToken = data.mfa_validation;
|
let mfaToken = data.mfa_validation;
|
||||||
delete data.mfa_validation;
|
delete data.mfa_validation;
|
||||||
|
delete data.mfa_password;
|
||||||
|
|
||||||
let show_password = this.model.get('email') === 'admin@example.com';
|
let show_password = this.model.get('email') === 'admin@example.com';
|
||||||
|
|
||||||
@ -77,7 +77,12 @@ module.exports = Mn.View.extend({
|
|||||||
|
|
||||||
if (mfaToken) {
|
if (mfaToken) {
|
||||||
return App.Api.Mfa.enable(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;
|
return result;
|
||||||
})
|
})
|
||||||
@ -92,7 +97,9 @@ module.exports = Mn.View.extend({
|
|||||||
});
|
});
|
||||||
})
|
})
|
||||||
.catch(err => {
|
.catch(err => {
|
||||||
|
if (!err.mfaHandled) {
|
||||||
this.ui.error.text(err.message).show();
|
this.ui.error.text(err.message).show();
|
||||||
|
}
|
||||||
this.ui.buttons.prop('disabled', false).removeClass('btn-disabled');
|
this.ui.buttons.prop('disabled', false).removeClass('btn-disabled');
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
Loading…
x
Reference in New Issue
Block a user