ulysia/szurubooru
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor recaptchaEnabled

Browse source
This commit is contained in:
Jesse 2020-07-08 05:08:54 -04:00
parent 293c42113c
commit 6e178e2eed
No known key found for this signature in database
GPG key ID: 1A8AB3257B32D91F
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/js/api.js
View file

@ -113,7 +113,7 @@ class Api extends events.EventTarget {
} }
recaptchaEnabled() { recaptchaEnabled() {
return !!remoteConfig.enableRecaptcha; return !this.isLoggedIn() && !!remoteConfig.enableRecaptcha;
} }
hasPrivilege(lookup) { hasPrivilege(lookup) {

2
client/js/models/user.js
View file

@ -131,7 +131,7 @@ class User extends events.EventTarget {
if (this._password) { if (this._password) {
detail.password = this._password; detail.password = this._password;
} }
if (!api.isLoggedIn()) { if (api.recaptchaEnabled) {
detail.recaptchaToken = recaptchaToken; detail.recaptchaToken = recaptchaToken;
} }

6
client/js/views/registration_view.js
View file

@ -9,17 +9,13 @@ const template = views.getTemplate("user-registration");
class RegistrationView extends events.EventTarget { class RegistrationView extends events.EventTarget {
constructor() { constructor() {
super(); super();
// Show the recaptcha only for anonymous users.
const showRecaptcha = (!api.isLoggedIn() && api.recaptchaEnabled());
this._hostNode = document.getElementById("content-holder"); this._hostNode = document.getElementById("content-holder");
views.replaceContent( views.replaceContent(
this._hostNode, this._hostNode,
template({ template({
userNamePattern: api.getUserNameRegex(), userNamePattern: api.getUserNameRegex(),
passwordPattern: api.getPasswordRegex(), passwordPattern: api.getPasswordRegex(),
enableRecaptcha: showRecaptcha, enableRecaptcha: api.recaptchaEnabled(),
}) })
); );
views.syncScrollPosition(); views.syncScrollPosition();