From 54d72d9a55a5f1de5bb56c052d31ddddc2520b95 Mon Sep 17 00:00:00 2001 From: acrefoot Date: Thu, 14 Nov 2013 00:05:55 -0500 Subject: [PATCH] Fix Invitations on ONLY_SSO deploys (Zulip Enterprise) (imported from commit 6807adbd39682ba91a5746e8a75d7ce53f632ab3) --- zerver/views/__init__.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/zerver/views/__init__.py b/zerver/views/__init__.py index 2835345c66..321565e856 100644 --- a/zerver/views/__init__.py +++ b/zerver/views/__init__.py @@ -487,7 +487,15 @@ def maybe_send_to_registration(request, email, full_name=''): if form.is_valid(): # Construct a PreregistrationUser object and send the user over to # the confirmation view. - prereg_user = create_preregistration_user(email, request) + prereg_user = None + if settings.ONLY_SSO: + try: + prereg_user = PreregistrationUser.objects.filter(email__iexact=email).latest("invited_at") + except PreregistrationUser.DoesNotExist: + prereg_user = create_preregistration_user(email, request) + else: + prereg_user = create_preregistration_user(email, request) + return redirect("".join(( "/", # Split this so we only get the part after the /