From 508e484b17905ef3c7cb4e6a39c973ad49ce6911 Mon Sep 17 00:00:00 2001 From: Petri Asikainen Date: Mon, 21 Jun 2021 10:42:00 +0300 Subject: [PATCH] Be quiet when deleting --- SnipeitPS/Private/Invoke-SnipeitMethod.ps1 | 17 +++++++++++++++-- SnipeitPS/Public/Remove-SnipeitAccessory.ps1 | 1 - SnipeitPS/Public/Remove-SnipeitAsset.ps1 | 1 - .../Public/Remove-SnipeitAssetMaintenance.ps1 | 1 - SnipeitPS/Public/Remove-SnipeitCategory.ps1 | 1 - SnipeitPS/Public/Remove-SnipeitCompany.ps1 | 1 - SnipeitPS/Public/Remove-SnipeitComponent.ps1 | 1 - SnipeitPS/Public/Remove-SnipeitConsumable.ps1 | 1 - SnipeitPS/Public/Remove-SnipeitCustomField.ps1 | 1 - SnipeitPS/Public/Remove-SnipeitDepartment.ps1 | 1 - SnipeitPS/Public/Remove-SnipeitLicense.ps1 | 1 - SnipeitPS/Public/Remove-SnipeitLocation.ps1 | 1 - SnipeitPS/Public/Remove-SnipeitManufacturer.ps1 | 1 - SnipeitPS/Public/Remove-SnipeitModel.ps1 | 1 - SnipeitPS/Public/Remove-SnipeitUser.ps1 | 1 - 15 files changed, 15 insertions(+), 16 deletions(-) diff --git a/SnipeitPS/Private/Invoke-SnipeitMethod.ps1 b/SnipeitPS/Private/Invoke-SnipeitMethod.ps1 index 5f66bdf..58d72ce 100644 --- a/SnipeitPS/Private/Invoke-SnipeitMethod.ps1 +++ b/SnipeitPS/Private/Invoke-SnipeitMethod.ps1 @@ -111,17 +111,30 @@ Write-Error $($webResponse.messages | Out-String) } else { - + #update operations return payload if ($webResponse.payload){ $result = $webResponse.payload } + #Search operations return rows elseif ($webResponse.rows) { $result = $webResponse.rows - } else { + } + #Remove operations returns status and message + elseif ($webResponse.status -eq 'success'){ + $result = $webResponse.payload + } + #get operations with id returns just one object + else { $result = $webResponse } + Write-Verbose "Status: $($webResponse.status)" + Write-Verbose "Messages: $($webResponse.messages)" + $result + + + } } catch { diff --git a/SnipeitPS/Public/Remove-SnipeitAccessory.ps1 b/SnipeitPS/Public/Remove-SnipeitAccessory.ps1 index d8303fe..4189b17 100644 --- a/SnipeitPS/Public/Remove-SnipeitAccessory.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitAccessory.ps1 @@ -41,7 +41,6 @@ function Remove-SnipeitAccessory () $Parameters = @{ Uri = "$url/api/v1/accessories/$accessory_id" Method = 'Delete' - Body = @{} Token = $apiKey } diff --git a/SnipeitPS/Public/Remove-SnipeitAsset.ps1 b/SnipeitPS/Public/Remove-SnipeitAsset.ps1 index fb2edbd..68d9dbb 100644 --- a/SnipeitPS/Public/Remove-SnipeitAsset.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitAsset.ps1 @@ -42,7 +42,6 @@ function Remove-SnipeitAsset () $Parameters = @{ Uri = "$url/api/v1/hardware/$asset_id" Method = 'Delete' - Body = '@{}' Token = $apiKey } diff --git a/SnipeitPS/Public/Remove-SnipeitAssetMaintenance.ps1 b/SnipeitPS/Public/Remove-SnipeitAssetMaintenance.ps1 index 4bae969..a1f7b65 100644 --- a/SnipeitPS/Public/Remove-SnipeitAssetMaintenance.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitAssetMaintenance.ps1 @@ -46,7 +46,6 @@ function Remove-SnipeitAssetMaintenance { $Parameters = @{ Uri = "$url/api/v1/maintenances/$maintenance_id" Method = 'Delete' - Body = '@{}' Token = $apiKey } diff --git a/SnipeitPS/Public/Remove-SnipeitCategory.ps1 b/SnipeitPS/Public/Remove-SnipeitCategory.ps1 index f1c2912..0f86693 100644 --- a/SnipeitPS/Public/Remove-SnipeitCategory.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitCategory.ps1 @@ -41,7 +41,6 @@ function Remove-SnipeitCategory () $Parameters = @{ Uri = "$url/api/v1/categories/$category_id" Method = 'Delete' - Body = '@{}' Token = $apiKey } diff --git a/SnipeitPS/Public/Remove-SnipeitCompany.ps1 b/SnipeitPS/Public/Remove-SnipeitCompany.ps1 index 85966f0..9ff94dc 100644 --- a/SnipeitPS/Public/Remove-SnipeitCompany.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitCompany.ps1 @@ -41,7 +41,6 @@ function Remove-SnipeitCompany () $Parameters = @{ Uri = "$url/api/v1/companies/$company_id" Method = 'Delete' - Body = '@{}' Token = $apiKey } diff --git a/SnipeitPS/Public/Remove-SnipeitComponent.ps1 b/SnipeitPS/Public/Remove-SnipeitComponent.ps1 index 6644ca3..450dbed 100644 --- a/SnipeitPS/Public/Remove-SnipeitComponent.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitComponent.ps1 @@ -41,7 +41,6 @@ function Remove-SnipeitComponent () $Parameters = @{ Uri = "$url/api/v1/components/$component_id" Method = 'Delete' - Body = '@{}' Token = $apiKey } diff --git a/SnipeitPS/Public/Remove-SnipeitConsumable.ps1 b/SnipeitPS/Public/Remove-SnipeitConsumable.ps1 index d1dc453..3e18b3d 100644 --- a/SnipeitPS/Public/Remove-SnipeitConsumable.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitConsumable.ps1 @@ -42,7 +42,6 @@ function Remove-SnipeitConsumable () $Parameters = @{ Uri = "$url/api/v1/consumables/$consumable_id" Method = 'Delete' - Body = '@{}' Token = $apiKey } diff --git a/SnipeitPS/Public/Remove-SnipeitCustomField.ps1 b/SnipeitPS/Public/Remove-SnipeitCustomField.ps1 index ead644c..e258ca2 100644 --- a/SnipeitPS/Public/Remove-SnipeitCustomField.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitCustomField.ps1 @@ -41,7 +41,6 @@ function Remove-SnipeitCustomField () $Parameters = @{ Uri = "$url/api/v1/fields/$field_id" Method = 'Delete' - Body = '@{}' Token = $apiKey } diff --git a/SnipeitPS/Public/Remove-SnipeitDepartment.ps1 b/SnipeitPS/Public/Remove-SnipeitDepartment.ps1 index f2e545b..d6e95c7 100644 --- a/SnipeitPS/Public/Remove-SnipeitDepartment.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitDepartment.ps1 @@ -41,7 +41,6 @@ function Remove-SnipeitDepartment () $Parameters = @{ Uri = "$url/api/v1/departments/$department_id" Method = 'Delete' - Body = '@{}' Token = $apiKey } diff --git a/SnipeitPS/Public/Remove-SnipeitLicense.ps1 b/SnipeitPS/Public/Remove-SnipeitLicense.ps1 index f096cc6..ba0dee4 100644 --- a/SnipeitPS/Public/Remove-SnipeitLicense.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitLicense.ps1 @@ -41,7 +41,6 @@ function Remove-SnipeitLicense () $Parameters = @{ Uri = "$url/api/v1/licenses/$license_id" Method = 'Delete' - Body = '@{}' Token = $apiKey } diff --git a/SnipeitPS/Public/Remove-SnipeitLocation.ps1 b/SnipeitPS/Public/Remove-SnipeitLocation.ps1 index 07a8e6f..15c4567 100644 --- a/SnipeitPS/Public/Remove-SnipeitLocation.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitLocation.ps1 @@ -41,7 +41,6 @@ function Remove-SnipeitLocation () $Parameters = @{ Uri = "$url/api/v1/locations/$asset_id" Method = 'Delete' - Body = '@{}' Token = $apiKey } diff --git a/SnipeitPS/Public/Remove-SnipeitManufacturer.ps1 b/SnipeitPS/Public/Remove-SnipeitManufacturer.ps1 index 92afad1..b9c109b 100644 --- a/SnipeitPS/Public/Remove-SnipeitManufacturer.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitManufacturer.ps1 @@ -41,7 +41,6 @@ function Remove-SnipeitManufacturer () $Parameters = @{ Uri = "$url/api/v1/manufacturers/$manufacturer_id_id" Method = 'Delete' - Body = '@{}' Token = $apiKey } diff --git a/SnipeitPS/Public/Remove-SnipeitModel.ps1 b/SnipeitPS/Public/Remove-SnipeitModel.ps1 index b8c5565..65509bd 100644 --- a/SnipeitPS/Public/Remove-SnipeitModel.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitModel.ps1 @@ -41,7 +41,6 @@ function Remove-SnipeitModel () $Parameters = @{ Uri = "$url/api/v1/models/$model_id" Method = 'Delete' - Body = '@{}' Token = $apiKey } diff --git a/SnipeitPS/Public/Remove-SnipeitUser.ps1 b/SnipeitPS/Public/Remove-SnipeitUser.ps1 index 18d2361..6afd60b 100644 --- a/SnipeitPS/Public/Remove-SnipeitUser.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitUser.ps1 @@ -41,7 +41,6 @@ function Remove-SnipeitUser () $Parameters = @{ Uri = "$url/api/v1/users/$user_id" Method = 'Delete' - Body = '@{}' Token = $apiKey }