diff --git a/varken/helpers.py b/varken/helpers.py index 459b51b..ece4656 100644 --- a/varken/helpers.py +++ b/varken/helpers.py @@ -143,7 +143,12 @@ def connection_handler(session, request, verify, as_is_reply=False): try: get = s.send(r, verify=v) if get.status_code == 401: - logger.info('Your api key is incorrect for %s', r.url) + if 'NoSiteContext' in str(get.content): + logger.info('Your Site is incorrect for %s', r.url) + elif 'LoginRequired' in str(get.content): + logger.info('Your login credentials are incorrect for %s', r.url) + else: + logger.info('Your api key is incorrect for %s', r.url) elif get.status_code == 404: logger.info('This url doesnt even resolve: %s', r.url) elif get.status_code == 200: diff --git a/varken/unifi.py b/varken/unifi.py index a8ca60c..ad829e2 100644 --- a/varken/unifi.py +++ b/varken/unifi.py @@ -24,7 +24,7 @@ class UniFiAPI(object): req = self.session.prepare_request(Request('POST', self.server.url + endpoint, json=pre_cookies)) post = connection_handler(self.session, req, self.server.verify_ssl, as_is_reply=True) - if not post.cookies.get('unifises'): + if not post or not post.cookies.get('unifises'): return cookies = {'unifises': post.cookies.get('unifises')}