Demote Device Flow into subclass PublicClientApplication, for now

Author: rayluo

msal/application.py

@@ -276,6 +276,15 @@ def acquire_token_silent(
             logger.debug(
                 "Refresh failed. {error}: {error_description}".format(**response))
 
+
+class PublicClientApplication(ClientApplication):  # browser app or mobile app
+
+    def __init__(self, client_id, client_credential=None, **kwargs):
+        if client_credential is not None:
+            raise ValueError("Public Client should not possess credentials")
+        super(PublicClientApplication, self).__init__(
+            client_id, client_credential=None, **kwargs)
+
     def initiate_device_flow(self, scopes=None, **kwargs):
         return self.client.initiate_device_flow(
             scope=decorate_scope(scopes or [], self.client_id),
@@ -297,8 +306,6 @@ def acquire_token_by_device_flow(self, flow, **kwargs):
                     # service seemingly need both device_code and code parameter.
                 **kwargs)
 
-class PublicClientApplication(ClientApplication):  # browser app or mobile app
-
     def acquire_token_by_username_password(
             self, username, password, scopes=None, **kwargs):
         """Gets a token for a given resource via user credentails."""

tests/test_application.py

@@ -105,6 +105,24 @@ def test_username_password(self):
         self.assertLoosely(result)
         self.assertCacheWorks(result)
 
+    def test_device_flow(self):
+        self.app = PublicClientApplication(
+            CONFIG["client_id"], authority=CONFIG["authority"])
+        flow = self.app.initiate_device_flow(scopes=CONFIG.get("scope"))
+        logging.warn(flow["message"])
+
+        duration = 30
+        logging.warn("We will wait up to %d seconds for you to sign in" % duration)
+        flow["expires_at"] = time.time() + duration  # Shorten the time for quick test
+        result = self.app.acquire_token_by_device_flow(flow)
+        self.assertLoosely(
+                result,
+                assertion=lambda: self.assertIn('access_token', result),
+                skippable_errors=self.app.client.DEVICE_FLOW_RETRIABLE_ERRORS)
+
+        if "access_token" in result:
+            self.assertCacheWorks(result)
+
 
 @unittest.skipUnless("client_id" in CONFIG, "client_id missing")
 class TestClientApplication(Oauth2TestCase):
@@ -136,19 +154,3 @@ def test_auth_code(self):
                 error_description=result.get("error_description")))
         self.assertCacheWorks(result)
 
-    def test_device_flow(self):
-        flow = self.app.initiate_device_flow(scopes=CONFIG.get("scope"))
-        logging.warn(flow["message"])
-
-        duration = 30
-        logging.warn("We will wait up to %d seconds for you to sign in" % duration)
-        flow["expires_at"] = time.time() + duration  # Shorten the time for quick test
-        result = self.app.acquire_token_by_device_flow(flow)
-        self.assertLoosely(
-                result,
-                assertion=lambda: self.assertIn('access_token', result),
-                skippable_errors=self.app.client.DEVICE_FLOW_RETRIABLE_ERRORS)
-
-        if "access_token" in result:
-            self.assertCacheWorks(result)
-