summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Shyba <victor.shyba@gmail.com>2015-06-10 18:04:55 -0300
committerVictor Shyba <victor.shyba@gmail.com>2015-06-10 18:05:19 -0300
commit0b8f2c0ba76e97c29c5f0e0f1bdd0313b6cdd744 (patch)
treef0fd020b22814f8d87572ebb7e365b07ad4b5e2c
parent1f41801a9355ed55e50ca6f54411565a5b11b093 (diff)
checking keys is a session responsability
-rw-r--r--service/pixelated/bitmask_libraries/session.py2
-rw-r--r--service/pixelated/config/leap.py5
2 files changed, 3 insertions, 4 deletions
diff --git a/service/pixelated/bitmask_libraries/session.py b/service/pixelated/bitmask_libraries/session.py
index 2b60662e..49116641 100644
--- a/service/pixelated/bitmask_libraries/session.py
+++ b/service/pixelated/bitmask_libraries/session.py
@@ -71,6 +71,8 @@ class LeapSession(object):
if self.config.start_background_jobs:
self.start_background_jobs()
+ self.soledad_session.soledad.sync(defer_decryption=False)
+ self.nicknym.generate_openpgp_key()
def account_email(self):
name = self.user_auth.username
diff --git a/service/pixelated/config/leap.py b/service/pixelated/config/leap.py
index f2c025ba..52cd4c8f 100644
--- a/service/pixelated/config/leap.py
+++ b/service/pixelated/config/leap.py
@@ -18,14 +18,11 @@ def initialize_leap(leap_provider_cert,
provider, username, password = credentials.read(organization_mode, credentials_file)
LeapCertificate.set_cert_and_fingerprint(leap_provider_cert, leap_provider_cert_fingerprint)
- config = LeapConfig(leap_home=leap_home)
+ config = LeapConfig(leap_home=leap_home, start_background_jobs=True)
provider = LeapProvider(provider, config)
LeapCertificate(provider).setup_ca_bundle()
leap_session = LeapSessionFactory(provider).create(username, password)
- leap_session.soledad_session.soledad.sync(defer_decryption=False)
- leap_session.nicknym.generate_openpgp_key()
- leap_session.start_background_jobs()
return leap_session