Merge branch 'dev' into dharshanb/brokerSupportLinux

Author: DharshanBJ

msal/application.py

@@ -210,6 +210,11 @@ def _msal_extension_check():
         pass  # The optional msal_extensions is not installed. Business as usual.
     except ValueError:
         logger.exception(f"msal_extensions version {v} not in major.minor.patch format")
+    except:
+        logger.exception(
+            "Unable to import msal_extensions during an optional check. "
+            "This exception can be safely ignored."
+            )
 
 
 class ClientApplication(object):
@@ -331,7 +336,7 @@ def __init__(
                         "client_assertion": "...a JWT with claims aud, exp, iss, jti, nbf, and sub..."
                     }
 
-            .. admonition:: Supporting reading client cerficates from PFX files
+            .. admonition:: Supporting reading client certificates from PFX files
 
                 *Added in version 1.29.0*:
                 Feed in a dictionary containing the path to a PFX file::

msal/sku.py

@@ -2,5 +2,5 @@
 """
 
 # The __init__.py will import this. Not the other way around.
-__version__ = "1.31.1" # When releasing, also check and bump our dependencies's versions if needed
+__version__ = "1.32.0"
 SKU = "MSAL.Python"

tests/test_e2e.py

@@ -936,10 +936,10 @@ def test_adfs2019_onprem_acquire_token_interactive(self):
         "Need LAB_OBO_CLIENT_SECRET from https://aka.ms/GetLabSecret?Secret=TodoListServiceV2-OBO")
     @unittest.skipUnless(
         os.getenv("LAB_OBO_CONFIDENTIAL_CLIENT_ID"),
-        "Need LAB_OBO_CONFIDENTIAL_CLIENT_ID from https://docs.msidlab.com/flows/onbehalfofflow.html")
+        "Need LAB_OBO_CONFIDENTIAL_CLIENT_ID from https://identitydivision.visualstudio.com/Engineering/_git/IDLABS?path=/src/DocFX/LabDocs/flows/onbehalfofflow.md&_a=preview")
     @unittest.skipUnless(
         os.getenv("LAB_OBO_PUBLIC_CLIENT_ID"),
-        "Need LAB_OBO_PUBLIC_CLIENT_ID from https://docs.msidlab.com/flows/onbehalfofflow.html")
+        "Need LAB_OBO_PUBLIC_CLIENT_ID from https://identitydivision.visualstudio.com/Engineering/_git/IDLABS?path=/src/DocFX/LabDocs/flows/onbehalfofflow.md&_a=preview")
     def test_acquire_token_obo(self):
         config = self.get_lab_user(usertype="cloud")
 
@@ -1000,7 +1000,7 @@ def test_acquire_token_by_client_secret(self):
         "Need LAB_OBO_CLIENT_SECRET from https://aka.ms/GetLabSecret?Secret=TodoListServiceV2-OBO")
     @unittest.skipUnless(
         os.getenv("LAB_OBO_CONFIDENTIAL_CLIENT_ID"),
-        "Need LAB_OBO_CONFIDENTIAL_CLIENT_ID from https://docs.msidlab.com/flows/onbehalfofflow.html")
+        "Need LAB_OBO_CONFIDENTIAL_CLIENT_ID from https://identitydivision.visualstudio.com/Engineering/_git/IDLABS?path=/src/DocFX/LabDocs/flows/onbehalfofflow.md&_a=preview")
     def test_confidential_client_acquire_token_by_username_password(self):
         # This approach won't work:
         #       config = self.get_lab_user(usertype="cloud", publicClient="no")
@@ -1217,10 +1217,10 @@ def test_acquire_token_for_client_should_use_an_env_var_with_long_region_name(se
         "Need LAB_OBO_CLIENT_SECRET from https://aka.ms/GetLabSecret?Secret=TodoListServiceV2-OBO")
     @unittest.skipUnless(
         os.getenv("LAB_OBO_CONFIDENTIAL_CLIENT_ID"),
-        "Need LAB_OBO_CONFIDENTIAL_CLIENT_ID from https://docs.msidlab.com/flows/onbehalfofflow.html")
+        "Need LAB_OBO_CONFIDENTIAL_CLIENT_ID from https://identitydivision.visualstudio.com/Engineering/_git/IDLABS?path=/src/DocFX/LabDocs/flows/onbehalfofflow.md&_a=preview")
     @unittest.skipUnless(
         os.getenv("LAB_OBO_PUBLIC_CLIENT_ID"),
-        "Need LAB_OBO_PUBLIC_CLIENT_ID from https://docs.msidlab.com/flows/onbehalfofflow.html")
+        "Need LAB_OBO_PUBLIC_CLIENT_ID from https://identitydivision.visualstudio.com/Engineering/_git/IDLABS?path=/src/DocFX/LabDocs/flows/onbehalfofflow.md&_a=preview")
     def test_cca_obo_should_bypass_regional_endpoint_therefore_still_work(self):
         """We test OBO because it is implemented in sub class ConfidentialClientApplication"""
         config = self.get_lab_user(usertype="cloud")
@@ -1248,7 +1248,7 @@ def test_cca_obo_should_bypass_regional_endpoint_therefore_still_work(self):
         "Need LAB_OBO_CLIENT_SECRET from https://aka.ms/GetLabSecret?Secret=TodoListServiceV2-OBO")
     @unittest.skipUnless(
         os.getenv("LAB_OBO_CONFIDENTIAL_CLIENT_ID"),
-        "Need LAB_OBO_CONFIDENTIAL_CLIENT_ID from https://docs.msidlab.com/flows/onbehalfofflow.html")
+        "Need LAB_OBO_CONFIDENTIAL_CLIENT_ID from https://identitydivision.visualstudio.com/Engineering/_git/IDLABS?path=/src/DocFX/LabDocs/flows/onbehalfofflow.md&_a=preview")
     def test_cca_ropc_should_bypass_regional_endpoint_therefore_still_work(self):
         """We test ROPC because it is implemented in base class ClientApplication"""
         config = self.get_lab_user(usertype="cloud")