summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2016-09-09 11:31:55 -0400
committerKali Kaneko (leap communications) <kali@leap.se>2016-09-09 11:31:55 -0400
commit7265421cbbb8e903766ffd24c5804302211e7da9 (patch)
tree497a85b12a405c8e5f521180a02a344cea8c3763 /src/leap
parentbc514f7b934ee6b6f1aba692c60f9e62e7a26475 (diff)
[bug] workaround for autoconf in cli
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/bitmask/core/dispatcher.py6
-rw-r--r--src/leap/bitmask/core/mail_services.py4
2 files changed, 7 insertions, 3 deletions
diff --git a/src/leap/bitmask/core/dispatcher.py b/src/leap/bitmask/core/dispatcher.py
index 55b1960..f3393a5 100644
--- a/src/leap/bitmask/core/dispatcher.py
+++ b/src/leap/bitmask/core/dispatcher.py
@@ -101,7 +101,8 @@ class UserCmd(SubCommand):
user, password = parts[2], parts[3]
autoconf = False
if len(parts) > 4:
- autoconf = parts[4]
+ if parts[4] == 'true':
+ autoconf = True
return bonafide.do_authenticate(user, password, autoconf)
@register_method("{'signup': 'ok', 'user': str}")
@@ -109,7 +110,8 @@ class UserCmd(SubCommand):
user, password = parts[2], parts[3]
autoconf = False
if len(parts) > 4:
- autoconf = parts[4]
+ if parts[4] == 'true':
+ autoconf = True
return bonafide.do_signup(user, password, autoconf)
@register_method("{'logout': 'ok'}")
diff --git a/src/leap/bitmask/core/mail_services.py b/src/leap/bitmask/core/mail_services.py
index 72a3512..79c1495 100644
--- a/src/leap/bitmask/core/mail_services.py
+++ b/src/leap/bitmask/core/mail_services.py
@@ -134,7 +134,9 @@ class SoledadContainer(Container):
def _get_provider_from_full_userid(userid):
_, provider_id = config.get_username_and_provider(userid)
- return config.Provider(provider_id)
+ # TODO -- this autoconf should be passed from the
+ # command flag. workaround to get cli workinf for now.
+ return config.Provider(provider_id, autoconf=True)
def is_service_ready(service, provider):