Refactor to use new helper names

Author: rayluo

msal/token_cache.py

@@ -4,7 +4,7 @@
 import logging
 
 from .authority import canonicalize
-from .oauth2cli.oidc import base64decode, decode_id_token
+from .oauth2cli.oidc import decode_part, decode_id_token
 
 
 logger = logging.getLogger(__name__)
@@ -124,7 +124,7 @@ def add(self, event, now=None):
         client_info = {}
         home_account_id = None  # It would remain None in client_credentials flow
         if "client_info" in response:  # We asked for it, and AAD will provide it
-            client_info = json.loads(base64decode(response["client_info"]))
+            client_info = json.loads(decode_part(response["client_info"]))
             home_account_id = "{uid}.{utid}".format(**client_info)
         elif id_token_claims:  # This would be an end user on ADFS-direct scenario
             client_info["uid"] = id_token_claims.get("sub")

tests/test_assertion.py

@@ -1,15 +1,15 @@
 import json
 
-from msal.oauth2cli import JwtSigner
-from msal.oauth2cli.oidc import base64decode
+from msal.oauth2cli import JwtAssertionCreator
+from msal.oauth2cli.oidc import decode_part
 
 from tests import unittest
 
 
 class AssertionTestCase(unittest.TestCase):
     def test_extra_claims(self):
-        assertion = JwtSigner(key=None, algorithm="none").sign_assertion(
+        assertion = JwtAssertionCreator(key=None, algorithm="none").sign_assertion(
             "audience", "issuer", additional_claims={"client_ip": "1.2.3.4"})
-        payload = json.loads(base64decode(assertion.split(b'.')[1].decode('utf-8')))
+        payload = json.loads(decode_part(assertion.split(b'.')[1].decode('utf-8')))
         self.assertEqual("1.2.3.4", payload.get("client_ip"))