From c4960aaf9346d99722f08eb6c91e9fa34e0adbc7 Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <lfleischer@calcurse.org>
Date: Thu, 27 Sep 2018 07:31:45 +0200
Subject: calcurse-caldav: fix auth method check
Fixes a regression introduced in 6a6c711 (calcurse-caldav: fix basic
authentication, 2018-07-20).
Addresses GitHub issue #149.
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
---
contrib/caldav/calcurse-caldav.py | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/contrib/caldav/calcurse-caldav.py b/contrib/caldav/calcurse-caldav.py
index 29ac328..b8d2582 100755
--- a/contrib/caldav/calcurse-caldav.py
+++ b/contrib/caldav/calcurse-caldav.py
@@ -688,12 +688,10 @@ try:
# Authenticate with OAuth2 and authorize HTTP object
cred = run_auth(authcode)
conn = cred.authorize(conn)
-
- # Add credentials to httplib2 to be used when request requires authentication
- if authmethod == 'basic':
+ elif authmethod == 'basic':
+ # Add credentials to httplib2
conn.add_credentials(username, password)
-
- elif authmethod != 'basic':
+ else:
die('Invalid option for AuthMethod in config file. Use "basic" or "oauth2"')
if init:
--
cgit v1.2.3-70-g09d2