Merge pull request Azure#85 from Azure/fix-content-naming

cormacpayne · web-flow · commit 6d451135d0f1 · 2018-10-25T15:34:15.000-07:00
Fix issue with naming when no subscription is present in context
diff --git a/src/Authentication.ResourceManager/AzureRmProfile.cs b/src/Authentication.ResourceManager/AzureRmProfile.cs
@@ -401,6 +401,11 @@ public bool TryGetContextName(IAzureContext context, out string name)
                     name = string.Format("{0} ({1}) - {2}", context.Subscription.Name, context.Subscription.Id, context.Account.Id);
                     result = true;
                 }
+                else if (context.Tenant != null && context.Account != null)
+                {
+                    name = string.Format("{0} - {1}", context.Tenant.Id, context.Account.Id);
+                    result = true;
+                }
                 else
                 {
                     name = "Default";

Original file line number	Diff line number	Diff line change
`@@ -401,6 +401,11 @@ public bool TryGetContextName(IAzureContext context, out string name)`
`401`	`401`	`name = string.Format("{0} ({1}) - {2}", context.Subscription.Name, context.Subscription.Id, context.Account.Id);`
`402`	`402`	`result = true;`
`403`	`403`	`}`
	`404`	`+ else if (context.Tenant != null && context.Account != null)`
	`405`	`+ {`
	`406`	`+ name = string.Format("{0} - {1}", context.Tenant.Id, context.Account.Id);`
	`407`	`+ result = true;`
	`408`	`+ }`
`404`	`409`	`else`
`405`	`410`	`{`
`406`	`411`	`name = "Default";`