Merge pull request #1057 from gautamdsheth/fix/undo-caching

Undo file system caching, need to test some more
pnp · Aug 30, 2024 · 084b505 · 084b505
2 parents 279e18c + 586088b
commit 084b505
Showing 1 changed file with 10 additions and 23 deletions.
diff --git a/src/lib/PnP.Framework/AuthenticationManager.cs b/src/lib/PnP.Framework/AuthenticationManager.cs
@@ -419,9 +419,7 @@ public AuthenticationManager(string clientId, string username, SecureString pass
             this.username = username;
             this.password = password;
             publicClientApplication = builder.Build();
-
-            var cacheHelper = MsalCacheHelperUtility.CreateCacheHelper();
-            cacheHelper?.RegisterCache(publicClientApplication.UserTokenCache);
+
             // register tokencache if callback provided
             tokenCacheCallback?.Invoke(publicClientApplication.UserTokenCache);
             authenticationType = ClientContextType.AzureADCredentials;
@@ -456,40 +454,32 @@ public AuthenticationManager(string clientId, string redirectUrl = null, string
         {
             this.azureEnvironment = azureEnvironment;
 
-            PublicClientApplicationBuilder builder = PublicClientApplicationBuilder.Create(clientId).WithHttpClientFactory(HttpClientFactory); ;
+            PublicClientApplicationBuilder builder = PublicClientApplicationBuilder.Create(clientId).WithHttpClientFactory(HttpClientFactory);
             builder = GetBuilderWithAuthority(builder, azureEnvironment);
+            if (!string.IsNullOrEmpty(tenantId))
+            {
+                builder = builder.WithTenantId(tenantId);
+            }
             if (useWAM && SharedUtilities.IsWindowsPlatform())
             {
                 BrokerOptions brokerOptions = new(BrokerOptions.OperatingSystems.Windows)
                 {
                     Title = "Login with M365 PnP",
                     ListOperatingSystemAccounts = true,
                 };
-                builder = builder.WithBroker(brokerOptions).WithDefaultRedirectUri().WithParentActivityOrWindow(WindowHandleUtilities.GetConsoleOrTerminalWindow);
-
-                if (!string.IsNullOrEmpty(tenantId))
-                {
-                    builder = builder.WithTenantId(tenantId);
-                }
+                builder = builder.WithBroker(brokerOptions).WithDefaultRedirectUri().WithParentActivityOrWindow(WindowHandleUtilities.GetConsoleOrTerminalWindow);                
             }
             else
             {
                 if (!string.IsNullOrEmpty(redirectUrl))
                 {
                     builder = builder.WithRedirectUri(redirectUrl);
-                }
-                if (!string.IsNullOrEmpty(tenantId))
-                {
-                    builder = builder.WithTenantId(tenantId);
-                }
+                }                
                 this.customWebUi = customWebUi;
             }
             builder.WithLegacyCacheCompatibility(false);
             publicClientApplication = builder.Build();
-
-            var cacheHelper = MsalCacheHelperUtility.CreateCacheHelper();
-            cacheHelper?.RegisterCache(publicClientApplication.UserTokenCache);
-
+
             // register tokencache if callback provided
             tokenCacheCallback?.Invoke(publicClientApplication.UserTokenCache);
 
@@ -535,10 +525,7 @@ public AuthenticationManager(string clientId, string tenantId, Func<DeviceCodeRe
 
             builder = builder.WithHttpClientFactory(HttpClientFactory);
             builder.WithLegacyCacheCompatibility(false);
-            publicClientApplication = builder.Build();
-
-            var cacheHelper = MsalCacheHelperUtility.CreateCacheHelper();
-            cacheHelper?.RegisterCache(publicClientApplication.UserTokenCache);
+            publicClientApplication = builder.Build();            
 
             // register tokencache if callback provided
             tokenCacheCallback?.Invoke(publicClientApplication.UserTokenCache);