diff options
Diffstat (limited to 'service/pixelated/config/initialize_leap.py')
| -rw-r--r-- | service/pixelated/config/initialize_leap.py | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/service/pixelated/config/initialize_leap.py b/service/pixelated/config/initialize_leap.py index b693fde6..3ddc3a57 100644 --- a/service/pixelated/config/initialize_leap.py +++ b/service/pixelated/config/initialize_leap.py @@ -1,6 +1,5 @@ from pixelated.config.config import Config -from pixelated.config.config_ua import config_user_agent -from pixelated.config.dispatcher import config_dispatcher +from pixelated.config import credentials from leap.common.events import server as events_server import pixelated.bitmask_libraries.certs as certs from pixelated.bitmask_libraries.session import open_leap_session @@ -8,39 +7,22 @@ from pixelated.bitmask_libraries.session import open_leap_session def initialize_leap(leap_provider_cert, leap_provider_cert_fingerprint, - config_file, - dispatcher, - dispatcher_stdin, + credentials_file, + organization_mode, leap_home): - init_monkeypatches() - - provider, user, password = gather_credentials(dispatcher, - dispatcher_stdin, - config_file) - + provider, user, password = credentials.read(organization_mode, credentials_file) init_leap_cert(leap_provider_cert, leap_provider_cert_fingerprint) - events_server.ensure_server(port=8090) - leap_session = create_leap_session(provider, user, password, leap_home) - return leap_session -def gather_credentials(dispatcher, dispatcher_stdin, config_file): - if dispatcher or dispatcher_stdin: - return config_dispatcher(dispatcher) - else: - return config_user_agent(config_file) - - def create_leap_session(provider, username, password, leap_home): leap_session = open_leap_session(username, password, provider, leap_home) - leap_session.soledad_session.soledad.sync(defer_decryption=False) leap_session.nicknym.generate_openpgp_key() return leap_session |