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

Added HTML5 form.reportValidity() to login screens

Browse source 
This improves browser feedback on form errors
This commit is contained in:
djmaze 2021-03-23 11:28:36 +01:00
parent 612aff4b27
commit cca0fc15da
5 changed files with 74 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

55
dev/View/Admin/Login.js
View file

@ -31,12 +31,7 @@ class LoginAdminView extends AbstractViewCenter {
this.addSubscribables({
login: () => this.loginError(false),
password: () => this.passwordError(false),
loginError: v => this.formError(!!v),
passwordError: v => this.formError(!!v)
password: () => this.passwordError(false)
});
decorateKoCommands(this, {
@ -44,33 +39,33 @@ class LoginAdminView extends AbstractViewCenter {
});
}
submitCommand() {
this.loginError(false);
this.passwordError(false);
submitCommand(self, event) {
const valid = event.target.form.reportValidity(),
name = this.login().trim(),
pass = this.password();
this.loginError(!this.login().trim());
this.passwordError(!this.password().trim());
this.loginError(!name);
this.passwordError(!pass);
this.formError(!valid);
if (this.loginError() || this.passwordError()) {
return false;
if (valid) {
this.submitRequest(true);
Remote.adminLogin(
iError => {
if (iError) {
this.submitRequest(false);
this.submitError(getNotification(iError));
} else {
rl.route.reload();
}
},
name,
pass
);
}
this.submitRequest(true);
Remote.adminLogin(
(iError) => {
this.submitRequest(false);
if (iError) {
this.submitError(getNotification(iError));
} else {
rl.route.reload();
}
},
this.login(),
this.password()
);
return true;
return valid;
}
onShow() {
@ -78,7 +73,7 @@ class LoginAdminView extends AbstractViewCenter {
}
submitForm() {
this.submitCommand();
// return false;
}
}

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

@ -95,13 +95,8 @@ class LoginUserView extends AbstractViewCenter {
password: () => this.passwordError(false),
additionalCode: () => this.additionalCodeError(false),
additionalCodeError: bV => this.formError(!!bV),
additionalCodeVisibility: () => this.additionalCodeError(false),
emailError: bV => this.formError(!!bV),
passwordError: bV => this.formError(!!bV),
submitError: value => value || this.submitErrorAddidional(''),
signMeType: iValue => this.signMe(LoginSignMeType.DefaultOn === iValue)
@ -116,72 +111,53 @@ class LoginUserView extends AbstractViewCenter {
});
}
windowOpenFeatures(wh) {
return `left=200,top=100,width=${wh},height=${wh},menubar=no,status=no,resizable=yes,scrollbars=yes`;
}
submitCommand(self, event) {
let email = this.email().trim(),
valid = event.target.form.reportValidity() && email,
pass = this.password(),
totp = this.additionalCodeVisibility(),
code = totp ? this.additionalCode() : '';
submitCommand() {
this.emailError(false);
this.passwordError(false);
this.emailError(!email);
this.passwordError(!pass);
this.formError(!valid);
this.additionalCodeError(totp && !code);
let error;
if (this.additionalCodeVisibility()) {
this.additionalCodeError(false);
if (!this.additionalCode().trim()) {
this.additionalCodeError(true);
error = '.inputAdditionalCode';
}
}
if (!this.password().trim()) {
this.passwordError(true);
error = '#RainLoopPassword';
}
if (!this.email().trim()) {
this.emailError(true);
error = '#RainLoopEmail';
}
if (error) {
this.querySelector(error).focus();
return false;
}
if (valid) {
this.submitRequest(true);
this.submitRequest(true);
const fLoginRequest = (sLoginPassword) => {
Remote.login(
(iError, oData) => {
this.submitRequest(false);
if (iError) {
this.submitRequest(false);
if (Notification.InvalidInputArgument == iError) {
iError = Notification.AuthError;
}
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 {
if (oData.TwoFactorAuth) {
this.additionalCode('');
this.additionalCodeVisibility(true);
setTimeout(() => this.querySelector('.inputAdditionalCode').focus(), 100);
} else {
rl.route.reload();
}
rl.route.reload();
}
},
this.email(),
'',
sLoginPassword,
email,
pass,
!!this.signMe(),
this.bSendLanguage ? this.language() : '',
this.additionalCodeVisibility() ? this.additionalCode() : '',
this.additionalCodeVisibility() ? !!this.additionalCodeSignMe() : false
code,
!!(totp && this.additionalCodeSignMe())
);
Local.set(ClientSideKeyName.LastSignMe, this.signMe() ? '-1-' : '-0-');
};
}
fLoginRequest(this.password());
return true;
return valid;
}
onShow() {
@ -234,7 +210,7 @@ class LoginUserView extends AbstractViewCenter {
}
submitForm() {
this.submitCommand();
// return false;
}
selectLanguage() {