Merge pull request #97 from Azure/tenant-domain-name

Remove Directory property from Tenant

Author: markcowl

src/Authentication.Abstractions/Extensions/AzureTenantExtensions.cs

@@ -38,7 +38,6 @@ public static void CopyFrom(this IAzureTenant tenant, IAzureTenant other)
             if (tenant != null && other != null)
             {
                 tenant.Id = other.Id;
-                tenant.Directory = other.Directory;
                 tenant.CopyPropertiesFrom(other);
             }
         }
@@ -52,7 +51,6 @@ public static void Update(this IAzureTenant tenant, IAzureTenant other)
         {
             if (tenant != null && other != null)
             {
-                tenant.Directory = other.Directory?? tenant.Directory;
                 tenant.UpdateProperties(other);
             }
         }

src/Authentication.Abstractions/Interfaces/IAzureTenant.cs

@@ -23,10 +23,5 @@ public interface IAzureTenant : IExtensibleModel
         /// The Tenant Identifier (GUID)
         /// </summary>
         string Id { get; set; }
-
-        /// <summary>
-        /// The dns name of the tenant directory (domain)
-        /// </summary>
-        string Directory { get; set; }
     }
 }

src/Authentication.ResourceManager/Models/PSAzureTenant.cs

@@ -82,7 +82,6 @@ public PSAzureTenant(PSObject other)
             }
 
             this.Id = other.GetProperty<string>(nameof(Id));
-            this.Directory = other.GetProperty<string>(nameof(Directory));
             this.PopulateExtensions(other);
         }
         /// <summary>
@@ -91,12 +90,6 @@ public PSAzureTenant(PSObject other)
         [Ps1Xml(Label = "Id", Target = ViewControl.Table, Position = 0)]
         public string Id { get; set; }
 
-        /// <summary>
-        /// The name of the subscription.
-        /// </summary>
-        [Ps1Xml(Label = "Directory", Target = ViewControl.Table, Position = 1)]
-        public string Directory { get; set; }
-
         /// <summary>
         /// For legacy support - the tenant id
         /// </summary>
@@ -110,7 +103,7 @@ public PSAzureTenant(PSObject other)
 
         public override string ToString()
         {
-            return (this.Id == Guid.Empty.ToString()) ? this.Directory : this.Id;
+            return this.Id;
         }
     }
 }

src/Authentication.Test/Cmdlets/ConnectAccount.cs

@@ -594,7 +594,6 @@ private bool TryGetTenantSubscription(IAccessToken accessToken,
 
                     tenant = new AzureTenant();
                     tenant.Id = accessToken.TenantId;
-                    tenant.Directory = accessToken.GetDomain();
                     return true;
                 }
 
@@ -604,14 +603,6 @@ private bool TryGetTenantSubscription(IAccessToken accessToken,
                 {
                     tenant = new AzureTenant();
                     tenant.Id = accessToken.TenantId;
-                    if (accessToken.UserId != null)
-                    {
-                        var domain = accessToken.UserId.Split(new[] { '@' }, StringSplitOptions.RemoveEmptyEntries);
-                        if (domain.Length == 2)
-                        {
-                            tenant.Directory = domain[1];
-                        }
-                    }
                     return true;
                 }
 

src/ScenarioTest.ResourceManager/Extensions/TestModelExtensions.cs

@@ -41,7 +41,6 @@ public static bool CheckExtensionsEqual(this IExtensibleModel model, IExtensible
         public static bool IsEqual(this IAzureTenant baseTenant, IAzureTenant other)
         {
             return (baseTenant == null && other == null) || (baseTenant.CheckExtensionsEqual(other)
-                && string.Equals(baseTenant.Directory, other.Directory, StringComparison.OrdinalIgnoreCase)
                 && string.Equals(baseTenant.Id, other.Id, StringComparison.OrdinalIgnoreCase));
         }
 

src/TestFx/TestManager.cs

@@ -56,7 +56,7 @@ public class TestManager : ITestRunnerFactory, ITestRunner
         /// <returns></returns>
         public static ITestRunnerFactory CreateInstance(ITestOutputHelper output, [CallerFilePath] string callerFilePath = null)
         {
-            var callingClassName = string.IsNullOrEmpty(callerFilePath) 
+            var callingClassName = string.IsNullOrEmpty(callerFilePath)
                 ? null
                 : Path.GetFileNameWithoutExtension(callerFilePath);
             return new TestManager(callingClassName).WithTestOutputHelper(output);
@@ -84,7 +84,7 @@ protected TestManager(string callingClassName)
         #region Builder impl
 
         /// <summary>
-        /// Sets a name of the subfolder where a test project keeps tests 
+        /// Sets a name of the subfolder where a test project keeps tests
         /// </summary>
         /// <param name="folderName"></param>
         /// <returns>self</returns>
@@ -130,7 +130,7 @@ public ITestRunnerFactory WithExtraRmModules(Func<EnvironmentSetupHelper, string
         }
 
         /// <summary>
-        /// Clears default RM modules list and sets a brand new 
+        /// Clears default RM modules list and sets a brand new
         /// </summary>
         /// <param name="buildModuleList"></param>
         /// <returns></returns>
@@ -167,7 +167,7 @@ public ITestRunnerFactory WithRecordMatcher(RecordMatcherDelegate recordMatcher)
         }
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         /// <param name="userAgentsToIgnore">
         /// Dictionary to store pairs: {user agent name, version-api to ignore}.
@@ -265,7 +265,6 @@ protected void SetupAzureContext()
             string tenantId =  null;
             string userDomain = null;
             string subscriptionId = null;
-
             switch (HttpMockServer.Mode)
             {
                 case HttpRecorderMode.Record:
@@ -295,7 +294,6 @@ protected void SetupAzureContext()
             }
 
             AzureRmProfileProvider.Instance.Profile.DefaultContext.Tenant.Id = tenantId ?? undefined;
-            AzureRmProfileProvider.Instance.Profile.DefaultContext.Tenant.Directory = userDomain ?? undefined;
             AzureRmProfileProvider.Instance.Profile.DefaultContext.Subscription.Id = subscriptionId ?? undefined;
         }