Merge pull request #334 from Azure/dev

.

Author: huangpf

src/ResourceManager/Profile/Commands.Profile.Test/AzureRMProfileTests.cs

@@ -116,6 +116,40 @@ public void TokenIdAndAccountIdMismatch()
             Assert.Equal(1, tenantsInAccount.Length);
             Assert.Equal(tenants.First(), tenantsInAccount[0]);
         }
+        
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void AdalExceptionsArePropagatedToCaller()
+        {
+            var tenants = new List<string> { Guid.NewGuid().ToString(), DefaultTenant.ToString() };
+            var secondsubscriptionInTheFirstTenant = Guid.NewGuid().ToString();
+            var firstList = new List<string> { DefaultSubscription.ToString(), secondsubscriptionInTheFirstTenant };
+            var secondList = new List<string> { Guid.NewGuid().ToString() };
+            var thirdList = new List<string> { DefaultSubscription.ToString(), secondsubscriptionInTheFirstTenant };
+            var fourthList = new List<string> { DefaultSubscription.ToString(), secondsubscriptionInTheFirstTenant };
+            var client = SetupTestEnvironment(tenants, firstList, secondList, thirdList, fourthList);
+
+            var tokens = new Queue<MockAccessToken>();
+            tokens.Enqueue(new MockAccessToken
+            {
+                UserId = "[email protected]",
+                LoginType = LoginType.OrgId,
+                AccessToken = "bbb"
+            });
+
+            ((MockTokenAuthenticationFactory)AzureSession.AuthenticationFactory).TokenProvider = (account, environment, tenant) =>
+            {
+                throw new AadAuthenticationCanceledException("Login window was closed", null);
+            };
+
+            Assert.Throws<AadAuthenticationCanceledException>( () => client.Login(
+                Context.Account,
+                Context.Environment,
+                null,
+                secondsubscriptionInTheFirstTenant,
+                null,
+                null));
+        }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]

src/ResourceManager/Profile/Commands.Profile/Models/RMProfileClient.cs

@@ -386,9 +386,10 @@ public IEnumerable<AzureSubscription> ListSubscriptions()
                 }
                 catch (AadAuthenticationException)
                 {
-                    WriteWarningMessage(string.Format("Could not authenticate user account {0} with tenant {1}.  " +
-                       "Subscriptions in this tenant will not be listed. Please login again using Login-AzureRmAccount " +
-                       "to view the subscriptions in this tenant.", _profile.Context.Account, tenant));
+                    WriteWarningMessage(string.Format(
+                        Microsoft.Azure.Commands.Profile.Properties.Resources.UnableToLogin, 
+                        _profile.Context.Account, 
+                        tenant));
                 }
 
             }
@@ -576,11 +577,12 @@ private List<AzureTenant> ListAccountTenants(AzureAccount account, AzureEnvironm
                 {
                     result =
                         account.GetPropertyAsArray(AzureAccount.Property.Tenants)
-                            .Select( ti => {
+                            .Select(ti =>
+                            {
                                 var tenant = new AzureTenant();
-                                
+
                                 Guid guid;
-                                if(Guid.TryParse(ti, out guid))
+                                if (Guid.TryParse(ti, out guid))
                                 {
                                     tenant.Id = guid;
                                     tenant.Domain = AccessTokenExtensions.GetDomain(account.Id);
@@ -593,8 +595,12 @@ private List<AzureTenant> ListAccountTenants(AzureAccount account, AzureEnvironm
                                 return tenant;
                             }).ToList();
                 }
-                
-             }
+                if(!result.Any())
+                {
+                    throw;
+                }
+
+            }
 
             return result;
         }
@@ -640,7 +646,7 @@ private void WriteWarningMessage(string message)
                 WarningLog(message);
             }
         }
-
+        
         private static AzureTenant CreateTenantFromString(string tenantOrDomain, string accessTokenTenantId)
         {
             AzureTenant result = new AzureTenant();

src/ResourceManager/Profile/Commands.Profile/Properties/Resources.Designer.cs

@@ -168,7 +168,10 @@
   <data name="UnableToAqcuireToken" xml:space="preserve">
     <value>Unable to acquire token for tenant '{0}'</value>
   </data>
+  <data name="UnableToLogin" xml:space="preserve">
+    <value>Could not authenticate user account '{0}' with tenant '{1}'. Subscriptions in this tenant will not be listed. Please login again using Login-AzureRmAccount to view the subscriptions in this tenant.</value>
+  </data>
   <data name="UnknownEnvironment" xml:space="preserve">
     <value>Unable to find environment with name '{0}'</value>
   </data>
-</root>
+</root>