From e653aa169e9c1fbb00e1920cd461a7be6c9e11af Mon Sep 17 00:00:00 2001 From: Ruben Pollan Date: Fri, 24 Jun 2016 18:50:01 +0200 Subject: [feat] use one single mail_auth token instead of imap/smtp tokens The core was not addapted to the mail_auth token. --- src/leap/bitmask/core/dispatcher.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'src/leap/bitmask/core/dispatcher.py') diff --git a/src/leap/bitmask/core/dispatcher.py b/src/leap/bitmask/core/dispatcher.py index c07f5b95..ec3593e8 100644 --- a/src/leap/bitmask/core/dispatcher.py +++ b/src/leap/bitmask/core/dispatcher.py @@ -104,28 +104,23 @@ class MailCmd(SubCommand): label = 'mail' @register_method('dict') - def do_ENABLE(self, service, *parts): + def do_ENABLE(self, service, *parts, **kw): d = service.do_enable_service(self.label) return d @register_method('dict') - def do_DISABLE(self, service, *parts): + def do_DISABLE(self, service, *parts, **kw): d = service.do_disable_service(self.label) return d @register_method('dict') - def do_STATUS(self, mail, *parts): + def do_STATUS(self, mail, *parts, **kw): d = mail.do_status() return d @register_method('dict') - def do_GET_IMAP_TOKEN(self, mail, *parts): - d = mail.get_imap_token() - return d - - @register_method('dict') - def do_GET_SMTP_TOKEN(self, mail, *parts): - d = mail.get_smtp_token() + def do_GET_TOKEN(self, mail, *parts, **kw): + d = mail.get_token() return d @register_method('dict') -- cgit v1.2.3