Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(user-create): duplicate email error message #2642

Merged
merged 4 commits into from
Aug 16, 2023
Merged

fix(user-create): duplicate email error message #2642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ccb7ae
fix(user-create): duplicate email message
gagantrivedi Aug 14, 2023
bfccb4b
remove key field from init
gagantrivedi Aug 15, 2023
ecfb3eb
use djoser_settings instead of constants directly
gagantrivedi Aug 15, 2023
f34b363
remove init method call
gagantrivedi Aug 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions api/custom_auth/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
from django.conf import settings
from djoser.conf import settings as djoser_settings
from djoser.serializers import UserCreateSerializer, UserDeleteSerializer
from rest_framework import serializers
from rest_framework.authtoken.models import Token
from rest_framework.exceptions import PermissionDenied
from rest_framework.validators import UniqueValidator

from organisations.invites.models import Invite
from users.constants import DEFAULT_DELETE_ORPHAN_ORGANISATIONS_VALUE
Expand All @@ -18,17 +20,27 @@ class Meta:


class CustomUserCreateSerializer(UserCreateSerializer):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.fields["key"] = serializers.SerializerMethodField()
key = serializers.SerializerMethodField()

class Meta(UserCreateSerializer.Meta):
fields = UserCreateSerializer.Meta.fields + (
"is_active",
"marketing_consent_given",
"key",
)
read_only_fields = ("is_active",)
write_only_fields = ("sign_up_type",)
extra_kwargs = {
"email": {
"validators": [
UniqueValidator(
queryset=FFAdminUser.objects.all(),
lookup="iexact",
message=djoser_settings.CONSTANTS.messages.CANNOT_CREATE_USER_ERROR,
)
]
}
}

def validate(self, attrs):
attrs = super().validate(attrs)
Expand All @@ -42,8 +54,6 @@ def validate(self, attrs):
self.context.get("request"), email=email, raise_exception=True
)

if FFAdminUser.objects.filter(email__iexact=email).count() != 0:
raise serializers.ValidationError({"detail": "Unable to create account"})
attrs["email"] = email.lower()
return attrs

Expand Down
2 changes: 1 addition & 1 deletion api/custom_auth/tests/test_serializer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def test_CustomUserCreateSerializer_does_case_insensitive_lookup_with_email(db):

# When
assert serializer.is_valid() is False
assert serializer.errors["detail"][0].title() == "Unable To Create Account"
assert serializer.errors["email"][0].title() == "Unable To Create Account."


def test_CustomUserCreateSerializer_calls_is_authentication_method_valid_correctly_if_auth_controller_is_installed(
Expand Down