Skip to content

Commit ad0bacc

Browse files
authored
[Profile] az login: Support --claims-challenge in device code flow (#31856)
1 parent fd1355c commit ad0bacc

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ def login(self,
172172
use_device_code = True
173173

174174
if use_device_code:
175-
user_identity = identity.login_with_device_code(scopes=scopes)
175+
user_identity = identity.login_with_device_code(scopes=scopes, claims_challenge=claims_challenge)
176176
else:
177177
user_identity = identity.login_with_auth_code(scopes=scopes, claims_challenge=claims_challenge)
178178
else:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,14 +171,14 @@ def _prompt_launching_ui(ui=None, **_):
171171
claims_challenge=claims_challenge)
172172
return check_result(result)
173173

174-
def login_with_device_code(self, scopes):
175-
flow = self._msal_app.initiate_device_flow(scopes)
174+
def login_with_device_code(self, scopes, claims_challenge=None):
175+
flow = self._msal_app.initiate_device_flow(scopes, claims_challenge=claims_challenge)
176176
if "user_code" not in flow:
177177
raise ValueError(
178178
"Fail to create device flow. Err: %s" % json.dumps(flow, indent=4))
179179
from azure.cli.core.style import print_styled_text, Style
180180
print_styled_text((Style.WARNING, flow["message"]), file=sys.stderr)
181-
result = self._msal_app.acquire_token_by_device_flow(flow) # By default it will block
181+
result = self._msal_app.acquire_token_by_device_flow(flow, claims_challenge=claims_challenge)
182182
return check_result(result)
183183

184184
def login_with_username_password(self, username, password, scopes):

src/azure-cli-core/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
'knack~=0.11.0',
5656
'microsoft-security-utilities-secret-masker~=1.0.0b4',
5757
'msal-extensions==1.2.0',
58-
'msal[broker]==1.33.0b1; sys_platform == "win32"',
59-
'msal==1.33.0b1; sys_platform != "win32"',
58+
'msal[broker]==1.34.0b1; sys_platform == "win32"',
59+
'msal==1.34.0b1; sys_platform != "win32"',
6060
'packaging>=20.9',
6161
'pkginfo>=1.5.0.1',
6262
# psutil can't install on cygwin: https://github.com/Azure/azure-cli/issues/9399

src/azure-cli/requirements.py3.Darwin.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jmespath==0.9.5
106106
jsondiff==2.0.0
107107
knack==0.11.0
108108
msal-extensions==1.2.0
109-
msal==1.33.0b1
109+
msal==1.34.0b1
110110
msrest==0.7.1
111111
oauthlib==3.2.2
112112
packaging==24.2

src/azure-cli/requirements.py3.Linux.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jmespath==0.9.5
107107
jsondiff==2.0.0
108108
knack==0.11.0
109109
msal-extensions==1.2.0
110-
msal==1.33.0b1
110+
msal==1.34.0b1
111111
msrest==0.7.1
112112
oauthlib==3.2.2
113113
packaging==24.2

src/azure-cli/requirements.py3.windows.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jmespath==0.9.5
106106
jsondiff==2.0.0
107107
knack==0.11.0
108108
msal-extensions==1.2.0
109-
msal[broker]==1.33.0b1
109+
msal[broker]==1.34.0b1
110110
msrest==0.7.1
111111
oauthlib==3.2.2
112112
packaging==24.2

0 commit comments

Comments
 (0)