Fixing auto-registration client to use current subscription id

Author: markcowl

src/ResourceManager/Common/Commands.ResourceManager.Common/AzureRMCmdlet.cs

@@ -311,11 +311,19 @@ protected override void Dispose(bool disposing)
         protected override void BeginProcessing()
         {
             AzureSession.Instance.ClientFactory.RemoveHandler(typeof(RPRegistrationDelegatingHandler));
-            AzureSession.Instance.ClientFactory.AddHandler(new RPRegistrationDelegatingHandler(
-                () => new ResourceManagementClient(
-                    DefaultContext.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ResourceManager),
-                    AzureSession.Instance.AuthenticationFactory.GetServiceClientCredentials(DefaultContext, AzureEnvironment.Endpoint.ResourceManager)),
-                s => DebugMessages.Enqueue(s)));
+            if (DefaultContext != null && DefaultContext.Subscription != null)
+            {
+                AzureSession.Instance.ClientFactory.AddHandler(new RPRegistrationDelegatingHandler(
+                    () =>
+                    {
+                        var client = new ResourceManagementClient(
+                            DefaultContext.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ResourceManager),
+                            AzureSession.Instance.AuthenticationFactory.GetServiceClientCredentials(DefaultContext, AzureEnvironment.Endpoint.ResourceManager));
+                        client.SubscriptionId = DefaultContext.Subscription.Id;
+                        return client;
+                    },
+                    s => DebugMessages.Enqueue(s)));
+            }
 
             base.BeginProcessing();
         }