huangpf · huangpf · Sep 17, 2015 · Sep 15, 2015 · Sep 16, 2015 · Sep 16, 2015
diff --git a/src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj b/src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj
@@ -58,7 +58,7 @@
     </Reference>
     <Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.2.2-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Common.NetFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/src/Common/Commands.Common.Storage/packages.config b/src/Common/Commands.Common.Storage/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
   <package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
-  <package id="Microsoft.Azure.Common.Authentication" version="1.2.2-preview" targetFramework="net45" />
+  <package id="Microsoft.Azure.Common.Authentication" version="1.3.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

diff --git a/src/Common/Commands.Common.Test/Commands.Common.Test.csproj b/src/Common/Commands.Common.Test/Commands.Common.Test.csproj
@@ -58,7 +58,7 @@
     </Reference>
     <Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.2.2-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Common.NetFramework">
       <HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>

diff --git a/src/Common/Commands.Common.Test/packages.config b/src/Common/Commands.Common.Test/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
   <package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
-  <package id="Microsoft.Azure.Common.Authentication" version="1.2.2-preview" targetFramework="net45" />
+  <package id="Microsoft.Azure.Common.Authentication" version="1.3.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />

diff --git a/src/Common/Commands.Common/Commands.Common.csproj b/src/Common/Commands.Common/Commands.Common.csproj
@@ -65,7 +65,7 @@
     </Reference>
     <Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.2.2-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Common.NetFramework">
       <SpecificVersion>False</SpecificVersion>

diff --git a/src/Common/Commands.Common/packages.config b/src/Common/Commands.Common/packages.config
@@ -4,7 +4,7 @@
   <package id="Microsoft.ApplicationInsights" version="1.1.1-beta" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.2" targetFramework="net45" />
   <package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
-  <package id="Microsoft.Azure.Common.Authentication" version="1.2.2-preview" targetFramework="net45" />
+  <package id="Microsoft.Azure.Common.Authentication" version="1.3.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

diff --git a/src/Common/Commands.Profile/Commands.Profile.csproj b/src/Common/Commands.Profile/Commands.Profile.csproj
@@ -54,7 +54,7 @@
       <HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.2.2-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Common.NetFramework">

diff --git a/src/Common/Commands.Profile/packages.config b/src/Common/Commands.Profile/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
   <package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
-  <package id="Microsoft.Azure.Common.Authentication" version="1.2.2-preview" targetFramework="net45" />
+  <package id="Microsoft.Azure.Common.Authentication" version="1.3.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

