summaryrefslogtreecommitdiff
path: root/service/pixelated/config/leap.py
diff options
context:
space:
mode:
authorNavaL <ayoyo@thoughtworks.com>2016-09-26 12:54:45 +0200
committerNavaL <ayoyo@thoughtworks.com>2016-09-26 12:54:45 +0200
commit4462f7f8ca4b0e22396ef3a82cee884f8d348276 (patch)
treecaf5db25a885207c4aa823d04c2e9d0f9cbcce72 /service/pixelated/config/leap.py
parent833ed49c24a2b1ba87d5bdf7c1d660e68602defc (diff)
rearranged leap session creation to not sync nor setup account/fetcher, when using the cache
Issue #773
Diffstat (limited to 'service/pixelated/config/leap.py')
-rw-r--r--service/pixelated/config/leap.py11
1 files changed, 1 insertions, 10 deletions
diff --git a/service/pixelated/config/leap.py b/service/pixelated/config/leap.py
index 54518bae..3d307fc7 100644
--- a/service/pixelated/config/leap.py
+++ b/service/pixelated/config/leap.py
@@ -1,6 +1,7 @@
from __future__ import absolute_import
import logging
from collections import namedtuple
+from twisted.cred.error import UnauthorizedLogin
from twisted.internet import defer, threads
from leap.common.events import (server as events_server)
from leap.soledad.common.errors import InvalidAuthTokenError
@@ -45,16 +46,6 @@ def initialize_leap_multi_user(provider_hostname,
@defer.inlineCallbacks
def create_leap_session(provider, username, password, auth=None):
leap_session = yield LeapSessionFactory(provider).create(username, password, auth)
- try:
- yield leap_session.first_required_sync()
- except InvalidAuthTokenError:
- try:
- leap_session.close()
- except Exception, e:
- log.error(e)
- leap_session = LeapSessionFactory(provider).create(username, password, auth)
- yield leap_session.first_required_sync()
-
defer.returnValue(leap_session)