From 5068fee5b8034967e14bc14c0fb553428a38d822 Mon Sep 17 00:00:00 2001 From: Fabian Stamm Date: Sat, 31 Mar 2018 23:51:48 +0000 Subject: [PATCH] Changing uuid to uid (User ID) --- plugins/radicale_stamm_auth/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/radicale_stamm_auth/__init__.py b/plugins/radicale_stamm_auth/__init__.py index f11b84a..c2630f8 100644 --- a/plugins/radicale_stamm_auth/__init__.py +++ b/plugins/radicale_stamm_auth/__init__.py @@ -14,7 +14,7 @@ class Auth(BaseAuth): if user is None: return False main_uri = self.generate_base_uri( - "/client/check_pw") + "&uuid=" + user + "&password=" + password + "/client/check_pw") + "&uid=" + user + "&password=" + password req = urllib.request.urlopen(main_uri, data=None) jsons = req.read() data = json.loads(jsons) @@ -24,15 +24,15 @@ class Auth(BaseAuth): return True def map_login_to_user(self, login): - # Get uuid from username + # Get uid from username if login is None or login is "": return None main_uri = self.generate_base_uri( - "/client/uuid") + "&username=" + login + "/client/uid") + "&username=" + login req = urllib.request.urlopen(main_uri, data=None) jsons = req.read() data = json.loads(jsons) print(data) if "error" in data: return None - return data["uuid"] + return data["uid"]