Merge branch 'master' into add-mastodon-job-publisher

Dockerfile

@@ -1,6 +1,7 @@
 FROM python:3.9
 ENV PYTHONUNBUFFERED 1
 ENV PYTHONPATH /code:$PYTHONPATH
+RUN apt-get update && apt-get -y install flite=2.2-5
 RUN mkdir /code
 WORKDIR /code
 COPY dev_requirements.txt /code

community/templates/account/custom_captcha.html

@@ -0,0 +1,23 @@
+{% load i18n %}
+{% spaceless %}
+<div class="form-group">
+  <label class="control-label">{{ label }}</label>
+  <div class="form-group">
+    <div class="input-group mb-3">
+      <div class="input-group-prepend">
+        <img src="{{ image }}" alt="captcha" class="captcha" />
+        {% if audio %}
+        <audio 
+            title="{% trans "Play CAPTCHA as audio file" %}" 
+            src="{{ audio }}"
+            alt="captcha audio"
+            controls
+            style="display: block; padding-bottom: 1rem;"
+        >
+        {% endif %}
+      </div>
+      {% include "django/forms/widgets/multiwidget.html" %}
+    </div>
+  </div>
+</div>
+{% endspaceless %}

pyarweb/forms.py

@@ -1,6 +1,16 @@
 from allauth.account.forms import SignupForm
-from captcha.fields import CaptchaField
+from captcha.fields import CaptchaField, CaptchaTextInput
 
 
-class SingupFormWithCaptcha(SignupForm):
-    captcha = CaptchaField()
+class CustomCaptchaTextInput(CaptchaTextInput):
+    # HACK - No entiendo por qué esto apunta a community/templates y no al /templates en el root
+    template_name = "account/custom_captcha.html"
+
+    def image_url(self):
+        # Agrego el "@2" para enviar un captcha con más resolucioón
+        # https://django-simple-captcha.readthedocs.io/en/latest/advanced.html#captcha-2x-image
+        return super().image_url().removesuffix("/") + "@2"
+
+
+class SignupFormWithCaptcha(SignupForm):
+    captcha = CaptchaField(widget=CustomCaptchaTextInput)

pyarweb/settings/base.py

@@ -191,7 +191,6 @@
 #
 CAPTCHA_LENGTH = 6
 CAPTCHA_FLITE_PATH = "/usr/bin/flite"
-CAPTCHA_IMAGE_TEMPLATE = "account/custom_captcha.html"
 
 ALLOWED_HTML_TAGS_INPUT = [
     'a',
@@ -245,7 +244,7 @@
 
 GOOGLE_TRACKING_ID = os.environ.get('GOOGLE_TRACKING_ID', '')
 
-ACCOUNT_FORMS = {'signup': 'pyarweb.forms.SingupFormWithCaptcha'}
+ACCOUNT_FORMS = {'signup': 'pyarweb.forms.SignupFormWithCaptcha'}
 
 DJANGO_EASY_AUDIT_WATCH_AUTH_EVENTS = False
 DJANGO_EASY_AUDIT_WATCH_REQUEST_EVENTS = False
@@ -295,3 +294,5 @@
     'joboffers.publishers.twitter.TwitterPublisher',
     'joboffers.publishers.mastodon.MastodonPublisher',
 ]
+
+DEFAULT_AUTO_FIELD = "django.db.models.AutoField"

requirements.txt

@@ -12,7 +12,7 @@ django-extensions==3.1.5
 django-html-sanitizer==0.1.5
 django-model-utils==4.2.0
 django-sendfile==0.3.11
-django-simple-captcha==0.5.14
+django-simple-captcha==0.5.18
 django-storages[azure]==1.11.1
 django-summernote==0.8.20.0
 django-tagging==0.5.0