schoolapp-api 2.1.3__tar.gz → 2.1.4__tar.gz

{schoolapp_api-2.1.3/schoolapp_api.egg-info → schoolapp_api-2.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: schoolapp-api
-Version: 2.1.3
+Version: 2.1.4
 Summary: Professional client for interacting with the School App API
 Author: Aferiad Kamal
 License: MIT

{schoolapp_api-2.1.3 → schoolapp_api-2.1.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "schoolapp-api"
-version = "2.1.3"
+version = "2.1.4"
 description = "Professional client for interacting with the School App API"
 readme = "README.md"
 requires-python = ">=3.7"

{schoolapp_api-2.1.3 → schoolapp_api-2.1.4}/schoolapp_api/auth.py

@@ -71,11 +71,12 @@ class AuthManager:
     
     def check_session(self):
         """
-        Confirm whether the session is still valid.
+        Confirm whether the session is still valid by visiting the index page.
         """
-        code, url, content = self.http_client.get(self.login_url)
+        from schoolapp_api.constants import INDEX_URL
+        code, url, content = self.http_client.get(INDEX_URL)
 
-        # If server redirects us back to login, session is dead
+        # If server redirects us to login, session is dead
         if url and "/login" in url:
             self.logged_in = False
             return False

{schoolapp_api-2.1.3 → schoolapp_api-2.1.4}/schoolapp_api/http_client.py

@@ -24,13 +24,9 @@ class HTTPClient:
     def __init__(self, base_url):
         self.base_url = base_url
         self.cookie_jar = http.cookiejar.CookieJar()
-        opener = urllib.request.build_opener(
-            urllib.request.HTTPCookieProcessor(self.cookie_jar),
-            NoRedirectHandler()
+        self.opener = urllib.request.build_opener(
+            urllib.request.HTTPCookieProcessor(self.cookie_jar)
         )
-        urllib.request.install_opener(opener)
-        # opener = urllib.request.build_opener(urllib.request.HTTPCookieProcessor(self.cookie_jar))
-        # urllib.request.install_opener(opener)
         self.headers = DEFAULT_HEADERS.copy()
     
     def get(self, url, params=None):
@@ -43,15 +39,20 @@ class HTTPClient:
 
             req = urllib.request.Request(url, headers=self.headers, method="GET")
 
-            with urllib.request.urlopen(req) as response:
+            with self.opener.open(req, timeout=15) as response:
                 code = response.getcode()
                 response_url = response.geturl()
                 content = response.read().decode("utf-8")
                 return code, response_url, content
 
         except urllib.error.HTTPError as e:
+            # Still get content from error page if possible (some portals return 401 with nice HTML)
+            try:
+                content = e.read().decode("utf-8")
+            except:
+                content = None
             logger.error(f"HTTP Error {e.code}: {e.reason}")
-            return e.code, None, None
+            return e.code, e.url, content
         except Exception as e:
             logger.error(f"GET Error: {e}")
             return None, None, None
@@ -66,14 +67,18 @@ class HTTPClient:
             if referer:
                 req.add_header('Referer', referer)
             
-            with urllib.request.urlopen(req) as response:
+            with self.opener.open(req, timeout=15) as response:
                 code = response.getcode()
                 response_url = response.geturl()
                 content = response.read().decode('utf-8')
                 return code, response_url, content
         except urllib.error.HTTPError as e:
+            try:
+                content = e.read().decode("utf-8")
+            except:
+                content = None
             logger.error(f"HTTP Error {e.code}: {e.reason}")
-            return e.code, None, None
+            return e.code, e.url, content
         except Exception as e:
             logger.error(f"POST Error: {e}")
             return None, None, None

{schoolapp_api-2.1.3 → schoolapp_api-2.1.4/schoolapp_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: schoolapp-api
-Version: 2.1.3
+Version: 2.1.4
 Summary: Professional client for interacting with the School App API
 Author: Aferiad Kamal
 License: MIT