diff --git a/Pipfile b/Pipfile index 19760eab..7532aae1 100644 --- a/Pipfile +++ b/Pipfile @@ -23,7 +23,6 @@ Django = "~=3.1.12" django-debug-toolbar = "~=3.2" django-filter = "~=2.4.0" django-ical = "~=1.7.1" -django-recaptcha = "~=2.0.6" django-recurrence = "~=1.10.3" django-registration-redux = "~=2.9" django-reversion = "~=3.0.9" @@ -78,6 +77,7 @@ zipp = "~=3.4.0" sentry-sdk = "*" diff-match-patch = "*" python-barcode = "*" +django-hcaptcha = "*" [dev-packages] selenium = "~=3.141.0" @@ -89,14 +89,8 @@ pytest-django = "*" pluggy = "*" pytest-splinter = "*" pytest = "*" +pytest-xdist = {extras = [ "psutil",], version = "*"} +PyPOM = {extras = [ "splinter",], version = "*"} [requires] python_version = "3.9" - -[dev-packages.pytest-xdist] -extras = [ "psutil",] -version = "*" - -[dev-packages.PyPOM] -extras = [ "splinter",] -version = "*" diff --git a/Pipfile.lock b/Pipfile.lock index 7acad93c..c8114eff 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "7ce63a92a53c057af0591ed6a2663f9c81e9e65bb16ca277f6b07db8c7faeea4" + "sha256": "28cf82a210d555ef6791bb56e5ecf8c7ce345a85f65095d724e890fbbaa44803" }, "pipfile-spec": 6, "requires": { @@ -213,6 +213,13 @@ "index": "pypi", "version": "==2.4.0" }, + "django-hcaptcha": { + "hashes": [ + "sha256:2b80197c07bb8444249bcce3758b0472d369cca309fb02d7abcd0a856431b76b" + ], + "index": "pypi", + "version": "==0.1.0" + }, "django-htmlmin": { "hashes": [ "sha256:e41b2a2157570846645cc636a9bddde8aa3e03f6834a9211e61a17f2ed42b87e" @@ -228,13 +235,6 @@ "index": "pypi", "version": "==1.7.3" }, - "django-recaptcha": { - "hashes": [ - "sha256:567784963fd5400feaf92e8951d8dbbbdb4b4c48a76e225d4baa63a2c9d2cd8c" - ], - "index": "pypi", - "version": "==2.0.6" - }, "django-recurrence": { "hashes": [ "sha256:715f681f6af029ff3a8d73c7b1460abd8cbc5d5a5001efcb127032e84d9cb963", diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py index 82b94bb4..0120303a 100644 --- a/PyRIGS/settings.py +++ b/PyRIGS/settings.py @@ -65,8 +65,8 @@ INSTALLED_APPS = ( 'debug_toolbar', 'registration', 'reversion', - 'captcha', 'widget_tweaks', + 'hcaptcha', ) MIDDLEWARE = ( @@ -186,12 +186,10 @@ LOGOUT_URL = '/user/logout/' ACCOUNT_ACTIVATION_DAYS = 7 -# reCAPTCHA settings -RECAPTCHA_PUBLIC_KEY = env('RECAPTCHA_PUBLIC_KEY', default="6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI") # If not set, use development key -RECAPTCHA_PRIVATE_KEY = env('RECAPTCHA_PUBLIC_KEY', default="6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe") # If not set, use development key -NOCAPTCHA = True - -SILENCED_SYSTEM_CHECKS = ['captcha.recaptcha_test_key_error'] +# CAPTCHA settings +if not DEBUG: + HCAPTCHA_SITEKEY = env('HCAPTCHA_SITEKEY') + HCAPTCHA_SECRET = env('HCAPTCHA_SECRET') # Email EMAILER_TEST = False