[script.module.requests_oauthlib@matrix] 1.3.1+matrix.1

script.module.requests_oauthlib/addon.xml

@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.module.requests_oauthlib" name="requests_oauthlib" version="1.3.0+matrix.2" provider-name="Ib Lundgren">
-	<requires>
-		<import addon="xbmc.python" version="3.0.0"/>
-		<import addon="script.module.oauthlib" version="3.1.0+matrix.1"/>
-		<import addon="script.module.requests" version="2.22.0+matrix.1"/>
-	</requires>
-	<extension point="xbmc.python.module" library="lib" />
-	<extension point="xbmc.addon.metadata">
-		<platform>all</platform>
-		<language></language>
-		<summary lang="en_GB">This project provides first-class OAuth library support for Requests.</summary>
-		<description lang="en_GB">This project provides first-class OAuth library support for Requests.</description>
-		<disclaimer lang="en_GB">This project provides first-class OAuth library support for Requests.</disclaimer>
-		<license>ISC</license>
-		<website>https://pypi.org/project/requests-oauthlib</website>
-		<source>https://github.com/requests/requests-oauthlib</source>
-		<assets>
-			<icon>icon.png</icon>
-		</assets>
-	</extension>
+<addon id="script.module.requests_oauthlib" name="requests-oauthlib" version="1.3.1+matrix.1" provider-name="requests">
+  <requires>
+    <import addon="xbmc.python" version="3.0.0" />
+    <import addon="script.module.oauthlib" version="3.2.2" />
+    <import addon="script.module.requests" version="2.31.0" />
+  </requires>
+  <extension point="xbmc.python.module" library="lib" />
+  <extension point="xbmc.addon.metadata">
+    <summary lang="en_GB">OAuthlib authentication support for Requests</summary>
+    <description lang="en_GB">OAuthlib authentication support for Requests</description>
+    <license>ISC</license>
+    <platform>all</platform>
+    <website>https://github.com/requests/requests-oauthlib</website>
+    <source>https://github.com/requests/requests-oauthlib</source>
+    <assets>
+      <icon>resources/icon.png</icon>
+    </assets>
+  </extension>
 </addon>

script.module.requests_oauthlib/lib/requests_oauthlib/__init__.py

@@ -5,7 +5,7 @@
 from .oauth2_auth import OAuth2
 from .oauth2_session import OAuth2Session, TokenUpdated
 
-__version__ = "1.3.0"
+__version__ = "1.3.1"
 
 import requests
 

script.module.requests_oauthlib/lib/requests_oauthlib/compliance_fixes/__init__.py

@@ -2,9 +2,9 @@
 
 from .facebook import facebook_compliance_fix
 from .fitbit import fitbit_compliance_fix
-from .linkedin import linkedin_compliance_fix
 from .slack import slack_compliance_fix
 from .instagram import instagram_compliance_fix
 from .mailchimp import mailchimp_compliance_fix
 from .weibo import weibo_compliance_fix
 from .plentymarkets import plentymarkets_compliance_fix
+from .ebay import ebay_compliance_fix

script.module.requests_oauthlib/lib/requests_oauthlib/compliance_fixes/ebay.py

@@ -0,0 +1,23 @@
+import json
+from oauthlib.common import to_unicode
+
+
+def ebay_compliance_fix(session):
+    def _compliance_fix(response):
+        token = json.loads(response.text)
+
+        # eBay responds with non-compliant token types.
+        # https://developer.ebay.com/api-docs/static/oauth-client-credentials-grant.html
+        # https://developer.ebay.com/api-docs/static/oauth-auth-code-grant-request.html
+        # Modify these to be "Bearer".
+        if token.get("token_type") in ["Application Access Token", "User Access Token"]:
+            token["token_type"] = "Bearer"
+            fixed_token = json.dumps(token)
+            response._content = to_unicode(fixed_token).encode("utf-8")
+
+        return response
+
+    session.register_compliance_hook("access_token_response", _compliance_fix)
+    session.register_compliance_hook("refresh_token_response", _compliance_fix)
+
+    return session

script.module.requests_oauthlib/lib/requests_oauthlib/oauth1_session.py

@@ -268,7 +268,7 @@ def fetch_request_token(self, url, realm=None, **request_kwargs):
         :param url: The request token endpoint URL.
         :param realm: A list of realms to request access to.
         :param \*\*request_kwargs: Optional arguments passed to ''post''
-        function in ''requests.Session''
+            function in ''requests.Session''
         :returns: The response in dict format.
 
         Note that a previously set callback_uri will be reset for your

script.module.requests_oauthlib/lib/requests_oauthlib/oauth2_session.py

@@ -189,6 +189,7 @@ def fetch_token(
         proxies=None,
         include_client_id=None,
         client_secret=None,
+        cert=None,
         **kwargs
     ):
         """Generic method for fetching an access token from the token endpoint.
@@ -229,6 +230,10 @@ def fetch_token(
                               `auth` tuple. If the value is `None`, it will be
                               omitted from the request, however if the value is
                               an empty string, an empty string will be sent.
+        :param cert: Client certificate to send for OAuth 2.0 Mutual-TLS Client
+                     Authentication (draft-ietf-oauth-mtls). Can either be the
+                     path of a file containing the private key and certificate or
+                     a tuple of two filenames for certificate and key.
         :param kwargs: Extra parameters to include in the token request.
         :return: A token dict
         """
@@ -341,6 +346,7 @@ def fetch_token(
             auth=auth,
             verify=verify,
             proxies=proxies,
+            cert=cert,
             **request_kwargs
         )