Changes for #349

This commit is contained in:
the-djmaze 2022-04-29 13:23:04 +02:00
parent 80eed213d9
commit a06b59784a
3 changed files with 27 additions and 16 deletions

View file

@ -1,8 +1,15 @@
(rl => {
const
forceTOTP = () => {
if (rl.settings.get('SetupTwoFactor')) {
setTimeout(() => document.location.hash = '#/settings/two-factor-auth', 50);
}
};
addEventListener('rl-view-model', e => {
if (e.detail && 'Login' === e.detail.viewModelTemplateID) {
if ('Login' === e.detail.viewModelTemplateID) {
const container = e.detail.viewModelDom.querySelector('#plugin-Login-BottomControlGroup'),
placeholder = 'PLUGIN_2FA/LABEL_TWO_FACTOR_CODE';
if (container) {
@ -19,13 +26,10 @@
});
// https://github.com/the-djmaze/snappymail/issues/349
let code;
addEventListener('sm-user-login', e => {
code = e.detail.get('totp_code');
});
addEventListener('sm-user-login-response', e => {
if (e.detail && !e.detail.error && rl.settings.get('RequireTwoFactor') && !code) {
document.location.hash = '#/settings/two-factor-auth';
addEventListener('sm-show-screen', e => {
if ('settings' !== e.detail && rl.settings.get('SetupTwoFactor')) {
e.preventDefault();
forceTOTP();
}
});