From 6433e28e983e6a75d711b82c0aa5da65d7f95659 Mon Sep 17 00:00:00 2001
From: Fredrik Ljunggren <fredrik@kirei.se>
Date: Sat, 28 Dec 2024 12:41:34 +0100
Subject: [PATCH] Merge query params ourselves instead of relying on httpx to
 do it, to work around new behaviour in httpx>=0.28.0

---
 pyporscheconnectapi/oauth2.py | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/pyporscheconnectapi/oauth2.py b/pyporscheconnectapi/oauth2.py
index 45fc3f8..4e1d67a 100644
--- a/pyporscheconnectapi/oauth2.py
+++ b/pyporscheconnectapi/oauth2.py
@@ -30,12 +30,14 @@
 
 _LOGGER = logging.getLogger(__name__)
 
+
 class Credentials(NamedTuple):
     """Store credentials for the Porsche Connect API."""
 
     email: str
     password: str
 
+
 class Captcha(NamedTuple):
     """Store captcha data for the Porsche Connect API."""
 
@@ -117,9 +119,7 @@ async def ensure_valid_token(self, token: OAuth2Token):
             token.update(token_data)
             token.expires_at = token_data["expires_in"]
             _LOGGER.debug("Refreshed Access Token: %s", token.access_token)
-        if (
-            token.access_token is None or token_is_expired is None
-        ):  # no token, get a new one
+        if token.access_token is None or token_is_expired is None:  # no token, get a new one
             auth_code = await self.fetch_authorization_code()
             token_data = await self.fetch_access_token(auth_code)
             token.update(token_data)
@@ -207,7 +207,10 @@ async def get_and_extract_location_params(self, url, params=None):
         if params is None:
             params = {}
         resp = await self.client.get(
-            url, params=params, timeout=TIMEOUT, headers=self.headers,
+            url,
+            params=self._merge_query_params(url, params),
+            timeout=TIMEOUT,
+            headers=self.headers,
         )
         if resp.status_code != 302:
             msg = "Could not fetch authorization code"
@@ -224,6 +227,14 @@ def _extract_params_from_url(self, url):
         """
         return parse_qs(urlparse(url).query)
 
+    def _merge_query_params(self, url: str, params: dict[str, str]) -> dict[str, str]:
+        """Merge query parameters into a new dictionary with the existing query parameters of a URL."""
+        parsed_url = urlparse(url)
+        query = parse_qs(parsed_url.query)
+        new_query = {k: v[0] for k, v in query.items()}
+        new_query.update(params)
+        return new_query
+
     async def login_with_identifier(self, state: str):
         """Log into the Identifier First flow.
 
@@ -328,7 +339,10 @@ async def fetch_access_token(self, authorization_code):
             _LOGGER.debug("Exchanging the authorization code for an access token.")
 
             resp = await self.client.post(
-                TOKEN_URL, data=data, timeout=TIMEOUT, headers=self.headers,
+                TOKEN_URL,
+                data=data,
+                timeout=TIMEOUT,
+                headers=self.headers,
             )
             resp.raise_for_status()
             return resp.json()
@@ -350,7 +364,10 @@ async def refresh_token(self, refresh_token):
             _LOGGER.debug("Using the refresh token to get a new access token.")
 
             resp = await self.client.post(
-                TOKEN_URL, data=data, timeout=TIMEOUT, headers=self.headers,
+                TOKEN_URL,
+                data=data,
+                timeout=TIMEOUT,
+                headers=self.headers,
             )
             resp.raise_for_status()
             return resp.json()