From 091c81e411b94a49d7d16f88f3f8816e6c463d9c Mon Sep 17 00:00:00 2001 From: Tanner Collin Date: Fri, 28 Feb 2020 07:00:55 +0000 Subject: [PATCH] Capitalize names, disallow extra spaces --- apiserver/apiserver/api/serializers.py | 4 ++++ apiserver/apiserver/api/utils.py | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/apiserver/apiserver/api/serializers.py b/apiserver/apiserver/api/serializers.py index a04f924..096880f 100644 --- a/apiserver/apiserver/api/serializers.py +++ b/apiserver/apiserver/api/serializers.py @@ -372,6 +372,10 @@ class MyRegisterSerializer(RegisterSerializer): def validate_username(self, username): if re.search(r'[^a-z.]', username): raise ValidationError('Invalid characters.') + if '..' in username: + raise ValidationError('Can\'t have double periods.') + if username.startswith('.') or username.endswith('.'): + raise ValidationError('Can\'t start or end with periods.') return super().validate_username(username) def custom_signup(self, request, user): diff --git a/apiserver/apiserver/api/utils.py b/apiserver/apiserver/api/utils.py index e5986e6..cc6db1a 100644 --- a/apiserver/apiserver/api/utils.py +++ b/apiserver/apiserver/api/utils.py @@ -240,9 +240,9 @@ def link_old_member(data, user): member.user = user - member.first_name = data['first_name'] - member.last_name = data['last_name'] - member.preferred_name = data['first_name'] + member.first_name = data['first_name'].title() + member.last_name = data['last_name'].title() + member.preferred_name = data['first_name'].title() member.save() models.Transaction.objects.filter(member_id=member.id).update(user=user) @@ -269,9 +269,9 @@ def create_new_member(data, user): models.Member.objects.create( user=user, - first_name=data['first_name'], - last_name=data['last_name'], - preferred_name=data['first_name'], + first_name=data['first_name'].title(), + last_name=data['last_name'].title(), + preferred_name=data['first_name'].title(), ) def register_user(data, user):