Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-01 21:49:21 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into plugin-hooks

Browse source 
# Conflicts:
#	dev/View/User/Login.js
This commit is contained in:
djmaze 2021-04-15 16:58:59 +02:00
commit 2ab42b1f03
547 changed files with 29045 additions and 52993 deletions
Download patch file Download diff file Expand all files Collapse all files

27
dev/View/User/Login.js
View file

@ -43,7 +43,6 @@ class LoginUserView extends AbstractViewCenter {
email: SettingsGet('DevEmail'),
password: SettingsGet('DevPassword'),
signMe: false,
additionalCode: '',
emailError: false,
passwordError: false,
@ -56,9 +55,6 @@ class LoginUserView extends AbstractViewCenter {
langRequest: false,
additionalCodeError: false,
additionalCodeSignMe: false,
additionalCodeVisibility: false,
signMeType: LoginSignMeType.Unused
});
@ -84,15 +80,10 @@ class LoginUserView extends AbstractViewCenter {
this.addSubscribables({
email: () => {
this.emailError(false);
this.additionalCode('');
this.additionalCodeVisibility(false);
},
password: () => this.passwordError(false),
additionalCode: () => this.additionalCodeError(false),
additionalCodeVisibility: () => this.additionalCodeError(false),
submitError: value => value || this.submitErrorAddidional(''),
signMeType: iValue => this.signMe(LoginSignMeType.DefaultOn === iValue),
@ -121,16 +112,13 @@ class LoginUserView extends AbstractViewCenter {
submitCommand(self, event) {
let email = this.email().trim(),
valid = event.target.form.reportValidity() && email,
pass = this.password(),
totp = this.additionalCodeVisibility(),
code = totp ? this.additionalCode() : '';
pass = this.password();
this.emailError(!email);
this.passwordError(!pass);
this.additionalCodeError(totp && !code);
let pluginResultCode = 0, pluginResultMessage = '';
Plugins.runHook('user-login-submit', [(iResultCode, sResultMessage) => {
runHook('user-login-submit', [(iResultCode, sResultMessage) => {
pluginResultCode = iResultCode;
pluginResultMessage = sResultMessage;
}]);
@ -156,13 +144,6 @@ class LoginUserView extends AbstractViewCenter {
}
this.submitError(getNotification(iError, oData.ErrorMessage, Notification.UnknownNotification));
this.submitErrorAddidional((oData && oData.ErrorMessageAdditional) || '');
} else if (oData.TwoFactorAuth) {
this.submitRequest(false);
this.additionalCode('');
this.additionalCodeVisibility(true);
let input = this.querySelector('.inputAdditionalCode');
input.required = true;
setTimeout(() => input.focus(), 100);
} else {
rl.route.reload();
}
@ -170,9 +151,7 @@ class LoginUserView extends AbstractViewCenter {
email,
pass,
!!this.signMe(),
this.bSendLanguage ? this.language() : '',
code,
!!(totp && this.additionalCodeSignMe())
this.bSendLanguage ? this.language() : ''
);
Local.set(ClientSideKeyName.LastSignMe, this.signMe() ? '-1-' : '-0-');