Self hosted FLOSS fitness/workout, nutrition and weight tracker
Allow setting the email when registering users via API
Roland Geiderba12af89a00d
diff --git a/wger/core/api/serializers.py b/wger/core/api/serializers.pyindex a7850b9cf..6ec1094e5 100644--- a/wger/core/api/serializers.py+++ b/wger/core/api/serializers.py@@ -87,17 +87,23 @@ class UserApiSerializer(serializers.ModelSerializer):class UserRegistrationSerializer(serializers.ModelSerializer):+ email = serializers.EmailField(+ required=False,+ validators=[UniqueValidator(queryset=User.objects.all())]+ )username = serializers.CharField(required=True,validators=[UniqueValidator(queryset=User.objects.all())])password = serializers.CharField(write_only=True, required=True, validators=[validate_password])class Meta:model = User- fields = ('username', 'password')+ fields = ('username', 'email', 'password')def create(self, validated_data):user = User.objects.create(username=validated_data['username'])user.set_password(validated_data['password'])+ if validated_data.get('email'):+ user.email = validated_data['email']user.save()return userdiff --git a/wger/core/tests/test_user_rest_registration.py b/wger/core/tests/test_user_rest_registration.pyindex 979328dfc..3f181d3f5 100644--- a/wger/core/tests/test_user_rest_registration.py+++ b/wger/core/tests/test_user_rest_registration.py@@ -67,7 +67,7 @@ class CreateUserCommand(WgerTestCase):response = self.client.post(reverse('api_register'),{'username': 'restapi',- 'email': '[email protected]',+ 'email': '[email protected]','password': 'AekaiLe0ga'},Authorization=f'Token {token.key}')count_after = User.objects.count()@@ -79,20 +79,26 @@ class CreateUserCommand(WgerTestCase):self.assertEqual(response.data["token"], token.key)self.assertEqual(count_after, count_before + 1)- def test_post_invalid_api_user_creation(self):- """Test unsuccessfully registration (weak password)"""+ def test_post_valid_api_user_creation_no_email(self):+ """Successfully register a user via the REST API without providing an email"""self.user_login('test')user = User.objects.get(username='test')token = Token.objects.get(user=user)+ count_before = User.objects.count()response = self.client.post(reverse('api_register'),{'username': 'restapi',- 'email': '[email protected]',- 'password': '12345'},+ 'password': 'AekaiLe0ga'},Authorization=f'Token {token.key}')+ count_after = User.objects.count()+ self.assertEqual(response.status_code, HTTP_201_CREATED)- self.assertEqual(response.status_code, HTTP_400_BAD_REQUEST)+ new_user = User.objects.get(username='restapi')+ token = Token.objects.get(user=new_user)+ self.assertEqual(response.data["message"], "api user successfully registered")+ self.assertEqual(response.data["token"], token.key)+ self.assertEqual(count_after, count_before + 1)def test_post_not_allowed_api_user_creation(self):"""User admin isn't allowed to register users"""@@ -102,9 +108,52 @@ class CreateUserCommand(WgerTestCase):response = self.client.post(reverse('api_register'),{'username': 'restapi',- 'email': '[email protected]',+ 'email': '[email protected]','password': 'AekaiLe0ga'})count_after = User.objects.count()self.assertEqual(response.status_code, HTTP_403_FORBIDDEN)self.assertEqual(count_after, count_before)++ def test_post_unsuccessfully_registration_no_username(self):+ """Test unsuccessful registration (weak password)"""++ self.user_login('test')+ user = User.objects.get(username='test')+ token = Token.objects.get(user=user)++ response = self.client.post(reverse('api_register'),+ {'password': 'AekaiLe0ga'},+ Authorization=f'Token {token.key}')++ self.assertEqual(response.status_code, HTTP_400_BAD_REQUEST)++ def test_post_unsuccessfully_registration_invalid_email(self):+ """Test unsuccessful registration (invalid email)"""++ self.user_login('test')+ user = User.objects.get(username='test')+ token = Token.objects.get(user=user)++ response = self.client.post(reverse('api_register'),+ {'username': 'restapi',+ 'email': 'example.com',+ 'password': 'AekaiLe0ga'},+ Authorization=f'Token {token.key}')++ self.assertEqual(response.status_code, HTTP_400_BAD_REQUEST)++ def test_post_unsuccessfully_registration_invalid_email_2(self):+ """Test unsuccessful registration (email already exists)"""++ self.user_login('test')+ user = User.objects.get(username='test')+ token = Token.objects.get(user=user)++ response = self.client.post(reverse('api_register'),+ {'username': 'restapi',+ 'email': '[email protected]',+ 'password': 'AekaiLe0ga'},+ Authorization=f'Token {token.key}')++ self.assertEqual(response.status_code, HTTP_400_BAD_REQUEST)