edit suggestions

Author: Ugonnaak1

msal/broker.py

@@ -7,11 +7,11 @@
 import time
 import uuid
 
+from .application import __version__
+
 
 logger = logging.getLogger(__name__)
 
-from .application import (
-    __version__)
 
 try:
     import pymsalruntime  # Its API description is available in site-packages/pymsalruntime/PyMsalRuntime.pyi
@@ -139,18 +139,19 @@ def _get_new_correlation_id():
 def _enable_msa_pt(params):
     params.set_additional_parameter("msal_request_type", "consumer_passthrough")  # PyMsalRuntime 0.8+
 
-def _pass_client_sku(params):
-    params.set_additional_parameter("msal_client_sku", "MSAL.Python")  
-    params.set_additional_parameter("msal_client_ver", __version__) 
+def _build_msal_runtime_auth_params(client_id, authority):
+    params = pymsalruntime.MSALRuntimeAuthParameters(client_id, authority)
+    params.set_additional_parameter("msal_client_sku", "MSAL.Python")
+    params.set_additional_parameter("msal_client_ver", __version__)
+    return params
 
 def _signin_silently(
         authority, client_id, scopes, correlation_id=None, claims=None,
         enable_msa_pt=False,
         auth_scheme=None,
         **kwargs):
-    params = pymsalruntime.MSALRuntimeAuthParameters(client_id, authority)
+    params = _build_msal_runtime_auth_params(client_id, authority)
     params.set_requested_scopes(scopes)
-    _pass_client_sku(params)
     if claims:
         params.set_decoded_claims(claims)
     if auth_scheme:
@@ -182,9 +183,8 @@ def _signin_interactively(
         enable_msa_pt=False,
         auth_scheme=None,
         **kwargs):
-    params = pymsalruntime.MSALRuntimeAuthParameters(client_id, authority)
+    params = _build_msal_runtime_auth_params(client_id, authority)
     params.set_requested_scopes(scopes)
-    _pass_client_sku(params)
     params.set_redirect_uri(
         _redirect_uri_on_mac if sys.platform == "darwin" else
         "https://login.microsoftonline.com/common/oauth2/nativeclient"
@@ -239,9 +239,8 @@ def _acquire_token_silently(
     account = _read_account_by_id(account_id, correlation_id)
     if account is None:
         return
-    params = pymsalruntime.MSALRuntimeAuthParameters(client_id, authority)
+    params = _build_msal_runtime_auth_params(client_id, authority)
     params.set_requested_scopes(scopes)
-    _pass_client_sku(params)
     if claims:
         params.set_decoded_claims(claims)
     if auth_scheme: