Fix exceptions in Restore-PnPRecycleBinItem

pnp · Jan 7, 2025 · dbe08da · dbe08da
1 parent ac29068
commit dbe08da
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/Commands/Base/PipeBinds/RecycleBinItemPipeBind.cs b/src/Commands/Base/PipeBinds/RecycleBinItemPipeBind.cs
@@ -21,6 +21,7 @@ public RecycleBinItemPipeBind()
         public RecycleBinItemPipeBind(RecycleBinItem item)
         {
             _item = item;
+            _id = item?.Id;
         }
 
         public RecycleBinItemPipeBind(RecycleResult result)
@@ -31,6 +32,12 @@ public RecycleBinItemPipeBind(RecycleResult result)
         public RecycleBinItemPipeBind(IRecycleBinItem result)
         {
             _recycleBinItem = result;
+            _id = result?.Id;
+        }
+
+        public RecycleBinItemPipeBind(Guid guid)
+        {
+            _id = guid;
         }
 
         public RecycleBinItemPipeBind(string id)

diff --git a/src/Commands/RecycleBin/RestoreRecycleBinItem.cs b/src/Commands/RecycleBin/RestoreRecycleBinItem.cs
@@ -25,6 +25,11 @@ protected override void ExecuteCmdlet()
             {
                 var recycleBinItem = Identity.GetRecycleBinItem(Connection.PnPContext);
 
+                if (recycleBinItem == null)
+                {
+                    throw new PSArgumentException("Recycle bin item not found with the ID specified", nameof(Identity));
+                }
+
                 if (Force || ShouldContinue(string.Format(Resources.RestoreRecycleBinItem, recycleBinItem.LeafName), Resources.Confirm))
                 {
                     recycleBinItem.Restore();