From ee5b5198e89f23cd49d41dc58fb93443b5d8c9e1 Mon Sep 17 00:00:00 2001 From: NavaL Date: Sun, 22 May 2016 12:12:08 +0200 Subject: accomodates the case where the email address is the data sent with the event - now username and user_id are mapped when the user logs in - Issue #686 --- service/pixelated/resources/login_resource.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'service/pixelated/resources/login_resource.py') diff --git a/service/pixelated/resources/login_resource.py b/service/pixelated/resources/login_resource.py index 55db6970..eaa21bd9 100644 --- a/service/pixelated/resources/login_resource.py +++ b/service/pixelated/resources/login_resource.py @@ -161,15 +161,13 @@ class LoginResource(BaseResource): user_id = leap_session.user_auth.uuid if not self._services_factory.is_logged_in(user_id): yield self._services_factory.create_services_from(leap_session) - self._init_http_session(request, user_id) - - @defer.inlineCallbacks - def _initialize_services(self, leap_session): - yield self._services_factory.create_services_from(leap_session) + self._services_factory.map_email(self.creds.username, user_id) if leap_session.fresh_account: yield add_welcome_mail(leap_session.mail_store) + self._init_http_session(request, user_id) + def _init_http_session(self, request, user_id): session = IPixelatedSession(request.getSession()) session.user_uuid = user_id -- cgit v1.2.3