Merge pull request #102 from opengisch/feat/merge-session-environment-settings-before-send

feat: merge session's environment settings before sending request

Author: gounux

qfieldcloud_sdk/sdk.py

@@ -1937,16 +1937,26 @@ def _request(
         request = QfcRequest(**request_params)
 
         session_params = {
-            "stream": stream,
-            "verify": self.verify_ssl,
             # redirects from POST requests automagically turn into GET requests, so better forbid redirects
             "allow_redirects": allow_redirects,
         }
 
         if os.environ.get("ENVIRONMENT") == "test":
             return request.mock_response()
         else:
-            response = self.session.send(request.prepare(), **session_params)
+            prepared_request = self.session.prepare_request(request)
+
+            # Merge environment settings into session
+            settings = self.session.merge_environment_settings(
+                url=prepared_request.url,
+                proxies={},
+                stream=stream,
+                verify=self.verify_ssl,
+                cert=None,
+            )
+            settings = settings | session_params  # type: ignore
+
+            response = self.session.send(request.prepare(), **settings)
 
         try:
             response.raise_for_status()