Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-08 22:18:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

reCaptcha at admin login

Browse source 
https://github.com/the-djmaze/snappymail/issues/222#issuecomment-1036211212
This commit is contained in:
the-djmaze 2022-02-11 14:52:04 +01:00
parent fecc9f96eb
commit 2fea7b92e1
4 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,4 @@
import { fireEvent } from 'Common/Globals';
import { getNotification } from 'Common/Translator';
import Remote from 'Remote/Admin/Fetch';
@ -5,7 +6,7 @@ import Remote from 'Remote/Admin/Fetch';
import { decorateKoCommands } from 'Knoin/Knoin';
import { AbstractViewLogin } from 'Knoin/AbstractViews';
class LoginAdminView extends AbstractViewLogin {
export class LoginAdminView extends AbstractViewLogin {
constructor() {
super('AdminLogin');
@ -32,12 +33,12 @@ class LoginAdminView extends AbstractViewLogin {
}
submitCommand(self, event) {
const valid = event.target.form.reportValidity(),
name = this.login().trim(),
pass = this.password();
let form = event.target.form,
data = new FormData(form),
valid = form.reportValidity() && fireEvent('sm-admin-login', data);
this.loginError(!name);
this.passwordError(!pass);
this.loginError(!this.login());
this.passwordError(!this.password());
this.formError(!valid);
if (valid) {
@ -45,21 +46,21 @@ class LoginAdminView extends AbstractViewLogin {
Remote.request('AdminLogin',
(iError, oData) => {
fireEvent('sm-admin-login-response', {
error: iError,
data: oData
});
if (iError) {
this.submitRequest(false);
this.submitError(getNotification(iError));
} else {
rl.setData(oData.Result);
}
}, {
Login: name,
Password: pass,
TOTP: this.totp()
});
},
data
);
}
return valid;
}
}
export { LoginAdminView };

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

@ -19,7 +19,7 @@ const SignMeOff = 0,
SignMeUnused = 2;
class LoginUserView extends AbstractViewLogin {
export class LoginUserView extends AbstractViewLogin {
constructor() {
super('Login');
@ -161,5 +161,3 @@ class LoginUserView extends AbstractViewLogin {
showScreenPopup(LanguagesPopupView, [this.language, this.languages(), LanguageStore.userLanguage()]);
}
}
export { LoginUserView };

11
plugins/recaptcha/js/recaptcha.js
View file

@ -2,13 +2,16 @@
(rl => {
rl && addEventListener('rl-view-model', e => {
if (e.detail && 'Login' === e.detail.viewModelTemplateID
const id = e.detail.viewModelTemplateID;
if (e.detail && ('AdminLogin' === id || 'Login' === id)
&& rl.pluginSettingsGet('recaptcha', 'show_captcha_on_login')) {
let
nId = null,
script;
const
mode = 'Login' === id ? 'user' : 'admin',
doc = document,
container = e.detail.viewModelDom.querySelector('#plugin-Login-BottomControlGroup'),
@ -42,15 +45,15 @@
StartRecaptcha();
addEventListener('sm-user-login', e => {
addEventListener(`sm-${mode}-login`, e => {
if (null !== nId && window.grecaptcha) {
e.detail.set('RecaptchaResponse', window.grecaptcha.getResponse(nId));
} else {
e.preventDefault()
e.preventDefault();
}
});
addEventListener('sm-user-login-response', e => {
addEventListener(`sm-${mode}-login-response`, e => {
if (e.detail.error) {
if (null !== nId && window.grecaptcha) {
window.grecaptcha.reset(nId);

6
snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
View file

@ -5,21 +5,21 @@
<form action="#/" data-bind="submit: submitForm, css: {'errorAnimated': formError, 'submitting': submitRequest()}">
<div class="controls" data-bind="css: {'error': loginError}">
<span class="fontastic">👤</span>
<input required="" type="text" class="input-block-level"
<input name="Login" required="" type="text" class="input-block-level"
autofocus="" autocomplete="username" autocorrect="off" autocapitalize="off" spellcheck="false"
data-bind="textInput: login, disable: submitRequest"
data-i18n="[placeholder]LOGIN/LABEL_LOGIN" />
</div>
<div class="controls" data-bind="css: {'error': passwordError}">
<span class="fontastic">🔑</span>
<input required="" type="password" class="input-block-level"
<input name="Password" required="" type="password" class="input-block-level"
autocomplete="current-password" autocorrect="off" autocapitalize="off" spellcheck="false"
data-bind="textInput: password, disable: submitRequest"
data-i18n="[placeholder]LOGIN/LABEL_PASSWORD" />
</div>
<div class="controls">
<span class="fontastic">⏱</span>
<input type="text" pattern="[0-9]*" inputmode="numeric" class="input-block-level"
<input name="TOTP" type="text" pattern="[0-9]*" inputmode="numeric" class="input-block-level"
autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
data-bind="textInput: totp, disable: submitRequest"
data-i18n="[placeholder]LOGIN/LABEL_TOTP" />