Revert device code

Author: jiasli

src/azure-cli-core/azure/cli/core/auth/identity.py

@@ -172,21 +172,18 @@ def _prompt_launching_ui(ui=None, **_):
         )
         return check_result(result)
 
-    def login_with_device_code(self, scopes, claims_challenge=None):
-        flow = self._msal_app.initiate_device_flow(scopes, claims_challenge=claims_challenge)
+    def login_with_device_code(self, scopes, **kwargs):
+        flow = self._msal_app.initiate_device_flow(scopes, **kwargs)
         if "user_code" not in flow:
             raise ValueError(
                 "Fail to create device flow. Err: %s" % json.dumps(flow, indent=4))
         from azure.cli.core.style import print_styled_text, Style
         print_styled_text((Style.WARNING, flow["message"]), file=sys.stderr)
-        result = self._msal_app.acquire_token_by_device_flow(
-            flow,
-            claims_challenge=claims_challenge
-        )  # By default, it will block
+        result = self._msal_app.acquire_token_by_device_flow(flow, **kwargs)  # By default it will block
         return check_result(result)
 
-    def login_with_username_password(self, username, password, scopes):
-        result = self._msal_app.acquire_token_by_username_password(username, password, scopes)
+    def login_with_username_password(self, username, password, scopes, **kwargs):
+        result = self._msal_app.acquire_token_by_username_password(username, password, scopes, **kwargs)
         return check_result(result)
 
     def login_with_service_principal(self, client_id, credential, scopes):

src/azure-cli-core/azure/cli/core/util.py

@@ -622,6 +622,7 @@ def b64decode(s):
     encoded = base64.b64decode(s.encode("latin-1"))
     return encoded.decode('latin-1')
 
+
 def b64_to_hex(s):
     """
     Decodes a string to base64 on 2.x and 3.x

src/azure-cli/azure/cli/command_modules/profile/custom.py

@@ -151,7 +151,7 @@ def login(cmd, username=None, password=None, tenant=None, scopes=None, allow_no_
 
     if claims_challenge:
         from azure.cli.core.util import b64decode
-        claims_challenge=b64decode(claims_challenge)
+        claims_challenge = b64decode(claims_challenge)
 
     interactive = False