Merge 8c3cfe7 into 567ea52

box · Oct 5, 2018 · 7d1a622 · 7d1a622
2 parents 567ea52 + 8c3cfe7
commit 7d1a622
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 2 deletions.
diff --git a/boxsdk/config.py b/boxsdk/config.py
@@ -2,6 +2,8 @@
 
 from __future__ import unicode_literals, absolute_import
 
+from sys import version_info as py_version
+
 from . import version
 
 
@@ -17,3 +19,9 @@ class Client(object):
     """Configuration object containing the user agent string."""
     VERSION = version.__version__
     USER_AGENT_STRING = 'box-python-sdk-{0}'.format(VERSION)
+    BOX_UA_STRING = 'agent=box-python-sdk/{0}; env=python/{1}.{2}.{3}'.format(
+        VERSION,
+        py_version.major,
+        py_version.minor,
+        py_version.micro,
+    )
diff --git a/boxsdk/session/session.py b/boxsdk/session/session.py
@@ -64,7 +64,10 @@ def __init__(
         self._client_config = client_config or Client()
         super(Session, self).__init__()
         self._network_layer = network_layer or DefaultNetwork()
-        self._default_headers = {'User-Agent': self._client_config.USER_AGENT_STRING}
+        self._default_headers = {
+            'User-Agent': self._client_config.USER_AGENT_STRING,
+            'X-Box-UA': self._client_config.BOX_UA_STRING,
+        }
         self._translator = translator
         self._default_network_request_kwargs = {}
         if default_headers:

diff --git a/test/integration/test_as_user.py b/test/integration/test_as_user.py
@@ -14,6 +14,7 @@ def as_user_headers(mock_user_id, access_token):
         'Authorization': 'Bearer {0}'.format(access_token),
         'As-User': mock_user_id,
         'User-Agent': Client.USER_AGENT_STRING,
+        'X-Box-UA': Client.BOX_UA_STRING,
     }
 
 

diff --git a/test/integration/test_retry_and_refresh.py b/test/integration/test_retry_and_refresh.py
@@ -29,7 +29,7 @@ def test_automatic_refresh(
             'POST',
             '{0}/token'.format(API.OAUTH2_API_URL),
             data=ANY,
-            headers={'content-type': 'application/x-www-form-urlencoded', 'User-Agent': ANY},
+            headers={'content-type': 'application/x-www-form-urlencoded', 'User-Agent': ANY, 'X-Box-UA': ANY},
         ),
         call(
             'GET',

diff --git a/test/integration/test_with_shared_link.py b/test/integration/test_with_shared_link.py
@@ -26,6 +26,7 @@ def box_api_headers(shared_link, shared_link_password, access_token):
         'Authorization': 'Bearer {0}'.format(access_token),
         'BoxApi': box_api_header,
         'User-Agent': Client.USER_AGENT_STRING,
+        'X-Box-UA': Client.BOX_UA_STRING,
     }