Fix the registration form

Author: abompard

hyperkitty/tests/views/test_accounts.py

@@ -77,7 +77,7 @@ def test_public_profile(self):
         self.assertEqual(response.status_code, 200)
 
     @override_settings(USE_INTERNAL_AUTH=True)
-    def test_registration(self):
+    def test_registration_redirect(self):
         self.client.login(username='testuser', password='testPass')
         # If the user if already logged in, redirect to index page...
         # Don't let him register again
@@ -89,7 +89,17 @@ def test_registration(self):
         self.client.logout()
         response = self.client.get(reverse('hk_user_registration'))
         self.assertEqual(response.status_code, 200)
-        # @TODO: Try to register a user and verify its working
+
+    @override_settings(USE_INTERNAL_AUTH=True)
+    def test_registration(self):
+        response = self.client.get(reverse('hk_user_registration'))
+        self.assertEqual(response.status_code, 200)
+        response = self.client.post(reverse("hk_user_registration"),
+            {"email": "newtestuser@example.com",
+             "password1": "test", "password2": "test"})
+        self.assertRedirects(response, reverse('hk_root'))
+        response = self.client.get(reverse('hk_root'))
+        self.assertContains(response, "newtestuser@example.com")
 
     def test_votes(self):
         self.client.login(username='testuser', password='testPass')

hyperkitty/views/accounts.py

@@ -154,6 +154,7 @@ def user_registration(request):
         form = RegistrationForm(request.POST)
         if form.is_valid():
             user = form.save()
+            user.backend = "django.contrib.auth.backends.ModelBackend"
             logger.info("New registered user: %s", user.username)
             if user.is_active:
                 login(request, user)

hyperkitty/views/forms.py

@@ -37,11 +37,13 @@
 
 class RegistrationForm(UserCreationForm):
 
-    email     = forms.EmailField(required=True)
+    username = forms.CharField(required=False, widget=forms.HiddenInput())
+    email    = forms.EmailField(required=True)
 
     class Meta: # pylint: disable=no-init
         model = User
-        fields = ("email", )
+        fields  = ["email"]
+        exclude = ["username"]
 
     def __init__(self, *args, **kwargs):
         super(RegistrationForm, self).__init__(*args, **kwargs)
@@ -53,10 +55,6 @@ def __init__(self, *args, **kwargs):
         self.helper.field_class = 'col-sm-6 col-md-5 col-lg-4'
         self.helper.add_input(Submit('submit', _('Register'), css_class="col-sm-offset-6"))
 
-    def clean_username(self):
-        self.cleaned_data["username"] = self.cleaned_data["email"]
-        return super(RegistrationForm, self).clean_username()
-
     def clean_email(self):
         email = self.cleaned_data["email"]
         try:
@@ -68,6 +66,14 @@ def clean_email(self):
             code='duplicate_email',
         )
 
+    def save(self, commit=True):
+        # Use the email as username
+        user = super(RegistrationForm, self).save(commit=False)
+        user.username = self.cleaned_data["email"]
+        if commit:
+            user.save()
+        return user
+
 
 class InternalAuthenticationForm(AuthenticationForm):