Fix Tenant bug for Graph Client

Author: ankushbindlish2

src/StorageSync/StorageSync.Test/Common/MockStorageSyncResourceManager.cs

@@ -17,6 +17,8 @@
 using Commands.StorageSync.Interop.Interfaces;
 using Microsoft.Azure.Commands.StorageSync.Common;
 using Microsoft.Azure.Commands.StorageSync.Interfaces;
+using Microsoft.Azure.Test.HttpRecorder;
+using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
 using System;
 using System.Text.RegularExpressions;
 
@@ -59,13 +61,14 @@ protected bool IsPlaybackMode
                 {
                     if (Microsoft.Azure.Test.HttpRecorder.HttpMockServer.Mode == Microsoft.Azure.Test.HttpRecorder.HttpRecorderMode.Playback)
                     {
-                        isPlaybackMode =true;
+                        isPlaybackMode = true;
                     }
                     else if (Microsoft.Azure.Test.HttpRecorder.HttpMockServer.Mode == Microsoft.Azure.Test.HttpRecorder.HttpRecorderMode.Record)
                     {
                         isPlaybackMode = false;
 
-                    } else
+                    }
+                    else
                     {
                         throw new NotSupportedException($"{Microsoft.Azure.Test.HttpRecorder.HttpMockServer.Mode} Mode is not supported");
                     }
@@ -140,5 +143,19 @@ public void WaitForAccessPropogation()
                 System.Threading.Thread.Sleep(40 * 1000);
             }
         }
+
+        public string GetTenantId()
+        {
+            string tenantId = null;
+
+            if (IsPlaybackMode)
+            {
+                if (HttpMockServer.Variables.ContainsKey(StorageSyncConstants.TenantId))
+                {
+                    tenantId = HttpMockServer.GetVariable(StorageSyncConstants.TenantId, null);
+                }
+            }
+            return tenantId;
+        }
     }
 }

src/StorageSync/StorageSync.Test/TestController.cs

@@ -46,7 +46,7 @@ public class TestController : RMTestBase
         /// <summary>
         /// The tenant identifier key
         /// </summary>
-        private const string TenantIdKey = "TenantId";
+        private const string TenantIdKey = StorageSyncConstants.TenantId;
         /// <summary>
         /// The domain key
         /// </summary>

src/StorageSync/StorageSync/Common/StorageSyncClientCmdletBase.cs

@@ -74,6 +74,7 @@ public StorageSyncClientCmdletBase()
         /// </summary>
         protected virtual void InitializeComponent()
         {
+            DefaultProfile.DefaultContext.Tenant.Id = StorageSyncClientWrapper.StorageSyncResourceManager.GetTenantId() ?? DefaultProfile.DefaultContext.Tenant.Id;
         }
 
         /// <summary>

src/StorageSync/StorageSync/Common/StorageSyncClientWrapper.cs

@@ -56,9 +56,9 @@ public class StorageSyncClientWrapper : IStorageSyncClientWrapper
         public IStorageSyncManagementClient StorageSyncManagementClient { get; set; }
 
         /// <summary>
-        /// Gets or sets the storage synchronize resource manager.
+        /// Gets or sets the storage sync resource manager.
         /// </summary>
-        /// <value>The storage synchronize resource manager.</value>
+        /// <value>The storage sync resource manager.</value>
         public IStorageSyncResourceManager StorageSyncResourceManager { get; set; }
 
         /// <summary>

src/StorageSync/StorageSync/Common/StorageSyncConstants.cs

@@ -124,13 +124,18 @@ public class StorageSyncConstants
         public const string FileSyncSvcName = "FileSyncSvc";
 
         /// <summary>
-        /// The storage synchronize resource manager
+        /// The storage sync resource manager
         /// </summary>
         public const string StorageSyncResourceManager = "StorageSyncResourceManager";
 
         /// <summary>
-        /// The synchronize server identifier
+        /// The sync server identifier
         /// </summary>
         public const string SyncServerId = "SyncServerId";
+
+        /// <summary>
+        /// The tenant identifier
+        /// </summary>
+        public const string TenantId = "TenantId";
     }
 }

src/StorageSync/StorageSync/Common/StorageSyncResourceManager.cs

@@ -101,5 +101,7 @@ public void WaitForAccessPropogation()
         {
             System.Threading.Thread.Sleep(40 * 1000);
         }
+
+        public string GetTenantId() => null;
     }
 }

src/StorageSync/StorageSync/Interfaces/IStorageSyncClientWrapper.cs

@@ -38,9 +38,9 @@ public interface IStorageSyncClientWrapper
         IStorageSyncManagementClient StorageSyncManagementClient { get; set; }
 
         /// <summary>
-        /// Gets or sets the storage synchronize resource manager.
+        /// Gets or sets the storage sync resource manager.
         /// </summary>
-        /// <value>The storage synchronize resource manager.</value>
+        /// <value>The storage sync resource manager.</value>
         IStorageSyncResourceManager StorageSyncResourceManager { get; set; }
 
         /// <summary>

src/StorageSync/StorageSync/Interfaces/IStorageSyncResourceManager.cs

@@ -65,5 +65,11 @@ public interface IStorageSyncResourceManager
         /// Waits for access propogation.
         /// </summary>
         void WaitForAccessPropogation();
+
+        /// <summary>
+        /// Gets the tenant identifier.
+        /// </summary>
+        /// <returns>System.String.</returns>
+        string GetTenantId();
     }
 }