Add profileId and testmode to Client (#5)

Author: andrefpoliveira

README.md

@@ -29,6 +29,7 @@ This documentation is for the new Mollie's SDK. You can find more details on how
   * [Authentication](#authentication)
   * [Idempotency Key](#idempotency-key)
   * [Add Custom User-Agent Header](#add-custom-user-agent-header)
+  * [Add Profile ID and Testmode to Client](#add-profile-id-and-testmode-to-client)
   * [Available Resources and Operations](#available-resources-and-operations)
   * [Retries](#retries)
   * [Error Handling](#error-handling)
@@ -261,6 +262,25 @@ client = ClientSDK(
 
 <!-- End Add Custom User-Agent Header -->
 
+<!-- Start Add Profile ID and Testmode to Client -->
+
+## Add Profile ID and Testmode to Client
+The SDK allows you to define the `profileId` and `testmode` in the client. This way, you don't need to add this
+information to the payload every time when using OAuth. This will not override the details provided in the individual
+requests.
+
+```py
+client = ClientSDK(
+    security = Security(
+        o_auth = os.getenv("CLIENT_OAUTH_KEY", "test_..."),
+    ),
+    testmode = False,
+    profileId = "pfl_..."
+)
+```
+
+<!-- End Add Profile ID and Testmode to Client -->
+
 <!-- Start Available Resources and Operations [operations] -->
 ## Available Resources and Operations
 

src/mollie/_hooks/mollie_hooks.py

@@ -1,8 +1,10 @@
 import uuid
 import sys
+import json
 
 from httpx import Request
 from typing import Union
+from urllib.parse import parse_qs, urlencode, urlparse, urlunparse
 
 from .types import (
     BeforeRequestHook,
@@ -37,14 +39,36 @@ def before_request(self, hook_ctx: BeforeRequestContext, request: Request) -> Un
         # Customize the User Agent header
         headers = self._customize_user_agent(headers, hook_ctx)
 
-        return Request(
-            method = request.method,
-            url = request.url,
-            headers = headers,
-            content = request.content,
+        # Update request with new headers first
+        request = Request(
+            method=request.method,
+            url=request.url,
+            headers=headers,
+            content=request.content,
             extensions=request.extensions
         )
-    
+
+        # Then populate profile ID and testmode if OAuth (this may update headers again)
+        if self._is_oauth_request(headers, hook_ctx):
+            request = self._populate_profile_id_and_testmode(request, hook_ctx)
+
+        return request
+
+    def _is_oauth_request(self, headers: dict, hook_ctx: BeforeRequestContext) -> bool:
+        security = hook_ctx.config.security
+
+        if callable(security):
+            security = security()
+
+        if security is None:
+            return False
+
+        o_auth = getattr(security, 'o_auth', None)
+        if o_auth is None:
+            return False
+
+        return headers.get("authorization", None) == f"Bearer {o_auth}"
+
     def _handle_idempotency_key(self, headers: dict) -> dict:
         idempotency_key = "idempotency-key"
         if idempotency_key not in headers or not headers[idempotency_key]:
@@ -66,3 +90,76 @@ def _customize_user_agent(self, headers: dict, hook_ctx: BeforeRequestContext) -
         headers[user_agent_key] = new_user_agent
 
         return headers
+    
+    def _populate_profile_id_and_testmode(self, request: Request, hook_ctx: BeforeRequestContext) -> Request:        
+        client_profile_id = hook_ctx.config.globals.profile_id
+        client_testmode = hook_ctx.config.globals.testmode
+
+        # Get the HTTP method
+        method = request.method
+        
+        if method == "GET":
+            # Update the query parameters. If testmode or profileId are not present, add them.
+            parsed_url = urlparse(str(request.url))
+            query_params = parse_qs(parsed_url.query, keep_blank_values=True)
+            
+            # Add profileId if not already present
+            if client_profile_id is not None and 'profileId' not in query_params:
+                query_params['profileId'] = [client_profile_id]
+            
+            # Add testmode if not already present
+            if client_testmode is not None and 'testmode' not in query_params:
+                query_params['testmode'] = [str(client_testmode).lower()]
+            
+            # Rebuild the URL with updated query parameters
+            new_query = urlencode(query_params, doseq=True)
+            new_url = urlunparse((
+                parsed_url.scheme,
+                parsed_url.netloc,
+                parsed_url.path,
+                parsed_url.params,
+                new_query,
+                parsed_url.fragment
+            ))
+            
+            return Request(
+                method=request.method,
+                url=new_url,
+                headers=request.headers,
+                content=request.content,
+                extensions=request.extensions
+            )
+
+        # It's POST, DELETE, PATCH
+        # Update the JSON body. If testmode or profileId are not present, add them.
+        if request.content:
+            try:
+                body = json.loads(request.content)
+            except (json.JSONDecodeError, TypeError):
+                # If it's not JSON, return the request unchanged
+                return request
+        else:
+            body = {}
+        
+        # Add profileId if not already present
+        if client_profile_id is not None and 'profileId' not in body:
+            body['profileId'] = client_profile_id
+        
+        # Add testmode if not already present
+        if client_testmode is not None and 'testmode' not in body:
+            body['testmode'] = client_testmode
+        
+        # Create a new request with updated body
+        new_content = json.dumps(body).encode('utf-8')
+        
+        # Update headers with correct Content-Length
+        new_headers = dict(request.headers)
+        new_headers['content-length'] = str(len(new_content))
+        
+        return Request(
+            method=request.method,
+            url=request.url,
+            headers=new_headers,
+            content=new_content,
+            extensions=request.extensions
+        )