Merge pull request #446 from AzureAD/user/kyrader/support-non-guid-tenant-options

Define tenant as string instead of GUID

Author: kyle-rader-msft

src/AzureAuth.Test/PublicClientAuthTest.cs

@@ -25,7 +25,7 @@ namespace AzureAuth.Test
     internal class PublicClientAuthTest
     {
         private readonly AuthParameters authParams = new AuthParameters(
-            Fake.Client,
+            Fake.Client.ToString(),
             Fake.Tenant,
             Fake.Scopes);
 

src/AzureAuth/Commands/CommandAad.cs

@@ -366,7 +366,7 @@ private bool ValidateOptions()
         private int ClearLocalCache()
         {
             var pca = PublicClientApplicationBuilder.Create(this.authSettings.Client).Build();
-            var pcaWrapper = new PCAWrapper(this.logger, pca, new List<Exception>(), new Guid(this.authSettings.Tenant));
+            var pcaWrapper = new PCAWrapper(this.logger, pca, new List<Exception>(), this.authSettings.Tenant);
 
             var accounts = pcaWrapper.TryToGetCachedAccountsAsync().Result;
             while (accounts.Any())

src/MSALWrapper.Benchmark/BrokerBenchmark.cs

@@ -52,14 +52,14 @@ public void WarmUp()
         [Benchmark]
         public void NativeBrokerBenchmark()
         {
-            var pcaWrapper = BuildPCAWrapper(this.logger, this.clientID, this.tenantID);
+            var pcaWrapper = BuildPCAWrapper(this.logger, this.clientID, this.tenantID.ToString());
             AuthParameters authParameters = new AuthParameters(this.clientID, this.tenantID, this.scopes);
             Broker broker = new Broker(this.logger, authParameters, pcaWrapper: pcaWrapper);
 
             broker.GetTokenAsync().Wait();
         }
 
-        private IPCAWrapper BuildPCAWrapper(ILogger logger, Guid clientId, Guid tenantId)
+        private IPCAWrapper BuildPCAWrapper(ILogger logger, Guid clientId, string tenantId)
         {
             IList<Exception> errors = new List<Exception>();
 

src/MSALWrapper.Test/AuthFlow/AuthFlowExecutorTest.cs

@@ -29,7 +29,7 @@ public class AuthFlowExecutorTest
         private TokenResult tokenResult;
         private IStopwatch stopwatch;
         private Guid client = Guid.NewGuid();
-        private Guid tenant = Guid.NewGuid();
+        private string tenant = Guid.NewGuid().ToString();
 
         [SetUp]
         public void Setup()

src/MSALWrapper.Test/PCACacheTest.cs

@@ -22,7 +22,7 @@ namespace Microsoft.Authentication.MSALWrapper.Test
     public class PCACacheTest
     {
         private Mock<ILogger> loggerMock;
-        private Guid testTenantId;
+        private string testTenantId;
         private PCACache pcaCache;
 
         /// <summary>
@@ -32,7 +32,7 @@ public class PCACacheTest
         public void Setup()
         {
             this.loggerMock = new Mock<ILogger>();
-            this.testTenantId = Guid.NewGuid();
+            this.testTenantId = Guid.NewGuid().ToString();
             this.pcaCache = new PCACache(this.loggerMock.Object, this.testTenantId);
         }
 
@@ -140,7 +140,7 @@ public void PlainTextCache_CreatesDirectoryAndFileWithCorrectPermissions()
             var originalWaylandDisplay = Environment.GetEnvironmentVariable("WAYLAND_DISPLAY");
             var homeDir = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
             var testCacheDir = Path.Combine(homeDir, ".azureauth");
-            var testTenantId = Guid.NewGuid();
+            var testTenantId = Guid.NewGuid().ToString();
             var testCacheFile = Path.Combine(testCacheDir, $"msal_{testTenantId}_cache.json");
 
             try
@@ -243,7 +243,7 @@ public void Constructor_InitializesFieldsCorrectly()
         {
             // Arrange
             var logger = new Mock<ILogger>().Object;
-            var tenantId = Guid.NewGuid();
+            var tenantId = Guid.NewGuid().ToString();
 
             // Act
             var cache = new PCACache(logger, tenantId);
@@ -260,8 +260,8 @@ public void Constructor_WithDifferentTenantIds_CreatesDifferentInstances()
         {
             // Arrange
             var logger = new Mock<ILogger>().Object;
-            var tenantId1 = Guid.NewGuid();
-            var tenantId2 = Guid.NewGuid();
+            var tenantId1 = Guid.NewGuid().ToString();
+            var tenantId2 = Guid.NewGuid().ToString();
 
             // Act
             var cache1 = new PCACache(logger, tenantId1);
@@ -498,7 +498,7 @@ public void SetupTokenCache_OnError_LogsWarning()
             var loggerMock = new Mock<ILogger>();
             var userTokenCacheMock = new Mock<ITokenCache>();
             var errors = new List<Exception>();
-            var cache = new PCACache(loggerMock.Object, Guid.NewGuid());
+            var cache = new PCACache(loggerMock.Object, Guid.NewGuid().ToString());
 
             try
             {
@@ -550,7 +550,7 @@ public void MultipleInstances_SameTenantId_UseSameCacheFileName()
         {
             // Arrange
             var logger = new Mock<ILogger>().Object;
-            var tenantId = Guid.NewGuid();
+            var tenantId = Guid.NewGuid().ToString();
 
             // Act
             var cache1 = new PCACache(logger, tenantId);
@@ -559,7 +559,7 @@ public void MultipleInstances_SameTenantId_UseSameCacheFileName()
             // Assert
             // Both instances should be configured to use the same cache file name pattern
             var expectedCacheFileName = $"msal_{tenantId}.cache";
-            expectedCacheFileName.Should().Contain(tenantId.ToString());
+            expectedCacheFileName.Should().Contain(tenantId);
         }
 
         /// <summary>
@@ -643,7 +643,7 @@ public void Constructor_WithEmptyGuid_CreatesInstance()
         {
             // Arrange
             var logger = new Mock<ILogger>().Object;
-            var emptyGuid = Guid.Empty;
+            var emptyGuid = Guid.Empty.ToString();
 
             // Act
             var cache = new PCACache(logger, emptyGuid);

src/MSALWrapper/AuthFlow/Broker.cs

@@ -146,7 +146,7 @@ private IntPtr GetParentWindowHandle()
             return ancestorHandle;
         }
 
-        private IPCAWrapper BuildPCAWrapper(Guid clientId, Guid tenantId)
+        private IPCAWrapper BuildPCAWrapper(Guid clientId, string tenantId)
         {
             var clientBuilder =
                 PublicClientApplicationBuilder

src/MSALWrapper/AuthFlow/CachedAuth.cs

@@ -85,7 +85,7 @@ protected override async Task<TokenResult> GetTokenInnerAsync()
             return await GetTokenAsync(this.logger, this.scopes, account, this.pcaWrapper, this.errors);
         }
 
-        private IPCAWrapper BuildPCAWrapper(Guid clientId, Guid tenantId)
+        private IPCAWrapper BuildPCAWrapper(Guid clientId, string tenantId)
         {
             var clientBuilder =
                 PublicClientApplicationBuilder

src/MSALWrapper/AuthFlow/DeviceCode.cs

@@ -72,7 +72,7 @@ private Task<TokenResult> DeviceCodeAuth(CancellationToken cancellationToken)
                 cancellationToken);
         }
 
-        private IPCAWrapper BuildPCAWrapper(Guid clientId, Guid tenantId)
+        private IPCAWrapper BuildPCAWrapper(Guid clientId, string tenantId)
         {
             var httpFactoryAdaptor = new MsalHttpClientFactoryAdaptor();
             var clientBuilder =

src/MSALWrapper/AuthFlow/IntegratedWindowsAuthentication.cs

@@ -84,7 +84,7 @@ private async Task<TokenResult> Iwa(CancellationToken cancellationToken)
             return await this.pcaWrapper.GetTokenIntegratedWindowsAuthenticationAsync(this.scopes, cancellationToken);
         }
 
-        private IPCAWrapper BuildPCAWrapper(Guid clientId, Guid tenantId)
+        private IPCAWrapper BuildPCAWrapper(Guid clientId, string tenantId)
         {
             var clientBuilder =
                 PublicClientApplicationBuilder

src/MSALWrapper/AuthFlow/Web.cs

@@ -94,7 +94,7 @@ private Func<CancellationToken, Task<TokenResult>> GetTokenInteractiveWithClaims
                 .GetTokenInteractiveAsync(this.scopes, claims, cancellationToken);
         }
 
-        private IPCAWrapper BuildPCAWrapper(Guid clientId, Guid tenantId)
+        private IPCAWrapper BuildPCAWrapper(Guid clientId, string tenantId)
         {
             var httpFactoryAdaptor = new MsalHttpClientFactoryAdaptor();
             var clientBuilder =