Revert "Revert "Enable MSAL by default""

microsoft · May 4, 2023 · 41129f9 · 41129f9
1 parent 71322d7
commit 41129f9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/CredentialProvider.Microsoft.Tests/CredentialProviders/Vsts/AuthUtilTests.cs b/CredentialProvider.Microsoft.Tests/CredentialProviders/Vsts/AuthUtilTests.cs
@@ -48,6 +48,7 @@ public void TestCleanup()
         [TestMethod]
         public async Task GetAadAuthorityUri_WithoutAuthenticateHeaders_ReturnsCorrectAuthority()
         {
+            Environment.SetEnvironmentVariable(EnvUtil.MsalEnabledEnvVar, "false");
             var requestUri = new Uri("https://example.pkgs.visualstudio.com/_packaging/feed/nuget/v3/index.json");
 
             var authorityUri = await authUtil.GetAadAuthorityUriAsync(requestUri, cancellationToken);
@@ -58,6 +59,7 @@ public async Task GetAadAuthorityUri_WithoutAuthenticateHeaders_ReturnsCorrectAu
         [TestMethod]
         public async Task GetAadAuthorityUri_WithoutAuthenticateHeadersAndPpe_ReturnsCorrectAuthority()
         {
+            Environment.SetEnvironmentVariable(EnvUtil.MsalEnabledEnvVar, "false");
             var requestUri = new Uri("https://example.pkgs.vsts.me/_packaging/feed/nuget/v3/index.json");
 
             var authorityUri = await authUtil.GetAadAuthorityUriAsync(requestUri, cancellationToken);
@@ -68,6 +70,7 @@ public async Task GetAadAuthorityUri_WithoutAuthenticateHeadersAndPpe_ReturnsCor
         [TestMethod]
         public async Task GetAadAuthorityUri_WithoutAuthenticateHeadersAndPpeAndPpeOverride_ReturnsCorrectAuthority()
         {
+            Environment.SetEnvironmentVariable(EnvUtil.MsalEnabledEnvVar, "false");
             var ppeUris = new[]
             {
                 new Uri("https://example.pkgs.vsts.me/_packaging/feed/nuget/v3/index.json"),
@@ -80,6 +83,7 @@ public async Task GetAadAuthorityUri_WithoutAuthenticateHeadersAndPpeAndPpeOverr
             foreach (var ppeUri in ppeUris)
             {
                 var authorityUri = await authUtil.GetAadAuthorityUriAsync(ppeUri, cancellationToken);
+
                 authorityUri.Should().Be(new Uri("https://login.windows-ppe.net/common"));
             }
         }
@@ -104,7 +108,7 @@ public async Task GetAadAuthorityUri_WithAuthenticateHeadersAndEnvironmentOverri
 
             MockAadAuthorityHeaders(testAuthority);
 
-            Environment.SetEnvironmentVariable(EnvUtil.AuthorityEnvVar, overrideAuthority.ToString());
+            Environment.SetEnvironmentVariable(EnvUtil.MsalAuthorityEnvVar, overrideAuthority.ToString());
             var authorityUri = await authUtil.GetAadAuthorityUriAsync(requestUri, cancellationToken);
 
             authorityUri.Should().Be(overrideAuthority);
@@ -200,8 +204,6 @@ public async Task GetAuthorizationEndpoint_HeaderPresent_ReturnsEndpoint()
         [TestMethod]
         public async Task MsalGetAadAuthorityUri_WithoutAuthenticateHeadersAndPpeAndPpeOverride_ReturnsCorrectAuthority()
         {
-            Environment.SetEnvironmentVariable(EnvUtil.MsalEnabledEnvVar, "true");
-
             var ppeUris = new[]
             {
                 new Uri("https://example.pkgs.vsts.me/_packaging/feed/nuget/v3/index.json"),
@@ -220,9 +222,8 @@ public async Task MsalGetAadAuthorityUri_WithoutAuthenticateHeadersAndPpeAndPpeO
         }
 
         [TestMethod]
-        public async Task MsaltAadAuthorityUri_WithoutAuthenticateHeaders_ReturnsCorrectAuthority()
+        public async Task MsalAadAuthorityUri_WithoutAuthenticateHeaders_ReturnsCorrectAuthority()
         {
-            Environment.SetEnvironmentVariable(EnvUtil.MsalEnabledEnvVar, "true");
             var requestUri = new Uri("https://example.pkgs.visualstudio.com/_packaging/feed/nuget/v3/index.json");
 
             var authorityUri = await authUtil.GetAadAuthorityUriAsync(requestUri, cancellationToken);
@@ -232,7 +233,7 @@ public async Task MsaltAadAuthorityUri_WithoutAuthenticateHeaders_ReturnsCorrect
 
 
         [TestMethod]
-        public async Task MsaltAadAuthorityUri_WithoutAuthenticateHeaders_ReturnsCorrectAuthorityFalseEnvVar()
+        public async Task MsalAadAuthorityUri_WithoutAuthenticateHeaders_ReturnsCorrectAuthorityFalseEnvVar()
         {
             Environment.SetEnvironmentVariable(EnvUtil.MsalEnabledEnvVar, "false");
             var requestUri = new Uri("https://example.pkgs.visualstudio.com/_packaging/feed/nuget/v3/index.json");
@@ -245,7 +246,6 @@ public async Task MsaltAadAuthorityUri_WithoutAuthenticateHeaders_ReturnsCorrect
         [TestMethod]
         public async Task MsalGetAadAuthorityUri_WithoutAuthenticateHeadersAndPpe_ReturnsCorrectAuthority()
         {
-            Environment.SetEnvironmentVariable(EnvUtil.MsalEnabledEnvVar, "true");
             var requestUri = new Uri("https://example.pkgs.vsts.me/_packaging/feed/nuget/v3/index.json");
 
             var authorityUri = await authUtil.GetAadAuthorityUriAsync(requestUri, cancellationToken);

diff --git a/CredentialProvider.Microsoft/Util/EnvUtil.cs b/CredentialProvider.Microsoft/Util/EnvUtil.cs
@@ -110,7 +110,7 @@ public static string GetMsalCacheLocation()
 
         internal static bool MsalEnabled()
         {
-            return GetEnabledFromEnvironment(MsalEnabledEnvVar, defaultValue: false);
+            return GetEnabledFromEnvironment(MsalEnabledEnvVar, defaultValue: true);
         }
 
         public static bool MsalFileCacheEnabled()