From ba208ffd98aa8c47731cc12d71f90164bfc52eb3 Mon Sep 17 00:00:00 2001
From: Andre Basche <andre.basche@gmail.com>
Date: Mon, 10 Apr 2023 06:42:40 +0200
Subject: [PATCH] Improve logging

---
 pyhon/connection/auth.py | 20 ++++++++++++++------
 setup.py                 |  2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/pyhon/connection/auth.py b/pyhon/connection/auth.py
index 2404102..b6e0d5e 100644
--- a/pyhon/connection/auth.py
+++ b/pyhon/connection/auth.py
@@ -3,6 +3,7 @@ import logging
 import re
 import secrets
 import urllib
+from pprint import pformat
 from urllib import parse
 
 from yarl import URL
@@ -118,11 +119,14 @@ class HonAuth:
         ) as response:
             if response.status == 200:
                 try:
-                    return (await response.json())["events"][0]["attributes"]["values"][
-                        "url"
-                    ]
+                    data = await response.json()
+                    return data["events"][0]["attributes"]["values"]["url"]
                 except json.JSONDecodeError:
                     pass
+                except KeyError:
+                    _LOGGER.error(
+                        "Can't get login url - %s", pformat(await response.json())
+                    )
             _LOGGER.error(
                 "Unable to login: %s\n%s", response.status, await response.text()
             )
@@ -133,7 +137,10 @@ class HonAuth:
             if resp.status != 200:
                 _LOGGER.error("Unable to get token: %s", resp.status)
                 return False
-            url = re.findall("href\\s*=\\s*[\"'](.*?)[\"']", await resp.text())
+            url = re.findall("href\\s*=\\s*[\"'](http.+?)[\"']", await resp.text())
+            if not url:
+                _LOGGER.error("Can't get login url - \n%s", await resp.text())
+                raise PermissionError
         async with self._session.get(url[0]) as resp:
             if resp.status != 200:
                 _LOGGER.error("Unable to get token: %s", resp.status)
@@ -188,5 +195,6 @@ class HonAuth:
             if resp.status >= 400:
                 return False
             data = await resp.json()
-            self._id_token = data["id_token"]
-            self._access_token = data["access_token"]
+        self._id_token = data["id_token"]
+        self._access_token = data["access_token"]
+        return True
diff --git a/setup.py b/setup.py
index dfbfbeb..83d4176 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ with open("README.md", "r") as f:
 
 setup(
     name="pyhOn",
-    version="0.5.0",
+    version="0.6.0",
     author="Andre Basche",
     description="Control hOn devices with python",
     long_description=long_description,