Merge pull request pnp#4586 from pnp/PR4585

Pr4585
gautamdsheth · Nov 28, 2024 · 9ad7e02 · 9ad7e02
2 parents 3c8c9fa + 118812e
commit 9ad7e02
Show file tree

Hide file tree

Showing 5 changed files with 213 additions and 28 deletions.
diff --git a/src/Commands/Base/ConnectOnline.cs b/src/Commands/Base/ConnectOnline.cs
@@ -267,6 +267,13 @@ public class ConnectOnline : BasePSCmdlet
         [Parameter(Mandatory = true, ParameterSetName = ParameterSet_OSLOGIN)]
         public SwitchParameter OSLogin;
 
+
+        [Parameter(Mandatory = false, ParameterSetName = ParameterSet_INTERACTIVE)]
+        [Parameter(Mandatory = false, ParameterSetName = ParameterSet_DEVICELOGIN)]
+        [Parameter(Mandatory = false, ParameterSetName = ParameterSet_OSLOGIN)]
+        [Parameter(Mandatory = false, ParameterSetName = ParameterSet_CREDENTIALS)]
+        public SwitchParameter PersistLogin;
+
         private static readonly string[] sourceArray = ["stop", "ignore", "silentlycontinue"];
 
         protected override void ProcessRecord()
@@ -765,8 +772,7 @@ private PnPConnection ConnectInteractive()
                 }
             }
             WriteVerbose($"Using ClientID {ClientId}");
-
-            return PnPConnection.CreateWithInteractiveLogin(new Uri(Url.ToLower()), ClientId, TenantAdminUrl, AzureEnvironment, cancellationTokenSource, ForceAuthentication, Tenant, false);
+            return PnPConnection.CreateWithInteractiveLogin(new Uri(Url.ToLower()), ClientId, TenantAdminUrl, AzureEnvironment, cancellationTokenSource, ForceAuthentication, Tenant, false, PersistLogin, Host);
         }
 
         private PnPConnection ConnectEnvironmentVariable(InitializationType initializationType = InitializationType.EnvironmentVariable)
@@ -902,8 +908,11 @@ private PnPConnection ConnectWithOSLogin()
             }
 
             WriteVerbose($"Using ClientID {ClientId}");
-
-            return PnPConnection.CreateWithInteractiveLogin(new Uri(Url.ToLower()), ClientId, TenantAdminUrl, AzureEnvironment, cancellationTokenSource, ForceAuthentication, Tenant, true);
+            if (PnPConnection.CacheEnabled(Url, ClientId))
+            {
+                WriteObject("Cache used. Clear the cache entry with Disconnect-PnPOnline");
+            }
+            return PnPConnection.CreateWithInteractiveLogin(new Uri(Url.ToLower()), ClientId, TenantAdminUrl, AzureEnvironment, cancellationTokenSource, ForceAuthentication, Tenant, true, PersistLogin, Host);
         }
 
         #endregion

diff --git a/src/Commands/Base/DisconnectOnline.cs b/src/Commands/Base/DisconnectOnline.cs
@@ -11,6 +11,10 @@ namespace PnP.PowerShell.Commands.Base
     [OutputType(typeof(void))]
     public class DisconnectOnline : PSCmdlet
     {
+
+        [Parameter(Mandatory = false)]
+        public SwitchParameter ClearPersistedLogin;
+
         protected override void ProcessRecord()
         {
             if (PnPConnection.Current == null)
@@ -30,6 +34,11 @@ protected override void ProcessRecord()
                 PnPConnection.Current.Certificate = null;
             }
 
+            if(ClearPersistedLogin)
+            {
+                PnPConnection.ClearCache(PnPConnection.Current);
+            }
+
             PnPConnection.Current = null;
 
             var provider = SessionState.Provider.GetAll().FirstOrDefault(p => p.Name.Equals(SPOProvider.PSProviderName, StringComparison.InvariantCultureIgnoreCase));