Skip to content

{Core} Revert #28085 #28483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jiashuo Li (jiasli) merged 1 commit into from
Feb 29, 2024
Merged

{Core} Revert #28085 #28483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/azure-cli-core/HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Release History

2.58.0
++++++
* [BREAKING CHANGE] `az login`: Use WAM as the default authentication method on Windows. If you encounter any issue and want to opt out, run `az config set core.enable_broker_on_windows=false`, `az account clear` and `az login` (#28085)
* [BREAKING CHANGE] `az login`: Replace `allow_broker` with `enable_broker_on_windows` (#27726)

@jiasli Jiashuo Li (jiasli) Feb 29, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As WAM is not enabled by default now, we should announce allow_broker's renaming.

It turns out splitting #27726 and #28085 is a correct decision, as it makes reverting #28085 easier.


2.57.0
++++++
Expand Down
4 changes: 2 additions & 2 deletions src/azure-cli-core/azure/cli/core/_profile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,8 +856,8 @@ def _create_identity_instance(cli_ctx, *args, **kwargs):
# EXPERIMENTAL: Use core.use_msal_http_cache=False to turn off MSAL HTTP cache.
use_msal_http_cache = cli_ctx.config.getboolean('core', 'use_msal_http_cache', fallback=True)

# On Windows, use core.enable_broker_on_windows=false to disable broker (WAM) for authentication.
enable_broker_on_windows = cli_ctx.config.getboolean('core', 'enable_broker_on_windows', fallback=True)
# PREVIEW: On Windows, use core.enable_broker_on_windows=true to use broker (WAM) for authentication.
enable_broker_on_windows = cli_ctx.config.getboolean('core', 'enable_broker_on_windows', fallback=False)
from .telemetry import set_broker_info
set_broker_info(enable_broker_on_windows)

Expand Down
8 changes: 8 additions & 0 deletions src/azure-cli-core/azure/cli/core/auth/landing_pages/success.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,13 @@
<body>
<h3>You have logged into Microsoft Azure!</h3>
<p>You can close this window, or we will redirect you to the <a href="https://docs.microsoft.com/cli/azure/">Azure CLI documentation</a> in 1 minute.</p>
<h3>Announcements</h3>
<p>[Windows only] Azure CLI is collecting feedback on using the <a href="https://learn.microsoft.com/windows/uwp/security/web-account-manager">Web Account Manager</a> (WAM) broker for the login experience.</p>
<p>You may opt-in to use WAM by running the following commands:</p>
<code>
az config set core.enable_broker_on_windows=true<br>
az account clear<br>
az login
</code>
</body>
</html>
2 changes: 1 addition & 1 deletion src/azure-cli-core/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
'jmespath',
'knack~=0.11.0',
'msal-extensions~=1.0.0',
'msal[broker]==1.27.0',
'msal[broker]==1.26.0',

@jiasli Jiashuo Li (jiasli) Feb 29, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MSAL 1.27.0 raised the upper bound of pymsalruntime (AzureAD/microsoft-authentication-library-for-python@59c3000), but the latest pymsalruntime 0.14.1 fails with:

Called AcquireTokenInteractively but no redirect URI was provided. Status: Response_Status.Status_ApiContractViolation, Error code: 0, Tag: 590899094

'msrestazure~=0.6.4',
'packaging>=20.9',
'paramiko>=2.0.8,<4.0.0',
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/requirements.py3.Darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jsondiff==2.0.0
knack==0.11.0
MarkupSafe==2.0.1
msal-extensions==1.0.0
msal[broker]==1.27.0
msal[broker]==1.26.0
msrest==0.7.1
msrestazure==0.6.4
oauthlib==3.2.2
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/requirements.py3.Linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jsondiff==2.0.0
knack==0.11.0
MarkupSafe==2.0.1
msal-extensions==1.0.0
msal[broker]==1.27.0
msal[broker]==1.26.0
msrest==0.7.1
msrestazure==0.6.4
oauthlib==3.2.2
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/requirements.py3.windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jsondiff==2.0.0
knack==0.11.0
MarkupSafe==2.0.1
msal-extensions==1.0.0
msal[broker]==1.27.0
msal[broker]==1.26.0
msrest==0.7.1
msrestazure==0.6.4
oauthlib==3.2.2
Expand Down