Rework for 302 on v6 without breaking v8

Author: CoMPaTech

airos/base.py

@@ -234,6 +234,7 @@ async def _request_json(
         authenticated: bool = False,
         ct_json: bool = False,
         ct_form: bool = False,
+        allow_redirects: bool = True,
     ) -> dict[str, Any] | Any:
         """Make an authenticated API request and return JSON response."""
         # Pass the content type flags to the header builder
@@ -261,12 +262,13 @@ async def _request_json(
                 json=json_data,
                 data=form_data,
                 headers=request_headers,  # Pass the constructed headers
-                allow_redirects=False,  # Handle redirects manually if needed
+                allow_redirects=allow_redirects,
             ) as response:
                 _LOGGER.error("TESTv6 - Response code: %s", response.status)
 
                 # v6 responds with a 302 redirect and empty body
                 if url != self._login_urls["v6_login"]:
+                    _LOGGER.error("TESTv6 - we are in v8, raising for status")
                     response.raise_for_status()
 
                 response_text = await response.text()
@@ -277,6 +279,10 @@ async def _request_json(
                     self._store_auth_data(response)
                     self.connected = True
 
+                # V6 responsds with empty body on login, not JSON
+                if url != self._login_urls["v6_login"] and not response_text:
+                    return {}
+
                 return json.loads(response_text)
         except aiohttp.ClientResponseError as err:
             _LOGGER.error(
@@ -345,6 +351,7 @@ async def login(self) -> None:
                 headers=login_headers,
                 form_data=v6_simple_multipart_form_data,
                 authenticated=True,
+                allow_redirects=False,
             )
         except (AirOSUrlNotFoundError, AirOSConnectionSetupError) as err:
             _LOGGER.error(

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "airos"
-version         = "0.5.7a6"
+version         = "0.5.7a7"
 license         = "MIT"
 description     = "Ubiquiti airOS module(s) for Python 3."
 readme          = "README.md"

tests/test_airos_request.py

@@ -58,7 +58,7 @@ async def test_request_json_success(
         json=None,
         data=None,
         headers={},
-        allow_redirects=False,
+        allow_redirects=True,
     )
 
 
@@ -155,5 +155,5 @@ async def test_request_json_with_params_and_data(
         json=params,
         data=data,
         headers={},
-        allow_redirects=False,
+        allow_redirects=True,
     )