diff --git a/src/azure-cli-core/HISTORY.rst b/src/azure-cli-core/HISTORY.rst index 23456e2c029..e80c2e78a92 100644 --- a/src/azure-cli-core/HISTORY.rst +++ b/src/azure-cli-core/HISTORY.rst @@ -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) 2.57.0 ++++++ diff --git a/src/azure-cli-core/azure/cli/core/_profile.py b/src/azure-cli-core/azure/cli/core/_profile.py index 81870ab904b..0e4c0a09550 100644 --- a/src/azure-cli-core/azure/cli/core/_profile.py +++ b/src/azure-cli-core/azure/cli/core/_profile.py @@ -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) diff --git a/src/azure-cli-core/azure/cli/core/auth/landing_pages/success.html b/src/azure-cli-core/azure/cli/core/auth/landing_pages/success.html index d24f2fea071..309a93bf4e3 100644 --- a/src/azure-cli-core/azure/cli/core/auth/landing_pages/success.html +++ b/src/azure-cli-core/azure/cli/core/auth/landing_pages/success.html @@ -21,5 +21,13 @@

You have logged into Microsoft Azure!

You can close this window, or we will redirect you to the Azure CLI documentation in 1 minute.

+

Announcements

+

[Windows only] Azure CLI is collecting feedback on using the Web Account Manager (WAM) broker for the login experience.

+

You may opt-in to use WAM by running the following commands:

+ + az config set core.enable_broker_on_windows=true
+ az account clear
+ az login + diff --git a/src/azure-cli-core/setup.py b/src/azure-cli-core/setup.py index eb6be988b4c..8897a8db94b 100644 --- a/src/azure-cli-core/setup.py +++ b/src/azure-cli-core/setup.py @@ -53,7 +53,7 @@ 'jmespath', 'knack~=0.11.0', 'msal-extensions~=1.0.0', - 'msal[broker]==1.27.0', + 'msal[broker]==1.26.0', 'msrestazure~=0.6.4', 'packaging>=20.9', 'paramiko>=2.0.8,<4.0.0', diff --git a/src/azure-cli/requirements.py3.Darwin.txt b/src/azure-cli/requirements.py3.Darwin.txt index e2da2d63de8..3b3549169cf 100644 --- a/src/azure-cli/requirements.py3.Darwin.txt +++ b/src/azure-cli/requirements.py3.Darwin.txt @@ -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 diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt index 1148593cc5a..9e5a2a0269b 100644 --- a/src/azure-cli/requirements.py3.Linux.txt +++ b/src/azure-cli/requirements.py3.Linux.txt @@ -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 diff --git a/src/azure-cli/requirements.py3.windows.txt b/src/azure-cli/requirements.py3.windows.txt index f0c7dfe620c..2444a2739fe 100644 --- a/src/azure-cli/requirements.py3.windows.txt +++ b/src/azure-cli/requirements.py3.windows.txt @@ -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