paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-16 03:41:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

auth: Retain email value if login fails.

Browse Source 
Fixes #7795
This commit is contained in:
Umair Khan
2018-02-23 13:02:13 +05:00
committed by Tim Abbott
parent 0e8cadf980
commit 54e56481e6
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/tests/test_signup.py
View File

@@ -312,7 +312,9 @@ class LoginTest(ZulipTestCase):
self.assertIsNone(get_session_dict_user(self.client.session)) self.assertIsNone(get_session_dict_user(self.client.session))
def test_login_bad_password(self) -> None: def test_login_bad_password(self) -> None:
self.login(self.example_email("hamlet"), password="wrongpassword", fails=True) email = self.example_email("hamlet")
result = self.login_with_return(email, password="wrongpassword")
self.assert_in_success_response([email], result)
self.assertIsNone(get_session_dict_user(self.client.session)) self.assertIsNone(get_session_dict_user(self.client.session))
def test_login_nonexist_user(self) -> None: def test_login_nonexist_user(self) -> None:

3
zerver/views/auth.py
View File

@@ -545,6 +545,9 @@ def login_page(request: HttpRequest, **kwargs: Any) -> HttpResponse:
# only if it actually exists. # only if it actually exists.
return HttpResponseRedirect(realm.uri) return HttpResponseRedirect(realm.uri)
if 'username' in request.POST:
extra_context['email'] = request.POST['username']
try: try:
template_response = django_login_page( template_response = django_login_page(
request, authentication_form=OurAuthenticationForm, request, authentication_form=OurAuthenticationForm,