Keep listing all subscriptions if needs to select from list (#24930)

* Keep listing all subscriptions if needs to select from list

* populate all contexts

Author: BethanyZhou

src/Accounts/Accounts/Models/RMProfileClient.cs

@@ -269,9 +269,6 @@ public AzureRmProfile Login(
                                 subscriptions, _queriedTenants, tenantIdOrName, tenantName, lastUsedSubscription,
                                 Prompt, WriteInformationMessage,
                                 ref defaultSubscription, ref defaultTenant);
-                            var defaultContext = new AzureContext(defaultSubscription, account, environment, defaultTenant);
-                            _profile.TrySetDefaultContext(defaultContext);
-                            _profile.TryRemoveContext("Default");
                         }
                     }
                 }
@@ -325,12 +322,12 @@ public AzureRmProfile Login(
                         }
 
                         if (token != null &&
-                            defaultTenant == null &&
+                            (defaultTenant == null || selectSubscriptionFromList) &&
                             TryGetTenantSubscription(token, account, environment, subscriptionId, subscriptionName, false, out tempSubscription, out tempTenant, out tempSubscriptions, isInteractiveAuthenticationFlow))
                         {
                             // If no subscription found for the given token/tenant，discard tempTenant value.
                             // Continue to look for matched subscripitons until one subscription retrived by its home tenant is found.
-                            if (tempSubscription != null)
+                            if (defaultTenant == null && tempSubscription != null)
                             {
                                 defaultSubscription = tempSubscription;
                                 if (tempSubscription.GetTenant() == tempSubscription.GetHomeTenant())
@@ -355,14 +352,12 @@ public AzureRmProfile Login(
                             subscriptions, _queriedTenants, tenantIdOrName, tenantName, lastUsedSubscription,
                             Prompt, WriteInformationMessage,
                             ref defaultSubscription, ref defaultTenant);
-                        var defaultContext = new AzureContext(defaultSubscription, account, environment, defaultTenant);
-                        _profile.TrySetDefaultContext(defaultContext);
-                        _profile.TryRemoveContext("Default");
                     }
                 }
             }
 
             shouldPopulateContextList &= _profile.DefaultContext?.Account == null;
+
             if (defaultSubscription == null)
             {
                 if (subscriptionId != null)
@@ -383,7 +378,7 @@ public AzureRmProfile Login(
             }
             else
             {
-                defaultTenant = InteractiveSubscriptionSelectionHelper.GetDetailedTenantFromQueryHistory(_queriedTenants, defaultTenant?.Id) ?? defaultTenant; ;
+                defaultTenant = InteractiveSubscriptionSelectionHelper.GetDetailedTenantFromQueryHistory(_queriedTenants, defaultTenant?.Id) ?? defaultTenant;
                 var defaultContext = new AzureContext(defaultSubscription, account, environment, defaultTenant);
                 if (!_profile.TrySetDefaultContext(name, defaultContext))
                 {

src/Accounts/Accounts/Utilities/InteractiveSubscriptionSelectionHelper.cs

@@ -33,7 +33,7 @@ internal static void SelectSubscriptionFromList(IEnumerable<IAzureSubscription>
             Func<string, string> prompt, Action<string> outputAction,
             ref IAzureSubscription defaultSubscription, ref IAzureTenant defaultTenant)
         {
-            subscriptions = subscriptions?.OrderBy(s => GetDetailedTenantFromQueryHistory(queriedTenants, s.GetProperty(AzureSubscription.Property.Tenants)))?.ThenBy(s => s.Name)?.ToList();
+            subscriptions = subscriptions?.OrderBy(s => GetDetailedTenantFromQueryHistory(queriedTenants, s.GetProperty(AzureSubscription.Property.Tenants))?.GetProperty(AzureTenant.Property.DisplayName))?.ThenBy(s => s.Name)?.ToList();
 
             var markDefaultSubscription = lastUsedSubscription != null;