From 8b26f3f40e3f5d04a02528c81616a231d8f8428a Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Thu, 1 Dec 2016 17:20:36 -0200 Subject: [#849] Change unauthorized message --- service/pixelated/resources/login_resource.py | 4 ++-- service/test/integration/test_multi_user_login.py | 2 +- service/test/unit/resources/test_login_resource.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'service') diff --git a/service/pixelated/resources/login_resource.py b/service/pixelated/resources/login_resource.py index aadc435e..ed0cb54e 100644 --- a/service/pixelated/resources/login_resource.py +++ b/service/pixelated/resources/login_resource.py @@ -145,10 +145,10 @@ class LoginResource(BaseResource): self._complete_bootstrap(user_auth, request) def render_error(error): - log.info('Login Error for %s' % request.args['username'][0]) + log.info('Login error for %s' % request.args['username'][0]) log.info('%s' % error) request.setResponseCode(UNAUTHORIZED) - return self._render_template(request, 'Invalid credentials') + return self._render_template(request, 'Invalid username or password') d = self._handle_login(request) d.addCallbacks(render_response, render_error) diff --git a/service/test/integration/test_multi_user_login.py b/service/test/integration/test_multi_user_login.py index af2a81ac..fe456583 100644 --- a/service/test/integration/test_multi_user_login.py +++ b/service/test/integration/test_multi_user_login.py @@ -51,4 +51,4 @@ class MultiUserLoginTest(MultiUserSoledadTestBase): response, login_request = self.app_test_client.login('username', 'wrong_password') response_str = yield response self.assertEqual(401, login_request.responseCode) - self.assertIn('Invalid credentials', login_request.written) + self.assertIn('Invalid username or password', login_request.written) diff --git a/service/test/unit/resources/test_login_resource.py b/service/test/unit/resources/test_login_resource.py index d3d7ba64..45036f8d 100644 --- a/service/test/unit/resources/test_login_resource.py +++ b/service/test/unit/resources/test_login_resource.py @@ -206,7 +206,7 @@ class TestLoginPOST(unittest.TestCase): mock_authenticate.assert_called_once_with(self.username, self.password) self.assertEqual(401, self.request.responseCode) written_response = ''.join(self.request.written) - self.assertIn('Invalid credentials', written_response) + self.assertIn('Invalid username or password', written_response) self.assertFalse(mock_user_bootstrap_setup.called) self.assertFalse(self.resource.get_session(self.request).is_logged_in()) -- cgit v1.2.3