Fixed login validator, added some debug lines

2019-10-15 22:21:43 +13:00
parent 465ad76281
commit e004c00496
2 changed files with 12 additions and 11 deletions
--- a/lib/directadmin.py
+++ b/lib/directadmin.py
@@ -30,9 +30,6 @@ class DirectAdminClient:
            response = self.login_test()
        except DirectAdminClientException as e:
            raise e
-            
-
-

    def make_request(self, endpoint, data=None):
        response = None  # Empty response variable
@@ -69,11 +66,9 @@ class DirectAdminClient:

    def login_test(self):
        r = self.make_request('CMD_API_LOGIN_TEST')
-        response = parse_qs(r.read().decode('utf8'),
-                         keep_blank_values=0,
-                         strict_parsing=1)
-        
-        return self.__process_response__(response)
+        if "<!DOCTYPE html>" in r.read().decode('utf8'):
+            raise DirectAdminClientException('Not Logged in! Check Username and Password/Login Key')
+        return r.getheaders()[0][1]

    def get_domain_list(self):
        r = self.make_request('CMD_API_SHOW_DOMAINS')