Specify correct Content-Type header for 1.x servers.

Author: paul121

CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- Specify correct Content-Type header for 1.x servers.
 
 ## [1.0.0-beta.2] -- 2021-07-20
 ### Changed

farmOS/__init__.py

@@ -100,6 +100,11 @@ def __init__(
             # Unset the 'expires_at' key.
             token.pop("expires_at")
 
+        # Determine the Content-Type header depending on server version.
+        content_type = (
+            "application/vnd.api+json" if version == 2 else "application/json"
+        )
+
         # Create an OAuth Session
         self.session = OAuthSession(
             hostname=hostname,
@@ -108,6 +113,7 @@ def __init__(
             scope=scope,
             token=token,
             token_url=token_url,
+            content_type=content_type,
             token_updater=self.token_updater,
         )
 

farmOS/session.py

@@ -19,6 +19,7 @@ def __init__(
         token=None,
         token_url=None,
         authorization_url=None,
+        content_type="application/vnd.api+json",
         token_updater=None,
         *args,
         **kwargs,
@@ -44,6 +45,7 @@ def __init__(
         # Save values for later use.
         self._token_url = token_url
         self._authorization_base_url = authorization_url
+        self._content_type = content_type
         self._client_id = client_id
         self._client_secret = client_secret
         self.hostname = hostname
@@ -128,14 +130,14 @@ def _http_request(self, url, method="GET", options=None, params=None, headers=No
         data = None
         if options and "data" in options:
             data = options["data"]
-            headers["Content-Type"] = "application/vnd.api+json"
+            headers["Content-Type"] = self._content_type
 
         # If there is a json data to be sent, include it.
         json = None
         if options and "json" in options:
             json = options["json"]
             if "Content-Type" not in headers:
-                headers["Content-Type"] = "application/vnd.api+json"
+                headers["Content-Type"] = self._content_type
 
         # Perform the request.
         response = self.request(