Просмотр исходного кода

Merge pull request #1033 from rafalp/fix-login-on-registration

Fix login on registration
Rafał Pitoń 6 лет назад
Родитель
Сommit
1ec728cc39

+ 1 - 1
misago/__init__.py

@@ -1 +1 @@
-__version__ = '0.18.1'
+__version__ = '0.18.2'

+ 1 - 1
misago/users/api/userendpoints/create.py

@@ -57,7 +57,7 @@ def create_endpoint(request):
 
     send_welcome_email(request, new_user)
 
-    if not new_user.requires_activation == 'none':
+    if new_user.requires_activation == UserModel.ACTIVATION_NONE:
         authenticated_user = authenticate(
             username=new_user.email, password=form.cleaned_data['password']
         )

+ 10 - 6
misago/users/tests/test_user_create_api.py

@@ -314,9 +314,10 @@ class UserCreateTests(UserTestCase):
         self.assertEqual(Online.objects.filter(user=test_user).count(), 1)
 
         self.assertTrue(test_user.check_password('pass123'))
-
-        response = self.client.get(reverse('misago:index'))
-        self.assertContains(response, 'Bob')
+        
+        auth_json = self.client.get(reverse('misago:api:auth')).json()
+        self.assertTrue(auth_json['is_authenticated'])
+        self.assertEqual(auth_json['username'], 'Bob')
 
         self.assertIn('Welcome', mail.outbox[0].subject)
 
@@ -337,6 +338,9 @@ class UserCreateTests(UserTestCase):
         self.assertContains(response, 'Bob')
         self.assertContains(response, 'bob@bob.com')
 
+        auth_json = self.client.get(reverse('misago:api:auth')).json()
+        self.assertFalse(auth_json['is_authenticated'])
+
         UserModel.objects.get_by_username('Bob')
         UserModel.objects.get_by_email('bob@bob.com')
 
@@ -359,6 +363,9 @@ class UserCreateTests(UserTestCase):
         self.assertContains(response, 'Bob')
         self.assertContains(response, 'bob@bob.com')
 
+        auth_json = self.client.get(reverse('misago:api:auth')).json()
+        self.assertFalse(auth_json['is_authenticated'])
+
         UserModel.objects.get_by_username('Bob')
         UserModel.objects.get_by_email('bob@bob.com')
 
@@ -388,7 +395,4 @@ class UserCreateTests(UserTestCase):
 
         self.assertTrue(test_user.check_password(' pass123 '))
 
-        response = self.client.get(reverse('misago:index'))
-        self.assertContains(response, 'Bob')
-
         self.assertIn('Welcome', mail.outbox[0].subject)