Merges remote-tracking branch and fixes #516

Author: rayluo

msal/__init__.py

@@ -34,3 +34,8 @@
 from .oauth2cli.oidc import Prompt, IdTokenError
 from .token_cache import TokenCache, SerializableTokenCache
 from .auth_scheme import PopAuthScheme
+
+# Putting module-level exceptions into the package namespace, to make them
+# 1. officially part of the MSAL public API, and
+# 2. can still be caught by the user code even if we change the module structure.
+from .oauth2cli.oauth2 import BrowserInteractionTimeoutError

msal/oauth2cli/oauth2.py

@@ -28,6 +28,9 @@
 string_types = (str,) if sys.version_info[0] >= 3 else (basestring, )
 
 
+class BrowserInteractionTimeoutError(RuntimeError):
+    pass
+
 class BaseClient(object):
     # This low-level interface works. Yet you'll find its sub-class
     # more friendly to remind you what parameters are needed in each scenario.
@@ -674,6 +677,8 @@ def _obtain_token_by_browser(
             auth_uri_callback=auth_uri_callback,
             browser_name=browser_name,
             )
+        if auth_response is None:
+            raise BrowserInteractionTimeoutError("User did not complete the flow in time")
         return self.obtain_token_by_auth_code_flow(
             flow, auth_response, scope=scope, **kwargs)