PrivateCoffee/synapse-registration
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Refines registration email validation

Browse source 
Updates email registration error message to clarify that a pending registration exists for the provided email.

Improves readability by reformatting long render function calls.
This commit is contained in:
Kumi 2024-11-16 22:20:53 +01:00
parent 06d0022a45
commit 0e8116cd68
Signed by: kumi
GPG key ID: ECBCC9082395383F
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/synapse_registration/registration/views.py
View file

@ -47,7 +47,7 @@ class EmailInputView(FormView):
if UserRegistration.objects.filter(email=email).exists(): if UserRegistration.objects.filter(email=email).exists():
form.add_error( form.add_error(
"email", "email",
"This email is already registered. Please use a different email address.", "There is already a pending registration for this email address. Please use a different email address.",
) )
return self.form_invalid(form) return self.form_invalid(form)
@ -81,10 +81,14 @@ class VerifyEmailView(View):
try: try:
registration = UserRegistration.objects.get(token=token) registration = UserRegistration.objects.get(token=token)
except UserRegistration.DoesNotExist: except UserRegistration.DoesNotExist:
return render(request, "registration/registration_forbidden.html", status=403) return render(
request, "registration/registration_forbidden.html", status=403
)
if registration.status != UserRegistration.STATUS_STARTED: if registration.status != UserRegistration.STATUS_STARTED:
return render(request, "registration/registration_forbidden.html", status=403) return render(
request, "registration/registration_forbidden.html", status=403
)
request.session["registration"] = registration.id request.session["registration"] = registration.id
registration.email_verified = True registration.email_verified = True
@ -112,7 +116,9 @@ class CompleteRegistrationView(FormView):
) )
if not response.json().get("available"): if not response.json().get("available"):
return render(self.request, "registration/registration_forbidden.html", status=403) return render(
self.request, "registration/registration_forbidden.html", status=403
)
response = requests.put( response = requests.put(
f"{settings.SYNAPSE_SERVER}/_synapse/admin/v2/users/@{username}:{settings.MATRIX_DOMAIN}", f"{settings.SYNAPSE_SERVER}/_synapse/admin/v2/users/@{username}:{settings.MATRIX_DOMAIN}",
@ -134,7 +140,9 @@ class CompleteRegistrationView(FormView):
[settings.ADMIN_EMAIL], [settings.ADMIN_EMAIL],
) )
return render(self.request, "registration/registration_forbidden.html", status=403) return render(
self.request, "registration/registration_forbidden.html", status=403
)
if response.status_code == 201: if response.status_code == 201:
# The "locked" field doesn't seem to work when creating a user, so we need to lock the user after creation # The "locked" field doesn't seem to work when creating a user, so we need to lock the user after creation
@ -187,5 +195,7 @@ class CompleteRegistrationView(FormView):
self.registration.status != UserRegistration.STATUS_STARTED self.registration.status != UserRegistration.STATUS_STARTED
or not self.registration.email_verified or not self.registration.email_verified
): ):
return render(request, "registration/registration_forbidden.html", status=403) return render(
request, "registration/registration_forbidden.html", status=403
)
return super().dispatch(request, *args, **kwargs) return super().dispatch(request, *args, **kwargs)