Refine the Altcha implementation #235

Signed-off-by: tdruez <[email protected]>

Author: tdruez

dje/altcha.py

@@ -16,12 +16,17 @@
 import altcha
 from altcha import ChallengeOptions
 from altcha import create_challenge
+from django.forms.widgets import HiddenInput
 
 ALTCHA_HMAC_KEY = "your-altcha-hmac-key"
 
 
+class AltchaWidget(HiddenInput):
+    template_name = "widgets/altcha.html"
+
+
 class AltchaField(forms.Field):
-    widget = forms.HiddenInput
+    widget = AltchaWidget
     default_error_messages = {
         "error": _("Failed to process CAPTCHA token"),
         "invalid": _("Invalid CAPTCHA token."),
@@ -48,19 +53,21 @@ def validate(self, value):
             raise forms.ValidationError(self.error_messages["invalid"], code="invalid")
 
 
+def get_altcha_challenge():
+    # Create the challenge using your options
+    challenge = create_challenge(
+        ChallengeOptions(
+            hmac_key=ALTCHA_HMAC_KEY,
+            max_number=50000,
+        )
+    )
+    return challenge
+
+
 @require_GET
 def get_altcha_challenge_view(request):
     try:
-        # Create the challenge using your options
-        challenge = create_challenge(
-            ChallengeOptions(
-                hmac_key=ALTCHA_HMAC_KEY,
-                max_number=50000,
-            )
-        )
-        # Return the challenge as a JSON response
-        return JsonResponse(challenge.__dict__)  # Use JsonResponse to send JSON data
-
+        challenge = get_altcha_challenge()
+        return JsonResponse(challenge.__dict__)
     except Exception as e:
-        # Handle exceptions and return an error response
         return JsonResponse({"error": f"Failed to create challenge: {str(e)}"}, status=500)

dje/registration.py

@@ -166,8 +166,6 @@ def helper(self):
                     css_class="alert alert-primary px-2 py-2",
                 ),
                 "altcha_token",
-                # TODO: Integrate this into the field widget directly! Include the JS as well.
-                HTML('<altcha-widget challengeurl="/altcha/" name="altcha_token"></altcha-widget>'),
                 tos,
                 Div(
                     StrictSubmit(

dje/templates/django_registration/registration_form.html

@@ -4,9 +4,7 @@
 
 {% block page_title %}{% trans 'Sign Up' %}{% endblock %}
 
-{% block header %}
-  <script async defer src="https://eu.altcha.org/js/latest/altcha.min.js" type="module"></script>
-{% endblock %}
+{% block header %}{% endblock %}
 {% block bodyclass %}signup-form{% endblock %}
 
 {% block content %}

dje/templates/widgets/altcha.html

@@ -0,0 +1,3 @@
+<script async defer src="https://eu.altcha.org/js/latest/altcha.min.js" type="module"></script>
+{% include "django/forms/widgets/input.html" %}
+<altcha-widget challengeurl="/altcha/" name="altcha_token" floating></altcha-widget>