Ditch captcha

jsmesami · May 25, 2018 · ac705fe · ac705fe
1 parent bf9b239
commit ac705fe
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 31 deletions.
diff --git a/requirements_base.txt b/requirements_base.txt
@@ -5,7 +5,6 @@ django-bootstrap-form>=3.2
 django-compressor>=1.5
 django-ipware>=1.1
 django-modeltranslation>=0.10
-django-recaptcha>=1.2.1
 djangorestframework>=3.3
 django-cors-headers>=2.0.2
 markdown2>=2.3

diff --git a/src/naovoce/settings/base.py b/src/naovoce/settings/base.py
@@ -221,7 +221,6 @@
     'allauth.account',
     'allauth.socialaccount',
     'allauth.socialaccount.providers.facebook',
-    'captcha',
     'corsheaders',
     'rest_framework',
     'rest_framework.authtoken',
@@ -305,13 +304,6 @@
 
 GALLERY_PUBLIC_CONTAINERS = 'fruit',
 
-RECAPTCHA_PUBLIC_KEY = None     # must be set in instance-specific settings/local.py
-RECAPTCHA_PRIVATE_KEY = None    # must be set in instance-specific settings/local.py
-RECAPTCHA_USE_SSL = True
-NOCAPTCHA = True
-
-ACCOUNT_SIGNUP_FORM_CLASS = 'user.forms.CaptchaSignupForm'
-
 NEWSLETTER_INSTALLATION_URL = 'https://newsletter.na-ovoce.cz'
 NEWSLETTER_API_KEY = None           # must be set in instance-specific settings/local.py
 NEWSLETTER_BRAND_ID = 1             # must be set in instance-specific settings/local.py

diff --git a/src/naovoce/settings/local_deploy_example.py b/src/naovoce/settings/local_deploy_example.py
@@ -20,9 +20,5 @@
     }
 }
 
-RECAPTCHA_PUBLIC_KEY = '****'
-RECAPTCHA_PRIVATE_KEY = '****'
-RECAPTCHA_USE_SSL = True
-
 NEWSLETTER_API_KEY = '****'
 NEWSLETTER_DEFAULT_LIST_ID = '****'
diff --git a/src/naovoce/settings/local_devel_example.py b/src/naovoce/settings/local_devel_example.py
@@ -61,10 +61,6 @@
     'django.template.loaders.app_directories.Loader',
 ]
 
-# These are allways-passing reCaptcha v2 keys for testing purposes
-RECAPTCHA_PUBLIC_KEY = '6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI'
-RECAPTCHA_PRIVATE_KEY = '6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe'
-RECAPTCHA_USE_SSL = False
 
 # pip install django-debug-toolbar
 # EXTERNAL_APPS = ('debug_toolbar',) + EXTERNAL_APPS

diff --git a/src/naovoce/settings/travis.py b/src/naovoce/settings/travis.py
@@ -20,10 +20,6 @@
     }
 }
 
-RECAPTCHA_PUBLIC_KEY = '****'
-RECAPTCHA_PRIVATE_KEY = '****'
-RECAPTCHA_USE_SSL = True
-
 NEWSLETTER_API_KEY = '****'
 NEWSLETTER_DEFAULT_LIST_ID = '****'
 

diff --git a/src/user/forms.py b/src/user/forms.py
@@ -1,5 +1,3 @@
-from captcha.fields import ReCaptchaField
-
 from django import forms
 from django.contrib.auth.forms import ReadOnlyPasswordHashField
 from django.utils.translation import ugettext_noop, ugettext_lazy as _
@@ -70,14 +68,6 @@ def clean_password(self):
         return self.initial["password"]
 
 
-class CaptchaSignupForm(forms.Form):
-
-    captcha = ReCaptchaField()
-
-    def signup(self, request, user):
-        pass
-
-
 class MessageAdminForm(forms.ModelForm):
     class Meta:
         model = Message