paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 06:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

settings: Don't mention username in fetch API key error message.

Browse Source 
There isn't a username prompt in the form for it, so the only
possibility for triggering this error is a wrong password.

Fixes #20924.
This commit is contained in:
jai2201
2022-01-28 08:29:26 +05:30
committed by Tim Abbott
parent 364139feec
commit c14b3a8844
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/tests/test_auth_backends.py
View File

@@ -4345,7 +4345,7 @@ class JSONFetchAPIKeyTest(ZulipTestCase):
user = self.example_user("hamlet") user = self.example_user("hamlet")
self.login_user(user) self.login_user(user)
result = self.client_post("/json/fetch_api_key", dict(password="wrong")) result = self.client_post("/json/fetch_api_key", dict(password="wrong"))
self.assert_json_error(result, "Your username or password is incorrect.", 400) self.assert_json_error(result, "Password is incorrect.", 400)
def test_invalid_subdomain(self) -> None: def test_invalid_subdomain(self) -> None:
username = "hamlet" username = "hamlet"

2
zerver/tests/test_decorators.py
View File

@@ -1143,7 +1143,7 @@ class FetchAPIKeyTest(ZulipTestCase):
def test_fetch_api_key_wrong_password(self) -> None: def test_fetch_api_key_wrong_password(self) -> None:
self.login("cordelia") self.login("cordelia")
result = self.client_post("/json/fetch_api_key", dict(password="wrong_password")) result = self.client_post("/json/fetch_api_key", dict(password="wrong_password"))
self.assert_json_error_contains(result, "password is incorrect") self.assert_json_error_contains(result, "Password is incorrect")
class InactiveUserTest(ZulipTestCase): class InactiveUserTest(ZulipTestCase):

2
zerver/views/auth.py
View File

@@ -977,7 +977,7 @@ def json_fetch_api_key(
if not authenticate( if not authenticate(
request=request, username=user_profile.delivery_email, password=password, realm=realm request=request, username=user_profile.delivery_email, password=password, realm=realm
): ):
raise JsonableError(_("Your username or password is incorrect.")) raise JsonableError(_("Password is incorrect."))
api_key = get_api_key(user_profile) api_key = get_api_key(user_profile)
return json_success({"api_key": api_key, "email": user_profile.delivery_email}) return json_success({"api_key": api_key, "email": user_profile.delivery_email})