reverting unnecessary steps to not re-load leap-sessions on re-login, as they are already cached from leap side

- fixing build

Issue #590

1 files changed, 6 insertions, 14 deletions

diff --git a/service/pixelated/resources/login_resource.py b/service/pixelated/resources/login_resource.py
index 9e47fd3c..ca8f0b11 100644
--- a/service/pixelated/resources/login_resource.py
+++ b/service/pixelated/resources/login_resource.py
@@ -28,7 +28,6 @@ from twisted.web.template import Element, XMLFile, renderElement, renderer
 from twisted.python.filepath import FilePath
 
 from pixelated.adapter.welcome_mail import add_welcome_mail
-from pixelated.config.leap import authenticate_user
 from pixelated.resources import BaseResource, UnAuthorizedResource, IPixelatedSession
 
 log = logging.getLogger(__name__)
@@ -68,13 +67,12 @@ class LoginWebSite(Element):
 class LoginResource(BaseResource):
     BASE_URL = 'login'
 
-    def __init__(self, services_factory, portal=None, provider=None):
+    def __init__(self, services_factory, portal=None):
         BaseResource.__init__(self, services_factory)
         self._static_folder = _get_static_folder()
         self._startup_folder = _get_startup_folder()
         self._html_template = open(os.path.join(self._startup_folder, 'login.html')).read()
         self._portal = portal
-        self._leap_provider = provider
         self.putChild('startup-assets', File(self._startup_folder))
 
     def set_portal(self, portal):
@@ -121,8 +119,8 @@ class LoginResource(BaseResource):
     @defer.inlineCallbacks
     def _handle_login(self, request):
         self.creds = self._get_creds_from(request)
-        iface, srp_auth, logout = yield self._portal.login(self.creds, None, IResource)
-        defer.returnValue(srp_auth)
+        iface, leap_session, logout = yield self._portal.login(self.creds, None, IResource)
+        defer.returnValue(leap_session)
 
     def _get_creds_from(self, request):
         username = request.args['username'][0]
@@ -130,19 +128,13 @@ class LoginResource(BaseResource):
         return credentials.UsernamePassword(username, password)
 
     @defer.inlineCallbacks
-    def _setup_user_services(self, srp_auth, request):
-        user_id = srp_auth.uuid
+    def _setup_user_services(self, leap_session, request):
+        user_id = leap_session.user_auth.uuid
         if not self._services_factory.is_logged_in(user_id):
-            leap_session = yield self._init_leap_session(srp_auth)
-            yield self._initialize_services(leap_session)
+            yield self._services_factory.create_services_from(leap_session)
         self._init_http_session(request, user_id)
 
     @defer.inlineCallbacks
-    def _init_leap_session(self, srp_auth):
-        leap_session = yield authenticate_user(self._leap_provider, self.creds.username, self.creds.password, auth=srp_auth)
-        defer.returnValue(leap_session)
-
-    @defer.inlineCallbacks
     def _initialize_services(self, leap_session):
         yield self._services_factory.create_services_from(leap_session)