Fixed error message (#32)

UNT-CAS · Oct 1, 2019 · ab0b283 · ab0b283
1 parent 266895f
commit ab0b283
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/Examples/Public/Remove-ePOComputer/References/LeafNodeId1.html b/Examples/Public/Remove-ePOComputer/References/LeafNodeId1.html
@@ -1,2 +1,9 @@
 OK:
-0
+[
+    {
+        "name": "Computer1",
+        "id": "LeafNodeId1",
+        "message": "Computer deleted successfully",
+        "status": "0"
+    }
+]
diff --git a/Examples/Public/Remove-ePOComputer/References/LeafNodeId2.html b/Examples/Public/Remove-ePOComputer/References/LeafNodeId2.html
@@ -1,2 +1,9 @@
 OK:
-0
+[
+    {
+        "name": "Computer2",
+        "id": "LeafNodeId2",
+        "message": "Computer deleted successfully",
+        "status": "0"
+    }
+]
diff --git a/Examples/Public/Remove-ePOComputer/References/LeafNodeId3.html b/Examples/Public/Remove-ePOComputer/References/LeafNodeId3.html
@@ -1,2 +1,9 @@
 OK:
-1
+[
+    {
+        "name": "Computer3",
+        "id": "LeafNodeId3",
+        "message": "java.lang.NullPointerException",
+        "status": "1"
+    }
+]
diff --git a/ePOwerShell/Public/Remove-ePOComputer.ps1 b/ePOwerShell/Public/Remove-ePOComputer.ps1
@@ -80,10 +80,10 @@ function Remove-ePOComputer {
                             if ($PSCmdlet.ShouldProcess("Remove ePO computer: $($C.ComputerName)")) {
                                 $Result = Invoke-ePORequest @Request
 
-                                if ($Result -eq 0) {
+                                if ($Result.Status -eq 0) {
                                     Write-Verbose ('Deleted computer: {0}' -f $C.ComputerName)
                                 } else {
-                                    Throw ('Unknown response while deleting computer {0} from ePO: {1}' -f $C.ComputerName, $Result)
+                                    Throw ('Unknown response while deleting computer {0} from ePO: {1}' -f $C.ComputerName, ($Result | Out-String))
                                 }
                             }
                         }
@@ -105,10 +105,10 @@ function Remove-ePOComputer {
                             if ($PSCmdlet.ShouldProcess("Remove ePO computer: $($C.ComputerName)")) {
                                 $Result = Invoke-ePORequest @Request
 
-                                if ($Result -eq 0) {
+                                if ($Result.Status -eq 0) {
                                     Write-Verbose ('Deleted computer: {0}' -f $C.ComputerName)
                                 } else {
-                                    Throw ('Unknown response while deleting computer {0} from ePO: {1}' -f $C.ComputerName, $Result)
+                                    Throw ('Unknown response while deleting computer {0} from ePO: {1}' -f $C.ComputerName, ($Result | Out-String))
                                 }
                             }
                         }