summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTulio Casagrande <tcasagra@thoughtworks.com>2017-02-20 16:15:29 -0300
committerTulio Casagrande <tcasagra@thoughtworks.com>2017-02-21 13:32:06 -0300
commit77916147760ffc6cea8242955a551ce75d8b29e4 (patch)
tree01544857e145dee76f1499c7d3969e6ac99cd7a6
parentfa21608801f8d2ef710d4c28abbb558883afeaf7 (diff)
[#907] Change auth-error url
with @anikarni
-rw-r--r--service/pixelated/resources/login_resource.py2
-rw-r--r--service/test/integration/test_multi_user_login.py2
-rw-r--r--web-ui/src/login/login.js2
3 files changed, 3 insertions, 3 deletions
diff --git a/service/pixelated/resources/login_resource.py b/service/pixelated/resources/login_resource.py
index 2b00680b..5adfadf9 100644
--- a/service/pixelated/resources/login_resource.py
+++ b/service/pixelated/resources/login_resource.py
@@ -130,7 +130,7 @@ class LoginResource(BaseResource):
log.error('Authentication error for %s' % request.args['username'][0])
log.error('%s' % error)
request.setResponseCode(UNAUTHORIZED)
- content = util.redirectTo("/login?auth", request)
+ content = util.redirectTo("/login?auth-error", request)
request.write(content)
request.finish()
diff --git a/service/test/integration/test_multi_user_login.py b/service/test/integration/test_multi_user_login.py
index b04a4e9e..04cceec3 100644
--- a/service/test/integration/test_multi_user_login.py
+++ b/service/test/integration/test_multi_user_login.py
@@ -50,4 +50,4 @@ class MultiUserLoginTest(MultiUserSoledadTestBase):
response, login_request = self.app_test_client.login('username', 'wrong_password')
yield response
self.assertEqual(302, login_request.responseCode)
- self.assertIn('/login?auth-error', login_request.uri)
+ self.assertIn('/login?auth-error', login_request.responseHeaders.getRawHeaders('location'))
diff --git a/web-ui/src/login/login.js b/web-ui/src/login/login.js
index ed25b9a2..74e5a14e 100644
--- a/web-ui/src/login/login.js
+++ b/web-ui/src/login/login.js
@@ -28,7 +28,7 @@ if (process.env.NODE_ENV === 'development') a11y(React);
render(
<I18nextProvider i18n={i18n}>
- <AppWrapper authError={hasQueryParameter('auth')} />
+ <AppWrapper authError={hasQueryParameter('auth-error')} />
</I18nextProvider>,
document.getElementById('root')
);