Skip to content

Refactor caching logic to conditionally enable based on persistLogin parameter #4590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gautamdsheth merged 1 commit into from
Nov 28, 2024
Merged

Refactor caching logic to conditionally enable based on persistLogin parameter #4590

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions src/Commands/Base/PnPConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ internal static PnPConnection CreateWithDeviceLogin(string clientId, string url,
{
EnableCaching(url, clientId);
}
if (CacheEnabled(url, clientId))
if (persistLogin && CacheEnabled(url, clientId))
{
WriteCacheEnabledMessage(host);
}
Expand All @@ -287,7 +287,10 @@ internal static PnPConnection CreateWithDeviceLogin(string clientId, string url,
return Task.FromResult(0);
}, azureEnvironment, tokenCacheCallback: async (tokenCache) =>
{
await MSALCacheHelper(tokenCache, url, clientId);
if (persistLogin)
{
await MSALCacheHelper(tokenCache, url, clientId);
}
});
}
using (authManager)
Expand Down Expand Up @@ -458,7 +461,7 @@ internal static PnPConnection CreateWithCredentials(Cmdlet cmdlet, Uri url, PSCr
{
EnableCaching(url.ToString(), clientId);
}
if (CacheEnabled(url.ToString(), clientId))
if (persistLogin && CacheEnabled(url.ToString(), clientId))
{
WriteCacheEnabledMessage(host);
}
Expand Down Expand Up @@ -492,7 +495,10 @@ internal static PnPConnection CreateWithCredentials(Cmdlet cmdlet, Uri url, PSCr
{
authManager = PnP.Framework.AuthenticationManager.CreateWithCredentials(clientId, credentials.UserName, credentials.Password, redirectUrl, azureEnvironment, tokenCacheCallback: async (tokenCache) =>
{
await MSALCacheHelper(tokenCache, url.ToString(), clientId);
if (persistLogin)
{
await MSALCacheHelper(tokenCache, url.ToString(), clientId);
}
});
}
using (authManager)
Expand Down Expand Up @@ -603,7 +609,7 @@ internal static PnPConnection CreateWithInteractiveLogin(Uri uri, string clientI
{
EnableCaching(uri.ToString(), clientId);
}
if (CacheEnabled(uri.ToString(), clientId))
if (persistLogin && CacheEnabled(uri.ToString(), clientId))
{
WriteCacheEnabledMessage(host);
}
Expand All @@ -628,7 +634,10 @@ internal static PnPConnection CreateWithInteractiveLogin(Uri uri, string clientI
htmlMessageFailure,
azureEnvironment: azureEnvironment, tokenCacheCallback: async (tokenCache) =>
{
await MSALCacheHelper(tokenCache, uri.ToString(), clientId);
if (persistLogin)
{
await MSALCacheHelper(tokenCache, uri.ToString(), clientId);
}
}, useWAM: enableLoginWithWAM);
}
using (authManager)
Expand Down
Loading