Feature: Remove confirm switch in favor of Force parameter to make it…

… consistent (#4455) Co-authored-by: Gautam Sheth <[email protected]>
pnp · Oct 19, 2024 · 621f1ae · 621f1ae
1 parent f1b45d6
commit 621f1ae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/src/Commands/Graph/RemoveAvailableSiteClassification.cs b/src/Commands/Graph/RemoveAvailableSiteClassification.cs
@@ -9,16 +9,14 @@ namespace PnP.PowerShell.Commands.Graph
 {
     [Cmdlet(VerbsCommon.Remove, "PnPAvailableSiteClassification")]
     [RequiredApiApplicationPermissions("graph/Directory.ReadWrite.All")]
-    [Alias("Remove-PnPSiteClassitication")]
-    [WriteAliasWarning("Please use 'Remove-PnPAvailableSiteClassification'. The alias 'Remove-PnPSiteClassification' will be removed in a future release.")]
     [OutputType(typeof(void))]
     public class RemoveSiteClassification : PnPGraphCmdlet
     {
         [Parameter(Mandatory = true)]
         public List<string> Classifications;
 
         [Parameter(Mandatory = false)]
-        public SwitchParameter Confirm;
+        public SwitchParameter Force;
 
         protected override void ExecuteCmdlet()
         {
@@ -32,7 +30,7 @@ protected override void ExecuteCmdlet()
 
                         if (existingSettings.DefaultClassification == classification)
                         {
-                            if ((ParameterSpecified("Confirm") && !bool.Parse(MyInvocation.BoundParameters["Confirm"].ToString())) || ShouldContinue(string.Format(Properties.Resources.RemoveDefaultClassification0, classification), Properties.Resources.Confirm))
+                            if (Force || ShouldContinue(string.Format(Properties.Resources.RemoveDefaultClassification0, classification), Properties.Resources.Confirm))
                             {
                                 existingSettings.DefaultClassification = "";
                                 existingSettings.Classifications.Remove(classification);

diff --git a/src/Commands/Principals/RemoveUser.cs b/src/Commands/Principals/RemoveUser.cs
@@ -1,9 +1,8 @@
-using System.Management.Automation;
-using Microsoft.SharePoint.Client;
-
-using System.Linq.Expressions;
-using System;
+using Microsoft.SharePoint.Client;
 using PnP.PowerShell.Commands.Base.PipeBinds;
+using System;
+using System.Linq.Expressions;
+using System.Management.Automation;
 
 namespace PnP.PowerShell.Commands.Principals
 {
@@ -17,9 +16,6 @@ public class RemoveUser : PnPWebCmdlet
         [Parameter(Mandatory = false)]
         public SwitchParameter Force;
 
-        [Parameter(Mandatory = false)]
-        public SwitchParameter Confirm;
-
         protected override void ExecuteCmdlet()
         {
             var retrievalExpressions = new Expression<Func<User, object>>[]
@@ -33,7 +29,7 @@ protected override void ExecuteCmdlet()
 
             if (user != null)
             {
-                if (Force || (ParameterSpecified("Confirm") && !bool.Parse(MyInvocation.BoundParameters["Confirm"].ToString())) || ShouldContinue(string.Format(Properties.Resources.RemoveUser, user.Id, user.LoginName, user.Email), Properties.Resources.Confirm))
+                if (Force || ShouldContinue(string.Format(Properties.Resources.RemoveUser, user.Id, user.LoginName, user.Email), Properties.Resources.Confirm))
                 {
                     WriteVerbose($"Removing user {user.Id} {user.LoginName} {user.Email}");
                     ClientContext.Web.SiteUsers.Remove(user);