summaryrefslogtreecommitdiff
path: root/service/pixelated/config/soledad.py
diff options
context:
space:
mode:
authorBruno Wagner <bwgpro@gmail.com>2015-06-03 11:50:22 -0300
committerBruno Wagner <bwgpro@gmail.com>2015-06-03 11:50:22 -0300
commit5058713490ad0f74c177b883b84af9bacdf6eaf1 (patch)
treec149ef847df94531e79ea7b46b891222c73b2684 /service/pixelated/config/soledad.py
parentfd1820c2951f27341a0010cfc4c6009abdfe8261 (diff)
Leap certificate initialization and credentials gathering is now done on initialize_leap
Diffstat (limited to 'service/pixelated/config/soledad.py')
-rw-r--r--service/pixelated/config/soledad.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/service/pixelated/config/soledad.py b/service/pixelated/config/soledad.py
index 13a6dbd4..6f03d02b 100644
--- a/service/pixelated/config/soledad.py
+++ b/service/pixelated/config/soledad.py
@@ -17,11 +17,12 @@
from pixelated.bitmask_libraries.session import open as open_leap_session
-def init_soledad_and_user_key(app, leap_home):
- leap_session = open_leap_session(app['LEAP_USERNAME'],
- app['LEAP_PASSWORD'],
- app['LEAP_SERVER_NAME'],
+def init_soledad_and_user_key(config, leap_home):
+ leap_session = open_leap_session(config.username,
+ config.password,
+ config.provider,
leap_home)
+
soledad = leap_session.soledad_session.soledad
soledad.sync(defer_decryption=False)
leap_session.nicknym.generate_openpgp_key()