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/cli/bitmask_cli.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/leap/bitmask/cli/bitmask_cli.py') diff --git a/src/leap/bitmask/cli/bitmask_cli.py b/src/leap/bitmask/cli/bitmask_cli.py index 5be6e9fc..49c5c3d3 100755 --- a/src/leap/bitmask/cli/bitmask_cli.py +++ b/src/leap/bitmask/cli/bitmask_cli.py @@ -107,10 +107,8 @@ GENERAL COMMANDS: help='displays status about the mail service') parser.add_argument('--enable', action='store_true') parser.add_argument('--disable', action='store_true') - parser.add_argument('--get-imap-token', action='store_true', - help='returns token for the IMAP service') - parser.add_argument('--get-smtp-token', action='store_true', - help='returns token for the SMTP service') + parser.add_argument('--get-token', action='store_true', + help='returns token for the mail service') parser.add_argument('--get-smtp-certificate', action='store_true', help='downloads a new smtp certificate') parser.add_argument('--check-smtp-certificate', action='store_true', @@ -276,11 +274,8 @@ def send_command(cli): elif subargs.disable: data += ['disable'] - elif subargs.get_imap_token: - data += ['get_imap_token'] - - elif subargs.get_smtp_token: - data += ['get_smtp_token'] + elif subargs.get_token: + data += ['get_token'] elif subargs.get_smtp_certificate: data += ['get_smtp_certificate'] -- cgit v1.2.3