diff options
| -rw-r--r-- | service/pixelated/resources/login_resource.py | 6 | ||||
| -rw-r--r-- | service/pixelated/resources/session.py | 2 | ||||
| -rw-r--r-- | service/test/unit/resources/test_login_resource.py | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/service/pixelated/resources/login_resource.py b/service/pixelated/resources/login_resource.py index 2a9be77b..77ebca70 100644 --- a/service/pixelated/resources/login_resource.py +++ b/service/pixelated/resources/login_resource.py @@ -155,8 +155,8 @@ class LoginResource(BaseResource): log.error('Login error during %s services setup: %s \n %s' % (user_auth.username, error.getErrorMessage(), error.getTraceback())) session.login_error() - def set_session_cookies(_, session): - session.login_completed(user_auth.uuid) + def login_successful(_, session): + session.login_successful(user_auth.uuid) language = parse_accept_language(request.getAllHeaders()) password = request.args['password'][0] @@ -164,7 +164,7 @@ class LoginResource(BaseResource): session.login_started() d = self._bootstrap_user_services.setup(user_auth, password, language) - d.addCallback(set_session_cookies, session) + d.addCallback(login_successful, session) d.addErrback(login_error, session) diff --git a/service/pixelated/resources/session.py b/service/pixelated/resources/session.py index 5f48a090..5dfa52e6 100644 --- a/service/pixelated/resources/session.py +++ b/service/pixelated/resources/session.py @@ -41,7 +41,7 @@ class PixelatedSession(object): def login_started(self): self.login_status = 'started' - def login_completed(self, user_uuid): + def login_successful(self, user_uuid): self.user_uuid = user_uuid self.login_status = 'completed' diff --git a/service/test/unit/resources/test_login_resource.py b/service/test/unit/resources/test_login_resource.py index 6dea7abb..834b9710 100644 --- a/service/test/unit/resources/test_login_resource.py +++ b/service/test/unit/resources/test_login_resource.py @@ -285,19 +285,19 @@ class TestLoginPOST(unittest.TestCase): d.addCallback(assert_login_started_called) return d - @patch('pixelated.resources.session.PixelatedSession.login_completed') + @patch('pixelated.resources.session.PixelatedSession.login_successful') @patch('pixelated.config.leap.BootstrapUserServices.setup') @patch('pixelated.authentication.Authenticator.authenticate') - def test_session_adds_login_completed_status_when_services_setup_finishes(self, mock_authenticate, mock_user_bootstrap_setup, mock_login_completed): + def test_session_adds_login_successful_status_when_services_setup_finishes(self, mock_authenticate, mock_user_bootstrap_setup, mock_login_successful): mock_authenticate.return_value = self.user_auth mock_user_bootstrap_setup.return_value = defer.succeed(None) d = self.web.get(self.request) - def assert_login_completed_called(_): - mock_login_completed.assert_called_once() + def assert_login_successful_called(_): + mock_login_successful.assert_called_once() - d.addCallback(assert_login_completed_called) + d.addCallback(assert_login_successful_called) return d @patch('pixelated.resources.session.PixelatedSession.login_error') |