Rename acquire_token_with_authorization_code(..., scope, ...) to ...by...(..., scopes, ...)

Author: rayluo

msal/application.py

@@ -146,10 +146,10 @@ def get_authorization_request_url(
             scope=decorate_scope(scopes, self.client_id),
             )
 
-    def acquire_token_with_authorization_code(
+    def acquire_token_by_authorization_code(
             self,
             code,
-            scope,  # Syntactically required. STS accepts empty value though.
+            scopes,  # Syntactically required. STS accepts empty value though.
             redirect_uri=None,
                 # REQUIRED, if the "redirect_uri" parameter was included in the
                 # authorization request as described in Section 4.1.1, and their
@@ -158,7 +158,7 @@ def acquire_token_with_authorization_code(
         """The second half of the Authorization Code Grant.
 
         :param code: The authorization code returned from Authorization Server.
-        :param scope:
+        :param scopes:
 
             If you requested user consent for multiple resources, here you will
             typically want to provide a subset of what you required in AuthCode.
@@ -178,10 +178,10 @@ def acquire_token_with_authorization_code(
         # So in theory, you can omit scope here when you were working with only
         # one scope. But, MSAL decorates your scope anyway, so they are never
         # really empty.
-        assert isinstance(scope, list), "Invalid parameter type"
-        return self.client.obtain_token_with_authorization_code(
+        assert isinstance(scopes, list), "Invalid parameter type"
+        return self.client.obtain_token_by_authorization_code(
                 code, redirect_uri=redirect_uri,
-                data={"scope": decorate_scope(scope, self.client_id)},
+                data={"scope": decorate_scope(scopes, self.client_id)},
             )
 
     def get_accounts(self):

tests/test_application.py

@@ -124,7 +124,7 @@ def test_auth_code(self):
         ac = obtain_auth_code(port, auth_uri=auth_request_uri)
         self.assertNotEqual(ac, None)
 
-        result = self.app.acquire_token_with_authorization_code(
+        result = self.app.acquire_token_by_authorization_code(
             ac, CONFIG["scope"], redirect_uri=redirect_uri)
         logging.debug("cache = %s", json.dumps(self.app.token_cache._cache, indent=4))
         self.assertIn(