Refactor RedirectUriError

Author: rayluo

msal/application.py

@@ -1239,7 +1239,7 @@ def _acquire_token_silent_from_cache_and_possibly_refresh_it(
                             ))
                     return _clean_up(response)
                 except ImportError:
-                    logger.exception("Mid-tier is not available in current version of Windows")
+                    logger.warning("PyMsalRuntime is not available")
             result = _clean_up(self._acquire_token_silent_by_finding_rt_belongs_to_me_or_my_family(
                 authority, self._decorate_scope(scopes), account,
                 refresh_reason=refresh_reason, claims_challenge=claims_challenge,
@@ -1584,9 +1584,9 @@ def acquire_token_interactive(
             self._client_capabilities, claims_challenge)
         if sys.platform == "win32":
             try:
-                from .wam import _signin_interactively, NeedRedirectURI
+                from .wam import _signin_interactively, RedirectUriError
                 if extra_scopes_to_consent:  # TODO: Not supported in WAM/Mid-tier
-                    logger.warn(
+                    logger.warning(
                         "Ignoring parameter extra_scopes_to_consent, "
                         "which is not supported on current platform")
                 response = _signin_interactively(
@@ -1609,9 +1609,9 @@ def acquire_token_interactive(
                         ))
                 return _clean_up(response)
             except ImportError:
-                logger.exception("Mid-tier is not available in current version of Windows")
-            except NeedRedirectURI as e:  # Experimental: Catch, log, and fallback
-                logger.warning(e)
+                logger.warning("PyMsalRuntime is not available")
+            except RedirectUriError as e:  # Experimental: Catch, log, and fallback
+                logger.warning(str(e) + " Now we fallback to use browser.")
 
         self._validate_ssh_cert_input_data(kwargs.get("data", {}))
         telemetry_context = self._build_telemetry_context(

msal/wam.py

@@ -13,7 +13,7 @@
 logger = logging.getLogger(__name__)
 
 
-class NeedRedirectURI(ValueError):
+class RedirectUriError(ValueError):
     pass
 
 

tests/test_wam.py

@@ -2,20 +2,31 @@
 import logging
 import sys
 
+if not sys.platform.startswith("win"):
+    raise unittest.SkipTest("requires Windows")
+from msal.wam import (  # Import them after the platform check
+    _signin_interactively, _acquire_token_silently, RedirectUriError)
+
+
 logging.basicConfig(level=logging.DEBUG)
 
-@unittest.skipUnless(sys.platform.startswith("win"), "requires Windows")
 class TestWam(unittest.TestCase):
+    _authority = "https://login.microsoftonline.com/common"
+    _scopes = ["https://graph.microsoft.com/.default"]
+
     def test_interactive_then_silent(self):
-        from msal.wam import _signin_interactively, _acquire_token_silently  # Lazy import
         client_id = "26a7ee05-5602-4d76-a7ba-eae8b7b67941"  # A pre-configured test app
-        authority = "https://login.microsoftonline.com/common"
-        scopes = ["https://graph.microsoft.com/.default"]
 
-        result = _signin_interactively(authority, client_id, scopes)
+        result = _signin_interactively(self._authority, client_id, self._scopes)
         self.assertIsNotNone(result.get("access_token"), result)
 
         account_id = result["_account_id"]
-        result = _acquire_token_silently(authority, client_id, account_id, scopes)
+        result = _acquire_token_silently(self._authority, client_id, account_id, self._scopes)
         self.assertIsNotNone(result.get("access_token"), result)
 
+    def test_unconfigured_app_should_raise_exception(self):
+        client_id = "289a413d-284b-4303-9c79-94380abe5d22"  # A test app without proper redirect_uri
+        with self.assertRaises(RedirectUriError):
+            _signin_interactively(self._authority, client_id, self._scopes)
+        # Note: _acquire_token_silently() would raise same exception,
+        #       we skip its test here due to the lack of a valid account_id