Merge branch 'sku' into dev

Author: rayluo

msal/__init__.py

@@ -25,7 +25,11 @@
 #
 #------------------------------------------------------------------------------
 
-# pylint: disable=wrong-import-position
-
-__version__ = '0.1.0'
+from .application import (
+    __version__,
+    ClientApplication,
+    ConfidentialClientApplication,
+    PublicClientApplication,
+    )
+from .token_cache import TokenCache
 

msal/application.py

@@ -5,6 +5,7 @@
     from urllib.parse import urljoin
 import logging
 from base64 import b64encode
+import sys
 
 from oauth2cli import Client
 from .authority import Authority
@@ -15,6 +16,9 @@
 from .token_cache import TokenCache
 
 
+# The __init__.py will import this. Not the other way around.
+__version__ = "0.1.0"
+
 logger = logging.getLogger(__name__)
 
 def decorate_scope(
@@ -90,6 +94,11 @@ def _build_client(self, client_credential, authority):
         return Client(
             server_configuration,
             self.client_id,
+            default_headers={
+                "x-client-sku": "MSAL.Python", "x-client-ver": __version__,
+                "x-client-os": sys.platform,
+                "x-client-cpu": "x64" if sys.maxsize > 2 ** 32 else "x86",
+                },
             default_body=default_body,
             client_assertion=client_assertion,
             on_obtaining_tokens=self.token_cache.add,