diff --git a/src/Common/Commands.ResourceManager.Common/AccessTokenExtensions.cs b/src/Common/Commands.ResourceManager.Common/AccessTokenExtensions.cs
@@ -0,0 +1,24 @@
+using Microsoft.Azure.Common.Authentication;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.Azure.Commands.ResourceManager.Common
+{
+    public static class AccessTokenExtensions
+    {
+        public static string GetDomain(this IAccessToken token)
+        {
+            if( token != null && token.UserId !=null && token.UserId.Contains('@'))
+            {
+                return token.UserId.Split(
+                    new[] { '@' }, 
+                    StringSplitOptions.RemoveEmptyEntries).Last();
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/Common/Commands.ResourceManager.Common/Commands.ResourceManager.Common.csproj b/src/Common/Commands.ResourceManager.Common/Commands.ResourceManager.Common.csproj
@@ -62,7 +62,7 @@
     </Reference>
     <Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.2.2-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Common.NetFramework">
       <SpecificVersion>False</SpecificVersion>
@@ -182,6 +182,7 @@
     <Compile Include="..\Commands.Common\TestMockSupport.cs">
       <Link>Common\TestMockSupport.cs</Link>
     </Compile>
+    <Compile Include="AccessTokenExtensions.cs" />
     <Compile Include="AzureRMCmdlet.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">

diff --git a/src/Common/Commands.ResourceManager.Common/RMProfileClient.cs b/src/Common/Commands.ResourceManager.Common/RMProfileClient.cs
@@ -34,36 +34,34 @@ public class RMProfileClient
         public RMProfileClient(AzureRMProfile profile)
         {
             _profile = profile;
-        }
 
-        public AzureRMProfile Login(AzureAccount account, AzureEnvironment environment, string tenantId, string subscriptionId, SecureString password)
-        {
-            AzureSubscription newSubscription = null;
-            AzureTenant newTenant = new AzureTenant();
-
-            if (_profile != null && _profile.Context != null && 
+            if (_profile != null && _profile.Context != null &&
                 _profile.Context.TokenCache != null && _profile.Context.TokenCache.Length > 0)
             {
                 TokenCache.DefaultShared.Deserialize(_profile.Context.TokenCache);
             }
+        }
+
+        public AzureRMProfile Login(AzureAccount account, AzureEnvironment environment, string tenantId, string subscriptionId, SecureString password)
+        {
+            AzureSubscription newSubscription = null;
+            AzureTenant newTenant = null;
+            ShowDialog promptBehavior = password == null ? ShowDialog.Always : ShowDialog.Never;
 
             // (tenant and subscription are present) OR
             // (tenant is present and subscription is not provided)
             if (!string.IsNullOrEmpty(tenantId))
             {
-                newTenant.Id = new Guid(tenantId);
-                ShowDialog promptBehavior = password == null ? ShowDialog.Always : ShowDialog.Never;
-                TryGetTenantSubscription(account, environment, tenantId, subscriptionId, password, promptBehavior, out newSubscription);
+                TryGetTenantSubscription(account, environment, tenantId, subscriptionId, password, promptBehavior, out newSubscription, out newTenant);
             }
             // (tenant is not provided and subscription is present) OR
             // (tenant is not provided and subscription is not provided)
             else
             {
-                foreach(var tenant in ListAccountTenants(account, environment, password))
+                foreach(var tenant in ListAccountTenants(account, environment, password, promptBehavior))
                 {
-                    if (TryGetTenantSubscription(account, environment, tenant, subscriptionId, password, ShowDialog.Auto, out newSubscription))
+                    if (TryGetTenantSubscription(account, environment, tenant.Id.ToString(), subscriptionId, password, ShowDialog.Auto, out newSubscription, out newTenant))
                     {
-                        newTenant.Id = new Guid(tenant);
                         break;
                     }
                 }
@@ -80,14 +78,77 @@ public AzureRMProfile Login(AzureAccount account, AzureEnvironment environment,
             return _profile;
         }
 
+        public AzureContext UpdateCurrentContext(string subscriptionId, string tenantId)
+        {
+            AzureSubscription newSubscription = null;
+            AzureTenant newTenant = null;
+            AzureAccount account = _profile.Context.Account;
+            AzureEnvironment envrionment = _profile.Context.Environment;
+            ShowDialog promptBehavior = ShowDialog.Auto;
+
+            if (!string.IsNullOrWhiteSpace(tenantId) &&
+                !string.IsNullOrWhiteSpace(subscriptionId))
+            {                
+                if(TryGetTenantSubscription(account, envrionment, tenantId, subscriptionId, null, promptBehavior, out newSubscription, out newTenant))
+                {
+                    _profile.Context = new AzureContext(newSubscription, account, envrionment, newTenant);
+                }
+            }
+            else if (!string.IsNullOrWhiteSpace(tenantId))
+            {
+                var accessToken = AzureSession.AuthenticationFactory.Authenticate(
+                   account,
+                   envrionment,
+                   tenantId,
+                   null,
+                   promptBehavior,
+                   TokenCache.DefaultShared);
+
+                account.Properties[AzureAccount.Property.Tenants] = accessToken.TenantId;
+                newTenant = new AzureTenant();
+                newTenant.Id = new Guid(accessToken.TenantId);
+                newTenant.Domain = accessToken.GetDomain();
+                _profile.Context = new AzureContext(account, envrionment, newTenant);
+            }
+            else if(!string.IsNullOrWhiteSpace(subscriptionId))
+            {
+                foreach (var tenant in ListAccountTenants(account, envrionment, null, promptBehavior))
+                {
+                    if (TryGetTenantSubscription(account, envrionment, tenant.Id.ToString(), subscriptionId, null, promptBehavior, out newSubscription, out newTenant))
+                    {
+                        _profile.Context = new AzureContext(newSubscription, account, envrionment, newTenant);
+                        break;
+                    }
+                }
+            }
+            else
+            {
+                throw new PSNotSupportedException();
+            }
+
+            _profile.Context.TokenCache = TokenCache.DefaultShared.Serialize();
+
+            return _profile.Context;
+        }
+
+        public List<AzureTenant> ListTenants(string tenant)
+        {
+            return ListAccountTenants(_profile.Context.Account, _profile.Context.Environment, null, ShowDialog.Auto)
+                .Where(t => tenant == null || 
+                            tenant.Equals(t.Id.ToString(), StringComparison.OrdinalIgnoreCase) ||
+                            tenant.Equals(t.Domain, StringComparison.OrdinalIgnoreCase))
+                .ToList();
+        }
+
         private bool TryGetTenantSubscription(
             AzureAccount account, 
             AzureEnvironment environment, 
             string tenantId, 
             string subscriptionId, 
             SecureString password, 
             ShowDialog promptBehavior, 
-            out AzureSubscription subscription)
+            out AzureSubscription subscription,
+            out AzureTenant tenant)
         {
             var accessToken = AzureSession.AuthenticationFactory.Authenticate(
                     account,
@@ -111,7 +172,7 @@ private bool TryGetTenantSubscription(
                     else
                     {
                         var subscriptions = subscriptionClient.Subscriptions.List().Subscriptions;
-                        if (subscriptions != null)
+                        if (subscriptions != null && subscriptions.Any())
                         {
                             if (subscriptions.Count > 1)
                             {
@@ -140,18 +201,20 @@ private bool TryGetTenantSubscription(
                     };
 
                     account.Properties[AzureAccount.Property.Tenants] = accessToken.TenantId;
+                    tenant = new AzureTenant();
+                    tenant.Id = new Guid(accessToken.TenantId);
+                    tenant.Domain = accessToken.GetDomain();
                     return true;
                 }
 
                 subscription = null;
+                tenant = null;
                 return false;
             }
         }
 
-        private string[] ListAccountTenants(AzureAccount account, AzureEnvironment environment, SecureString password)
+        private List<AzureTenant> ListAccountTenants(AzureAccount account, AzureEnvironment environment, SecureString password, ShowDialog promptBehavior)
         {
-            ShowDialog promptBehavior = password == null ? ShowDialog.Always : ShowDialog.Never;
-
             var commonTenantToken = AzureSession.AuthenticationFactory.Authenticate(
                 account, 
                 environment,
@@ -164,7 +227,9 @@ private string[] ListAccountTenants(AzureAccount account, AzureEnvironment envir
                     new TokenCloudCredentials(commonTenantToken.AccessToken),
                     environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ResourceManager)))
             {
-                return subscriptionClient.Tenants.List().TenantIds.Select(ti => ti.TenantId).ToArray();
+                return subscriptionClient.Tenants.List().TenantIds
+                    .Select(ti => new AzureTenant() { Id = new Guid(ti.TenantId), Domain = commonTenantToken.GetDomain() } )
+                    .ToList();
             }
         }
 

diff --git a/src/Common/Commands.ResourceManager.Common/packages.config b/src/Common/Commands.ResourceManager.Common/packages.config
@@ -4,7 +4,7 @@
   <package id="Microsoft.ApplicationInsights" version="1.1.1-beta" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.2" targetFramework="net45" />
   <package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
-  <package id="Microsoft.Azure.Common.Authentication" version="1.2.2-preview" targetFramework="net45" />
+  <package id="Microsoft.Azure.Common.Authentication" version="1.3.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

diff --git a/...Common/Commands.ResourceManager.Profile.Test/Commands.ResourceManager.Profile.Test.csproj b/...Common/Commands.ResourceManager.Profile.Test/Commands.ResourceManager.Profile.Test.csproj
@@ -59,7 +59,7 @@
     </Reference>
     <Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.2.2-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Common.NetFramework">
       <HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
@@ -178,7 +178,10 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ContextCmdletTests.Live.cs" />
+    <Compile Include="TenantCmdletTests.cs" />
     <Compile Include="LoginCmdletTests.cs" />
+    <Compile Include="ContextCmdletTests.Mocked.cs" />
     <Compile Include="ProfileCmdletTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>