Fix issue with context changes not copying the token cache

Author: markcowl

src/Common/Commands.Common/GeneralUtilities.cs

@@ -442,6 +442,5 @@ public static void ClearCurrentStorageAccount(bool clearSMContext = false)
                 }
             }
         }
-
     }
 }

src/ResourceManager/Common/Commands.ResourceManager.Common/AccessTokenExtensions.cs

@@ -1,4 +1,18 @@
-using System;
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using System;
 using System.Linq;
 using Microsoft.Azure.Common.Authentication;
 

src/ResourceManager/Common/Commands.ResourceManager.Common/AzureRMProfileExtensions.cs

@@ -0,0 +1,42 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Azure.Common.Authentication.Models;
+
+namespace Microsoft.Azure.Commands.ResourceManager.Common
+{
+    public static class AzureRMProfileExtensions
+    {
+        /// <summary>
+        /// Set the context for the current profile, preserving token cache information
+        /// </summary>
+        /// <param name="profile">The profile to change the context for</param>
+        /// <param name="newContext">The new context</param>
+        public static void SetContext(this AzureRMProfile profile, AzureContext newContext)
+        {
+            var currentContext = profile.Context;
+            if (currentContext != null && currentContext.TokenCache != null && currentContext.TokenCache.Length > 0)
+            {
+                newContext.TokenCache = currentContext.TokenCache;
+            }
+
+            profile.Context = newContext;
+        }
+    }
+}

src/ResourceManager/Common/Commands.ResourceManager.Common/Commands.ResourceManager.Common.csproj

@@ -138,6 +138,7 @@
   <ItemGroup>
     <Compile Include="AccessTokenExtensions.cs" />
     <Compile Include="AzureRmCmdlet.cs" />
+    <Compile Include="AzureRMProfileExtensions.cs" />
     <Compile Include="Generated\AuthorizationClient.cs" />
     <Compile Include="Generated\AuthorizationClientExtensions.cs" />
     <Compile Include="Generated\DeploymentOperationOperations.cs" />

src/ResourceManager/Profile/Commands.Profile/Context/SetAzureRMContext.cs

@@ -55,8 +55,8 @@ protected override void ProcessRecord()
         {
             if (ParameterSetName == ContextParameterSet)
             {
-                AzureRmProfileProvider.Instance.Profile.Context = new AzureContext(Context.Subscription, Context.Account,
-                    Context.Environment, Context.Tenant);
+                AzureRmProfileProvider.Instance.Profile.SetContext(new AzureContext(Context.Subscription, Context.Account,
+                    Context.Environment, Context.Tenant));
             }
             else
             {

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

@@ -105,11 +105,11 @@ public AzureContext SetCurrentContext(string subscriptionId, string tenantId)
         {
             if (!string.IsNullOrWhiteSpace(tenantId))
             {
-                _profile.Context = new AzureContext(
+                _profile.SetContext(new AzureContext(
                     _profile.Context.Subscription,
                     _profile.Context.Account,
                     _profile.Context.Environment,
-                    new AzureTenant() { Id = new Guid(tenantId) });
+                    new AzureTenant() { Id = new Guid(tenantId) }));
 
                 if (_profile.Context.Account != null)
                 {
@@ -139,11 +139,11 @@ public AzureContext SetCurrentContext(string subscriptionId, string tenantId)
                     newSubscription.Name = null;
                 }
 
-                _profile.Context = new AzureContext(
+                _profile.SetContext(new AzureContext(
                     newSubscription,
                     _profile.Context.Account,
                     _profile.Context.Environment,
-                    _profile.Context.Tenant);
+                    _profile.Context.Tenant));
             }
 
             return _profile.Context;