From 3446a885dc533ee127999cc363e6d09c064b3140 Mon Sep 17 00:00:00 2001 From: Petri Asikainen Date: Mon, 23 Aug 2021 17:12:29 +0300 Subject: [PATCH] Deprecate url and apikey parameters from functions --- SnipeitPS/Private/Invoke-SnipeitMethod.ps1 | 20 +++- .../Private/Reset-SnipeitPSLegacyApi.ps1 | 15 +++ .../Private/Set-SnipeitPSLegacyApiKey.ps1 | 2 +- SnipeitPS/Private/Set-SnipeitPSLegacyUrl.ps1 | 2 +- .../Private/Test-SnipeitPSConnection.ps1 | 5 +- SnipeitPS/Public/Connect-Snipeit.ps1 | 85 ----------------- SnipeitPS/Public/Connect-SnipeitPS.ps1 | 91 ++++++++++--------- SnipeitPS/Public/Get-SnipeitAccessory.ps1 | 5 + .../Public/Get-SnipeitAccessoryOwner.ps1 | 5 + SnipeitPS/Public/Get-SnipeitActivity.ps1 | 5 + SnipeitPS/Public/Get-SnipeitAsset.ps1 | 4 + .../Public/Get-SnipeitAssetMaintenance.ps1 | 5 + SnipeitPS/Public/Get-SnipeitCategory.ps1 | 5 + SnipeitPS/Public/Get-SnipeitCompany.ps1 | 5 + SnipeitPS/Public/Get-SnipeitComponent.ps1 | 5 + SnipeitPS/Public/Get-SnipeitConsumable.ps1 | 37 ++++---- SnipeitPS/Public/Get-SnipeitCustomField.ps1 | 5 + SnipeitPS/Public/Get-SnipeitDepartment.ps1 | 5 + SnipeitPS/Public/Get-SnipeitFieldset.ps1 | 5 + SnipeitPS/Public/Get-SnipeitLicense.ps1 | 5 + SnipeitPS/Public/Get-SnipeitLicenseSeat.ps1 | 5 + SnipeitPS/Public/Get-SnipeitLocation.ps1 | 5 + SnipeitPS/Public/Get-SnipeitManufacturer.ps1 | 5 + SnipeitPS/Public/Get-SnipeitModel.ps1 | 5 + SnipeitPS/Public/Get-SnipeitStatus.ps1 | 5 + SnipeitPS/Public/Get-SnipeitSupplier.ps1 | 5 + SnipeitPS/Public/Get-SnipeitUser.ps1 | 5 + SnipeitPS/Public/New-SnipeitAccessory.ps1 | 5 + SnipeitPS/Public/New-SnipeitAsset.ps1 | 5 + .../Public/New-SnipeitAssetMaintenance.ps1 | 5 + SnipeitPS/Public/New-SnipeitAudit.ps1 | 5 + SnipeitPS/Public/New-SnipeitCategory.ps1 | 7 ++ SnipeitPS/Public/New-SnipeitCompany.ps1 | 6 +- SnipeitPS/Public/New-SnipeitComponent.ps1 | 5 + SnipeitPS/Public/New-SnipeitConsumable.ps1 | 7 ++ SnipeitPS/Public/New-SnipeitCustomField.ps1 | 7 ++ SnipeitPS/Public/New-SnipeitDepartment.ps1 | 5 + SnipeitPS/Public/New-SnipeitLicense.ps1 | 5 + SnipeitPS/Public/New-SnipeitLocation.ps1 | 5 + SnipeitPS/Public/New-SnipeitManufacturer.ps1 | 5 + SnipeitPS/Public/New-SnipeitModel.ps1 | 5 + SnipeitPS/Public/New-SnipeitSupplier.ps1 | 5 + SnipeitPS/Public/New-SnipeitUser.ps1 | 5 + SnipeitPS/Public/Remove-SnipeitAccessory.ps1 | 7 ++ SnipeitPS/Public/Remove-SnipeitAsset.ps1 | 7 ++ .../Public/Remove-SnipeitAssetMaintenance.ps1 | 7 ++ SnipeitPS/Public/Remove-SnipeitCategory.ps1 | 7 ++ SnipeitPS/Public/Remove-SnipeitCompany.ps1 | 7 ++ SnipeitPS/Public/Remove-SnipeitComponent.ps1 | 7 ++ SnipeitPS/Public/Remove-SnipeitConsumable.ps1 | 7 ++ .../Public/Remove-SnipeitCustomField.ps1 | 7 ++ SnipeitPS/Public/Remove-SnipeitDepartment.ps1 | 7 ++ SnipeitPS/Public/Remove-SnipeitLicense.ps1 | 7 ++ SnipeitPS/Public/Remove-SnipeitLocation.ps1 | 7 ++ .../Public/Remove-SnipeitManufacturer.ps1 | 8 ++ SnipeitPS/Public/Remove-SnipeitModel.ps1 | 7 ++ SnipeitPS/Public/Remove-SnipeitSupplier.ps1 | 7 ++ SnipeitPS/Public/Remove-SnipeitUser.ps1 | 7 ++ .../Public/Reset-SnipeitAccessoryOwner.ps1 | 6 ++ SnipeitPS/Public/Reset-SnipeitAssetOwner.ps1 | 5 + SnipeitPS/Public/Set-SnipeitAccessory.ps1 | 7 ++ .../Public/Set-SnipeitAccessoryOwner.ps1 | 7 ++ SnipeitPS/Public/Set-SnipeitAsset.ps1 | 7 ++ SnipeitPS/Public/Set-SnipeitAssetOwner.ps1 | 7 ++ SnipeitPS/Public/Set-SnipeitCategory.ps1 | 7 ++ SnipeitPS/Public/Set-SnipeitCompany.ps1 | 6 ++ SnipeitPS/Public/Set-SnipeitComponent.ps1 | 7 ++ SnipeitPS/Public/Set-SnipeitConsumable.ps1 | 7 ++ SnipeitPS/Public/Set-SnipeitCustomField.ps1 | 6 ++ SnipeitPS/Public/Set-SnipeitDepartment.ps1 | 6 ++ SnipeitPS/Public/Set-SnipeitLicense.ps1 | 6 ++ SnipeitPS/Public/Set-SnipeitLicenseSeat.ps1 | 7 ++ SnipeitPS/Public/Set-SnipeitLocation.ps1 | 7 ++ SnipeitPS/Public/Set-SnipeitManufacturer.ps1 | 7 ++ SnipeitPS/Public/Set-SnipeitModel.ps1 | 7 ++ SnipeitPS/Public/Set-SnipeitStatus.ps1 | 7 ++ SnipeitPS/Public/Set-SnipeitSupplier.ps1 | 7 ++ SnipeitPS/Public/Set-SnipeitUser.ps1 | 7 ++ SnipeitPS/SnipeitPS.psm1 | 10 +- 79 files changed, 520 insertions(+), 167 deletions(-) create mode 100644 SnipeitPS/Private/Reset-SnipeitPSLegacyApi.ps1 delete mode 100644 SnipeitPS/Public/Connect-Snipeit.ps1 diff --git a/SnipeitPS/Private/Invoke-SnipeitMethod.ps1 b/SnipeitPS/Private/Invoke-SnipeitMethod.ps1 index 710464b..997bb41 100644 --- a/SnipeitPS/Private/Invoke-SnipeitMethod.ps1 +++ b/SnipeitPS/Private/Invoke-SnipeitMethod.ps1 @@ -34,12 +34,22 @@ function Invoke-SnipeitMethod { ) BEGIN { - if ( $null -eq $SnipeitPSSession.url -or $null -eq $SnipeitPSSession.apiKey ) { - throw "Cannot connect to Snipe it.Please run Connect-SnipePS to set connection information." + #use legacy per command based url and apikey + if ( $null -ne $SnipeitPSSession.legacyUrl -and $null -ne $SnipeitPSSession.legacyApiKey ) { + [string]$Url = $SnipeitPSSession.legacyrl + Write-Debug "Invoke-SnipeitMethod url: $Url" + $Token = ConvertFrom-SecureString -AsPlainText -SecureString $SnipeitPSSession.legacyApiKey + + throw "Cannot connect to Snipe it. Please run Connect-SnipePS to set connection information." + } elseif ($null -ne $SnipeitPSSession.url -and $null -ne $SnipeitPSSession.apiKey) { + } else { - $Url = $SnipeitPSSession.url - $Token = $SnipeitPSSession.apiKey | ConvertFrom-SecureString -AsPlainText + [string]$Url = $SnipeitPSSession.url + Write-Debug "Invoke-SnipeitMethod url: $Url" + $Token = ConvertFrom-SecureString -AsPlainText -SecureString $SnipeitPSSession.apiKey + } + # Validation of parameters if (($Method -in ("POST", "PUT", "PATCH")) -and (!($Body))) { $message = "The following parameters are required when using the ${Method} parameter: Body." @@ -48,7 +58,7 @@ function Invoke-SnipeitMethod { } # Double check those old deprecated -url parameters - $Url = $Url.AbsoluteUri.TrimEnd('/') + $Url = $Url.TrimEnd('/') #Build request uri $apiUri = "$Url$Api" diff --git a/SnipeitPS/Private/Reset-SnipeitPSLegacyApi.ps1 b/SnipeitPS/Private/Reset-SnipeitPSLegacyApi.ps1 new file mode 100644 index 0000000..5449d3b --- /dev/null +++ b/SnipeitPS/Private/Reset-SnipeitPSLegacyApi.ps1 @@ -0,0 +1,15 @@ +function Reset-SnipeitPSLegacyApi { + [CmdletBinding( + SupportsShouldProcess = $true, + ConfirmImpact = "Low" + )] + param( + ) + process { + if ($PSCmdlet.ShouldProcess("ShouldProcess?")) { + $SnipeitPSSession.legacyUrl = $null + $SnipeitPSSession.legacyApiKey = $null + + } + } +} diff --git a/SnipeitPS/Private/Set-SnipeitPSLegacyApiKey.ps1 b/SnipeitPS/Private/Set-SnipeitPSLegacyApiKey.ps1 index 199b421..1568b30 100644 --- a/SnipeitPS/Private/Set-SnipeitPSLegacyApiKey.ps1 +++ b/SnipeitPS/Private/Set-SnipeitPSLegacyApiKey.ps1 @@ -8,7 +8,7 @@ function Set-SnipeitPSLegacyApiKey { ) process { if ($PSCmdlet.ShouldProcess("ShouldProcess?")) { - $SnipeitPSSession.apiKey = $apiKey | ConvertTo-SecureString -AsPlainText + $SnipeitPSSession.legacyApiKey = ConvertTo-SecureString -AsPlainText -String $apiKey } } } diff --git a/SnipeitPS/Private/Set-SnipeitPSLegacyUrl.ps1 b/SnipeitPS/Private/Set-SnipeitPSLegacyUrl.ps1 index 19a101d..2cd1c63 100644 --- a/SnipeitPS/Private/Set-SnipeitPSLegacyUrl.ps1 +++ b/SnipeitPS/Private/Set-SnipeitPSLegacyUrl.ps1 @@ -8,7 +8,7 @@ function Set-SnipeitPSLegacyUrl { ) process { if ($PSCmdlet.ShouldProcess("ShouldProcess?")) { - $SnipeitPSSession.url = $url + $SnipeitPSSession.legacyUrl = $url } } } diff --git a/SnipeitPS/Private/Test-SnipeitPSConnection.ps1 b/SnipeitPS/Private/Test-SnipeitPSConnection.ps1 index 63e5064..ba0a8f2 100644 --- a/SnipeitPS/Private/Test-SnipeitPSConnection.ps1 +++ b/SnipeitPS/Private/Test-SnipeitPSConnection.ps1 @@ -5,11 +5,12 @@ function Test-SnipeitPSConnection { Method = 'Get' GetParameters = @{'limit'=1} } - Write-Verbose "Testing connection to $url." + Write-Verbose "Testing connection to $($SnipeitPSSession.url)." $contest = Invoke-SnipeitMethod @Parameters + if ( $contest) { - Write-Verbose "Connection to $url tested succesfully." + Write-Verbose "Connection to $($SnipeitPSSession.url) tested succesfully." return $true } else { return $false diff --git a/SnipeitPS/Public/Connect-Snipeit.ps1 b/SnipeitPS/Public/Connect-Snipeit.ps1 deleted file mode 100644 index 58c6582..0000000 --- a/SnipeitPS/Public/Connect-Snipeit.ps1 +++ /dev/null @@ -1,85 +0,0 @@ -<# - .SYNOPSIS - Sets authetication information - - .DESCRIPTION - Set and stores apikey and url user to connect Snipe-It system. - Based on Set-SnipeitInfo command, that's now just combatipility wrapper - and calls Connect-SnipeitPS - - .PARAMETER url - URL of Snipeit system. - - .PARAMETER apiKey - User's API Key for Snipeit. - - .PARAMETER DontStore - Don't store connection information just connect to Url - - .EXAMPLE - Connect-SnipeitPS -Url $url -apiKey $myapikey - Connect to Snipe it api. - - .EXAMPLE - Connect-SnipeitPS -Url $url -SecureApiKey $myapikey - Connects to Snipe it api with apikey stored to securestring - - .EXAMPLE - Connect-SnipeitPS -siteCred (Get-Credential -message "Use site url as username and apikey as password") - Connect to Snipe It with PSCredential object - - .EXAMPLE - Build credential with apiakay value from secret vault (Microsoft.PowerShell.SecretManagement) - $siteurl = "https://mysnipeitsite.url" - $apikey = Get-SecretInfo -Name SnipeItApiKey - $siteCred = New-Object -Type PSCredential -Argumentlist $siteurl,$spikey - Connect-SnipeitPS -siteCred $siteCred - - - -#> -function Connect-SnipeitPS { - [CmdletBinding( - DefaultParameterSetName = 'Connect with url and apikey' - )] - [System.Diagnostics.CodeAnalysis.SuppressMessage('PSUseShouldProcessForStateChangingFunctions', '')] - - param ( - [Parameter(ParameterSetName='Connect with url and apikey',Mandatory=$true)] - [Parameter(ParameterSetName='Connect with url and secure apikey',Mandatory=$true)] - [Uri]$url, - - [Parameter(ParameterSetName='Connect with url and apikey',Mandatory=$true)] - [String]$apiKey, - - [Parameter(ParameterSetName='Connect with url and secure apikey',Mandatory=$true)] - [SecureString]$secureApiKey, - - [Parameter(ParameterSetName='Connect with credential',Mandatory=$true)] - [PSCredertial]$siteCred - ) - - - PROCESS { - switch ($PsCmdlet.ParameterSetName) { - 'Connect with url and apikey' { - $SnipeitPSSession.url = $url - $SnipeitPSSession.apiKey = $apiKey | ConvertTo-SecureString -AsPlainText - } - - 'Connect with url and secure apikey' { - $SnipeitPSSession.url = $url - $SnipeitPSSession.apiKey = $secureApiKey - } - - 'Connect with credential' { - $SnipeitPSSession.url = $siteCred.Username - $SnipeitPSSession.apiKey = $siteCred.GetNetworkCredential().SecurePassword - } - } - - if (-not (Test-SnipeitPSConnection)) { - throw "Cannot verify connection to snipe it. For the start try to check url and provided apikey or credentials" - } - } -} diff --git a/SnipeitPS/Public/Connect-SnipeitPS.ps1 b/SnipeitPS/Public/Connect-SnipeitPS.ps1 index 99f9c98..bb44411 100644 --- a/SnipeitPS/Public/Connect-SnipeitPS.ps1 +++ b/SnipeitPS/Public/Connect-SnipeitPS.ps1 @@ -3,8 +3,8 @@ Sets authetication information .DESCRIPTION - Set and stores apikey and url user to connect Snipe-It system. - Based on Set-SnipeitInfo command, that's now just combatipility wrapper + Sets apikey and url to connect Snipe-It system. + Based on Set-SnipeitInfo command, what is now just combatipility wrapper and calls Connect-SnipeitPS .PARAMETER url @@ -13,78 +13,81 @@ .PARAMETER apiKey User's API Key for Snipeit. - .PARAMETER DontStore - Don't store connection information just connect to Url + .PARAMETER secureApiKey + Snipe it Api key as securestring + + .PARAMETER siteCred + PSCredential where username shoul be snipe it url and password should be + snipe it apikey. .EXAMPLE Connect-SnipeitPS -Url $url -apiKey $myapikey - Connect to Snipe it api and stores connection information. + Connect to Snipe it api. .EXAMPLE - Connect-SnipeitPS -Url $url -apiKey $myapikey -DontStore - Just connects to Snipe it api, connection information is not stored. + Connect-SnipeitPS -Url $url -SecureApiKey $myapikey + Connects to Snipe it api with apikey stored to securestring .EXAMPLE - Connect-SnipeitPS -Url $url - Connects existing Snipe It Url with stored apiKey + Connect-SnipeitPS -siteCred (Get-Credential -message "Use site url as username and apikey as password") + Connect to Snipe It with PSCredential object. + To use saved creadentials yu can use export-clixml and import-clixml commandlets. .EXAMPLE - Connect-SnipeitPS - Connects last used Snipe It Url with stored apikey + Build credential with apikey value from secret vault (Microsoft.PowerShell.SecretManagement) + $siteurl = "https://mysnipeitsite.url" + $apikey = Get-SecretInfo -Name SnipeItApiKey + $siteCred = New-Object -Type PSCredential -Argumentlist $siteurl,$spikey + Connect-SnipeitPS -siteCred $siteCred + #> function Connect-SnipeitPS { [CmdletBinding( - DefaultParameterSetName = 'Connect to existing connection' + DefaultParameterSetName = 'Connect with url and apikey' )] [System.Diagnostics.CodeAnalysis.SuppressMessage('PSUseShouldProcessForStateChangingFunctions', '')] param ( - - [Parameter(ParameterSetName='Setup new connection',Mandatory=$true)] - [Parameter(ParameterSetName='Connect to existing connection',Mandatory=$false)] + [Parameter(ParameterSetName='Connect with url and apikey',Mandatory=$true)] + [Parameter(ParameterSetName='Connect with url and secure apikey',Mandatory=$true)] [Uri]$url, - [Parameter(ParameterSetName='Setup new connection',Mandatory=$true)] + [Parameter(ParameterSetName='Connect with url and apikey',Mandatory=$true)] [String]$apiKey, - [Parameter(ParameterSetName='Setup new connection')] - [switch]$DontStore + [Parameter(ParameterSetName='Connect with url and secure apikey',Mandatory=$true)] + [SecureString]$secureApiKey, + + [Parameter(ParameterSetName='Connect with credential',Mandatory=$true)] + [PSCredential]$siteCred ) PROCESS { switch ($PsCmdlet.ParameterSetName) { - 'Setup new connection' { - try { - $SnipeitPSSession.url = $url - $SnipeitPSSession.apiKey = $apiKey - - #test connection - $Parameters = @{ - Api = '/api/v1/statuslabels' - Method = 'Get' - GetParameters = @{'limit'=1} - } - Write-Verbose "Testin connection to $url." - - $contest = Invoke-SnipeitMethod @Parameters - if ( $contest) { - Write-Verbose "Connection to $url tested succesfully." - } - - } - catch { - throw "Cannot setup connection to $url. To start troubleshooting, check your url, certificates and apiKey" - } - # TODO: Save connection information safely on disk - + 'Connect with url and apikey' { + $SnipeitPSSession.url = $url.TrimEnd('/') + $SnipeitPSSession.apiKey = $apiKey | ConvertTo-SecureString -AsPlainText } - 'Connect to existing connection' { - # TODO: everything + 'Connect with url and secure apikey' { + $SnipeitPSSession.url = $url.TrimEnd('/') + $SnipeitPSSession.apiKey = $secureApiKey } + + 'Connect with credential' { + $SnipeitPSSession.url = ($siteCred.GetNetworkCredential().UserName).TrimEnd('/') + $SnipeitPSSession.apiKey = $siteCred.GetNetworkCredential().SecurePassword + } + } + + Write-Debug "Site-url $($SnipeitPSSession.url)" + Write-Debug "Site apikey: $($SnipeitPSSession.apiKey)" + + if (-not (Test-SnipeitPSConnection)) { + throw "Cannot verify connection to snipe it. For the start try to check url and provided apikey or credential parameters" } } } diff --git a/SnipeitPS/Public/Get-SnipeitAccessory.ps1 b/SnipeitPS/Public/Get-SnipeitAccessory.ps1 index ea2b276..af9222b 100644 --- a/SnipeitPS/Public/Get-SnipeitAccessory.ps1 +++ b/SnipeitPS/Public/Get-SnipeitAccessory.ps1 @@ -130,6 +130,11 @@ function Get-SnipeitAccessory() { $result = Invoke-SnipeitMethod @Parameters $result } + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/Get-SnipeitAccessoryOwner.ps1 b/SnipeitPS/Public/Get-SnipeitAccessoryOwner.ps1 index 6a2cfb6..3cc6174 100644 --- a/SnipeitPS/Public/Get-SnipeitAccessoryOwner.ps1 +++ b/SnipeitPS/Public/Get-SnipeitAccessoryOwner.ps1 @@ -52,5 +52,10 @@ function Get-SnipeitAccessoryOwner() { $result = Invoke-SnipeitMethod @Parameters } + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + return $result } diff --git a/SnipeitPS/Public/Get-SnipeitActivity.ps1 b/SnipeitPS/Public/Get-SnipeitActivity.ps1 index 85cd966..b8b6541 100644 --- a/SnipeitPS/Public/Get-SnipeitActivity.ps1 +++ b/SnipeitPS/Public/Get-SnipeitActivity.ps1 @@ -126,6 +126,11 @@ function Get-SnipeitActivity() { $result = Invoke-SnipeitMethod @Parameters $result } + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/Get-SnipeitAsset.ps1 b/SnipeitPS/Public/Get-SnipeitAsset.ps1 index 3392df0..c87ca1a 100644 --- a/SnipeitPS/Public/Get-SnipeitAsset.ps1 +++ b/SnipeitPS/Public/Get-SnipeitAsset.ps1 @@ -258,6 +258,10 @@ function Get-SnipeitAsset() { $result } + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/Get-SnipeitAssetMaintenance.ps1 b/SnipeitPS/Public/Get-SnipeitAssetMaintenance.ps1 index c9590d8..3d14a10 100644 --- a/SnipeitPS/Public/Get-SnipeitAssetMaintenance.ps1 +++ b/SnipeitPS/Public/Get-SnipeitAssetMaintenance.ps1 @@ -100,6 +100,11 @@ function Get-SnipeitAssetMaintenance() { $result = Invoke-SnipeitMethod @Parameters $result } + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/Get-SnipeitCategory.ps1 b/SnipeitPS/Public/Get-SnipeitCategory.ps1 index 783768d..f8a1bed 100644 --- a/SnipeitPS/Public/Get-SnipeitCategory.ps1 +++ b/SnipeitPS/Public/Get-SnipeitCategory.ps1 @@ -108,4 +108,9 @@ function Get-SnipeitCategory() { $result = Invoke-SnipeitMethod @Parameters $result } + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/Get-SnipeitCompany.ps1 b/SnipeitPS/Public/Get-SnipeitCompany.ps1 index b37c9ae..3db123e 100644 --- a/SnipeitPS/Public/Get-SnipeitCompany.ps1 +++ b/SnipeitPS/Public/Get-SnipeitCompany.ps1 @@ -110,4 +110,9 @@ function Get-SnipeitCompany() { $result = Invoke-SnipeitMethod @Parameters $result } + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/Get-SnipeitComponent.ps1 b/SnipeitPS/Public/Get-SnipeitComponent.ps1 index a76632c..663b8be 100644 --- a/SnipeitPS/Public/Get-SnipeitComponent.ps1 +++ b/SnipeitPS/Public/Get-SnipeitComponent.ps1 @@ -127,4 +127,9 @@ function Get-SnipeitComponent() { $result = Invoke-SnipeitMethod @Parameters $result } + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/Get-SnipeitConsumable.ps1 b/SnipeitPS/Public/Get-SnipeitConsumable.ps1 index d033c05..644243b 100644 --- a/SnipeitPS/Public/Get-SnipeitConsumable.ps1 +++ b/SnipeitPS/Public/Get-SnipeitConsumable.ps1 @@ -105,6 +105,16 @@ function Get-SnipeitConsumable() { begin { $SearchParameter = . Get-ParameterValue -Parameters $MyInvocation.MyCommand.Parameters -BoundParameters $PSBoundParameters + + if ($PSBoundParameters.ContainsKey('apiKey')) { + Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead." + Set-SnipeitPSLegacyApiKey -apiKey $apikey + } + + if ($PSBoundParameters.ContainsKey('url')) { + Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead." + Set-SnipeitPSLegacyUrl -url $url + } } process { @@ -116,16 +126,6 @@ function Get-SnipeitConsumable() { GetParameters = $SearchParameter } - if ($PSBoundParameters.ContainsKey('apiKey')) { - Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead." - Set-SnipeitPSLegacyApiKey -apiKey $apikey - } - - if ($PSBoundParameters.ContainsKey('url')) { - Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead." - Set-SnipeitPSLegacyUrl -url $url - } - if ($all) { $offstart = $(if ($offset) {$offset} Else {0}) $callargs = $SearchParameter @@ -155,21 +155,18 @@ function Get-SnipeitConsumable() { GetParameters = $SearchParameter } - if ($PSBoundParameters.ContainsKey('apiKey')) { - Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead." - Set-SnipeitPSLegacyApiKey -apiKey $apikey - } - - if ($PSBoundParameters.ContainsKey('url')) { - Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead." - Set-SnipeitPSLegacyUrl -url $url - } - $result = Invoke-SnipeitMethod @Parameters $result } } } } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Get-SnipeitCustomField.ps1 b/SnipeitPS/Public/Get-SnipeitCustomField.ps1 index cc33891..08a8ec2 100644 --- a/SnipeitPS/Public/Get-SnipeitCustomField.ps1 +++ b/SnipeitPS/Public/Get-SnipeitCustomField.ps1 @@ -61,4 +61,9 @@ function Get-SnipeitCustomField() { $result = Invoke-SnipeitMethod @Parameters $result + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/Get-SnipeitDepartment.ps1 b/SnipeitPS/Public/Get-SnipeitDepartment.ps1 index f3c7faf..2812f6b 100644 --- a/SnipeitPS/Public/Get-SnipeitDepartment.ps1 +++ b/SnipeitPS/Public/Get-SnipeitDepartment.ps1 @@ -116,5 +116,10 @@ function Get-SnipeitDepartment() { $result = Invoke-SnipeitMethod @Parameters $result } + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/Get-SnipeitFieldset.ps1 b/SnipeitPS/Public/Get-SnipeitFieldset.ps1 index 999909a..fd54228 100644 --- a/SnipeitPS/Public/Get-SnipeitFieldset.ps1 +++ b/SnipeitPS/Public/Get-SnipeitFieldset.ps1 @@ -58,4 +58,9 @@ function Get-SnipeitFieldset() { $result = Invoke-SnipeitMethod @Parameters $result + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/Get-SnipeitLicense.ps1 b/SnipeitPS/Public/Get-SnipeitLicense.ps1 index ff2fcaf..4a15492 100644 --- a/SnipeitPS/Public/Get-SnipeitLicense.ps1 +++ b/SnipeitPS/Public/Get-SnipeitLicense.ps1 @@ -151,5 +151,10 @@ function Get-SnipeitLicense() { $result = Invoke-SnipeitMethod @Parameters $result } + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/Get-SnipeitLicenseSeat.ps1 b/SnipeitPS/Public/Get-SnipeitLicenseSeat.ps1 index d57688f..3b4ccce 100644 --- a/SnipeitPS/Public/Get-SnipeitLicenseSeat.ps1 +++ b/SnipeitPS/Public/Get-SnipeitLicenseSeat.ps1 @@ -100,5 +100,10 @@ function Get-SnipeitLicenseSeat() { $result = Invoke-SnipeitMethod @Parameters $result } + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/Get-SnipeitLocation.ps1 b/SnipeitPS/Public/Get-SnipeitLocation.ps1 index d362d9d..2a59231 100644 --- a/SnipeitPS/Public/Get-SnipeitLocation.ps1 +++ b/SnipeitPS/Public/Get-SnipeitLocation.ps1 @@ -109,5 +109,10 @@ function Get-SnipeitLocation() { $result = Invoke-SnipeitMethod @Parameters $result } + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/Get-SnipeitManufacturer.ps1 b/SnipeitPS/Public/Get-SnipeitManufacturer.ps1 index 579a2bc..af178f9 100644 --- a/SnipeitPS/Public/Get-SnipeitManufacturer.ps1 +++ b/SnipeitPS/Public/Get-SnipeitManufacturer.ps1 @@ -110,4 +110,9 @@ function Get-SnipeitManufacturer() { $result = Invoke-SnipeitMethod @Parameters $result } + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/Get-SnipeitModel.ps1 b/SnipeitPS/Public/Get-SnipeitModel.ps1 index e06cdb9..231040c 100644 --- a/SnipeitPS/Public/Get-SnipeitModel.ps1 +++ b/SnipeitPS/Public/Get-SnipeitModel.ps1 @@ -109,4 +109,9 @@ function Get-SnipeitModel() { $result = Invoke-SnipeitMethod @Parameters $result } + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/Get-SnipeitStatus.ps1 b/SnipeitPS/Public/Get-SnipeitStatus.ps1 index ecdc3db..49f5d44 100644 --- a/SnipeitPS/Public/Get-SnipeitStatus.ps1 +++ b/SnipeitPS/Public/Get-SnipeitStatus.ps1 @@ -109,4 +109,9 @@ function Get-SnipeitStatus() { $result = Invoke-SnipeitMethod @Parameters $result } + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/Get-SnipeitSupplier.ps1 b/SnipeitPS/Public/Get-SnipeitSupplier.ps1 index d1106de..302160d 100644 --- a/SnipeitPS/Public/Get-SnipeitSupplier.ps1 +++ b/SnipeitPS/Public/Get-SnipeitSupplier.ps1 @@ -108,5 +108,10 @@ function Get-SnipeitSupplier() { $result = Invoke-SnipeitMethod @Parameters $result } + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/Get-SnipeitUser.ps1 b/SnipeitPS/Public/Get-SnipeitUser.ps1 index 4297975..0c3dae1 100644 --- a/SnipeitPS/Public/Get-SnipeitUser.ps1 +++ b/SnipeitPS/Public/Get-SnipeitUser.ps1 @@ -141,4 +141,9 @@ function Get-SnipeitUser() { $result = Invoke-SnipeitMethod @Parameters $result } + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/New-SnipeitAccessory.ps1 b/SnipeitPS/Public/New-SnipeitAccessory.ps1 index 7474fa9..f02467a 100644 --- a/SnipeitPS/Public/New-SnipeitAccessory.ps1 +++ b/SnipeitPS/Public/New-SnipeitAccessory.ps1 @@ -145,5 +145,10 @@ function New-SnipeitAccessory() { } $result + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/New-SnipeitAsset.ps1 b/SnipeitPS/Public/New-SnipeitAsset.ps1 index fa3fa6b..8f6103c 100644 --- a/SnipeitPS/Public/New-SnipeitAsset.ps1 +++ b/SnipeitPS/Public/New-SnipeitAsset.ps1 @@ -190,4 +190,9 @@ function New-SnipeitAsset() { } $result + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/New-SnipeitAssetMaintenance.ps1 b/SnipeitPS/Public/New-SnipeitAssetMaintenance.ps1 index 85dc774..608d9cd 100644 --- a/SnipeitPS/Public/New-SnipeitAssetMaintenance.ps1 +++ b/SnipeitPS/Public/New-SnipeitAssetMaintenance.ps1 @@ -111,4 +111,9 @@ function New-SnipeitAssetMaintenance() { } $result + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/New-SnipeitAudit.ps1 b/SnipeitPS/Public/New-SnipeitAudit.ps1 index 06e94c8..b115d35 100644 --- a/SnipeitPS/Public/New-SnipeitAudit.ps1 +++ b/SnipeitPS/Public/New-SnipeitAudit.ps1 @@ -67,4 +67,9 @@ function New-SnipeitAudit() { } $result + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/New-SnipeitCategory.ps1 b/SnipeitPS/Public/New-SnipeitCategory.ps1 index 14d016a..1b01abb 100644 --- a/SnipeitPS/Public/New-SnipeitCategory.ps1 +++ b/SnipeitPS/Public/New-SnipeitCategory.ps1 @@ -99,4 +99,11 @@ function New-SnipeitCategory() { $result } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/New-SnipeitCompany.ps1 b/SnipeitPS/Public/New-SnipeitCompany.ps1 index e6c4e82..69ca843 100644 --- a/SnipeitPS/Public/New-SnipeitCompany.ps1 +++ b/SnipeitPS/Public/New-SnipeitCompany.ps1 @@ -67,6 +67,10 @@ function New-SnipeitCompany() { } $result - $result + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/New-SnipeitComponent.ps1 b/SnipeitPS/Public/New-SnipeitComponent.ps1 index c734a3c..f3d785f 100644 --- a/SnipeitPS/Public/New-SnipeitComponent.ps1 +++ b/SnipeitPS/Public/New-SnipeitComponent.ps1 @@ -106,5 +106,10 @@ function New-SnipeitComponent() { } $result + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/New-SnipeitConsumable.ps1 b/SnipeitPS/Public/New-SnipeitConsumable.ps1 index 09ccb7f..3b9c8ce 100644 --- a/SnipeitPS/Public/New-SnipeitConsumable.ps1 +++ b/SnipeitPS/Public/New-SnipeitConsumable.ps1 @@ -147,4 +147,11 @@ function New-SnipeitConsumable() { $result } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/New-SnipeitCustomField.ps1 b/SnipeitPS/Public/New-SnipeitCustomField.ps1 index c8552ed..05750da 100644 --- a/SnipeitPS/Public/New-SnipeitCustomField.ps1 +++ b/SnipeitPS/Public/New-SnipeitCustomField.ps1 @@ -104,5 +104,12 @@ function New-SnipeitCustomField() { $result } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/New-SnipeitDepartment.ps1 b/SnipeitPS/Public/New-SnipeitDepartment.ps1 index 30f8b5e..31a279f 100644 --- a/SnipeitPS/Public/New-SnipeitDepartment.ps1 +++ b/SnipeitPS/Public/New-SnipeitDepartment.ps1 @@ -86,5 +86,10 @@ function New-SnipeitDepartment() { } $result + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/New-SnipeitLicense.ps1 b/SnipeitPS/Public/New-SnipeitLicense.ps1 index edcc6e8..9aee5fa 100644 --- a/SnipeitPS/Public/New-SnipeitLicense.ps1 +++ b/SnipeitPS/Public/New-SnipeitLicense.ps1 @@ -161,5 +161,10 @@ function New-SnipeitLicense() { } $result + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/New-SnipeitLocation.ps1 b/SnipeitPS/Public/New-SnipeitLocation.ps1 index a11fbb6..845417e 100644 --- a/SnipeitPS/Public/New-SnipeitLocation.ps1 +++ b/SnipeitPS/Public/New-SnipeitLocation.ps1 @@ -118,4 +118,9 @@ function New-SnipeitLocation() { } $result + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/New-SnipeitManufacturer.ps1 b/SnipeitPS/Public/New-SnipeitManufacturer.ps1 index 7ebf6ef..3005eca 100644 --- a/SnipeitPS/Public/New-SnipeitManufacturer.ps1 +++ b/SnipeitPS/Public/New-SnipeitManufacturer.ps1 @@ -73,4 +73,9 @@ function New-SnipeitManufacturer() { } $result + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/New-SnipeitModel.ps1 b/SnipeitPS/Public/New-SnipeitModel.ps1 index bd5686d..bb1fda7 100644 --- a/SnipeitPS/Public/New-SnipeitModel.ps1 +++ b/SnipeitPS/Public/New-SnipeitModel.ps1 @@ -100,4 +100,9 @@ function New-SnipeitModel() { } $result + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/New-SnipeitSupplier.ps1 b/SnipeitPS/Public/New-SnipeitSupplier.ps1 index 3a56a8a..12d4f16 100644 --- a/SnipeitPS/Public/New-SnipeitSupplier.ps1 +++ b/SnipeitPS/Public/New-SnipeitSupplier.ps1 @@ -122,5 +122,10 @@ function New-SnipeitSupplier() { } $result + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/New-SnipeitUser.ps1 b/SnipeitPS/Public/New-SnipeitUser.ps1 index 95d641c..0cd7841 100644 --- a/SnipeitPS/Public/New-SnipeitUser.ps1 +++ b/SnipeitPS/Public/New-SnipeitUser.ps1 @@ -146,4 +146,9 @@ function New-SnipeitUser() { } $result + + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } diff --git a/SnipeitPS/Public/Remove-SnipeitAccessory.ps1 b/SnipeitPS/Public/Remove-SnipeitAccessory.ps1 index 26fff6f..d7f92b7 100644 --- a/SnipeitPS/Public/Remove-SnipeitAccessory.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitAccessory.ps1 @@ -62,4 +62,11 @@ function Remove-SnipeitAccessory () { $result } } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Remove-SnipeitAsset.ps1 b/SnipeitPS/Public/Remove-SnipeitAsset.ps1 index fd7edd2..3f718cb 100644 --- a/SnipeitPS/Public/Remove-SnipeitAsset.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitAsset.ps1 @@ -63,4 +63,11 @@ function Remove-SnipeitAsset () { $result } } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Remove-SnipeitAssetMaintenance.ps1 b/SnipeitPS/Public/Remove-SnipeitAssetMaintenance.ps1 index 53d45f2..b94c4a3 100644 --- a/SnipeitPS/Public/Remove-SnipeitAssetMaintenance.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitAssetMaintenance.ps1 @@ -62,4 +62,11 @@ function Remove-SnipeitAssetMaintenance { $result } } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Remove-SnipeitCategory.ps1 b/SnipeitPS/Public/Remove-SnipeitCategory.ps1 index d417068..40b68f2 100644 --- a/SnipeitPS/Public/Remove-SnipeitCategory.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitCategory.ps1 @@ -61,4 +61,11 @@ function Remove-SnipeitCategory () { $result } } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Remove-SnipeitCompany.ps1 b/SnipeitPS/Public/Remove-SnipeitCompany.ps1 index ffda78e..ecb87a9 100644 --- a/SnipeitPS/Public/Remove-SnipeitCompany.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitCompany.ps1 @@ -61,4 +61,11 @@ function Remove-SnipeitCompany () { $result } } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Remove-SnipeitComponent.ps1 b/SnipeitPS/Public/Remove-SnipeitComponent.ps1 index 534e4ae..265eb4a 100644 --- a/SnipeitPS/Public/Remove-SnipeitComponent.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitComponent.ps1 @@ -62,4 +62,11 @@ function Remove-SnipeitComponent () { $result } } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Remove-SnipeitConsumable.ps1 b/SnipeitPS/Public/Remove-SnipeitConsumable.ps1 index 436af6b..230436f 100644 --- a/SnipeitPS/Public/Remove-SnipeitConsumable.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitConsumable.ps1 @@ -63,4 +63,11 @@ function Remove-SnipeitConsumable () { $result } } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Remove-SnipeitCustomField.ps1 b/SnipeitPS/Public/Remove-SnipeitCustomField.ps1 index 8945612..31528e4 100644 --- a/SnipeitPS/Public/Remove-SnipeitCustomField.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitCustomField.ps1 @@ -60,4 +60,11 @@ function Remove-SnipeitCustomField () { $result } } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Remove-SnipeitDepartment.ps1 b/SnipeitPS/Public/Remove-SnipeitDepartment.ps1 index 51cd030..c4e8538 100644 --- a/SnipeitPS/Public/Remove-SnipeitDepartment.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitDepartment.ps1 @@ -61,4 +61,11 @@ function Remove-SnipeitDepartment () { $result } } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Remove-SnipeitLicense.ps1 b/SnipeitPS/Public/Remove-SnipeitLicense.ps1 index 68e4ccd..55eecb1 100644 --- a/SnipeitPS/Public/Remove-SnipeitLicense.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitLicense.ps1 @@ -62,4 +62,11 @@ function Remove-SnipeitLicense () { $result } } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Remove-SnipeitLocation.ps1 b/SnipeitPS/Public/Remove-SnipeitLocation.ps1 index f4c5e43..c827325 100644 --- a/SnipeitPS/Public/Remove-SnipeitLocation.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitLocation.ps1 @@ -62,4 +62,11 @@ function Remove-SnipeitLocation () { $result } } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Remove-SnipeitManufacturer.ps1 b/SnipeitPS/Public/Remove-SnipeitManufacturer.ps1 index 64bd8d4..38c5aab 100644 --- a/SnipeitPS/Public/Remove-SnipeitManufacturer.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitManufacturer.ps1 @@ -61,5 +61,13 @@ function Remove-SnipeitManufacturer () { $result } + + } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } } } diff --git a/SnipeitPS/Public/Remove-SnipeitModel.ps1 b/SnipeitPS/Public/Remove-SnipeitModel.ps1 index 8aad97b..cb20fae 100644 --- a/SnipeitPS/Public/Remove-SnipeitModel.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitModel.ps1 @@ -62,4 +62,11 @@ function Remove-SnipeitModel () { $result } } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Remove-SnipeitSupplier.ps1 b/SnipeitPS/Public/Remove-SnipeitSupplier.ps1 index c22b64c..a7d4d91 100644 --- a/SnipeitPS/Public/Remove-SnipeitSupplier.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitSupplier.ps1 @@ -62,4 +62,11 @@ function Remove-SnipeitSupplier () { $result } } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Remove-SnipeitUser.ps1 b/SnipeitPS/Public/Remove-SnipeitUser.ps1 index 236d351..f7bb50c 100644 --- a/SnipeitPS/Public/Remove-SnipeitUser.ps1 +++ b/SnipeitPS/Public/Remove-SnipeitUser.ps1 @@ -61,4 +61,11 @@ function Remove-SnipeitUser () { $result } } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Reset-SnipeitAccessoryOwner.ps1 b/SnipeitPS/Public/Reset-SnipeitAccessoryOwner.ps1 index 1888450..254c5a8 100644 --- a/SnipeitPS/Public/Reset-SnipeitAccessoryOwner.ps1 +++ b/SnipeitPS/Public/Reset-SnipeitAccessoryOwner.ps1 @@ -62,5 +62,11 @@ function Reset-SnipeitAccessoryOwner() { $result = Invoke-SnipeitMethod @Parameters } + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + return $result + } diff --git a/SnipeitPS/Public/Reset-SnipeitAssetOwner.ps1 b/SnipeitPS/Public/Reset-SnipeitAssetOwner.ps1 index e2a2ef6..39fde33 100644 --- a/SnipeitPS/Public/Reset-SnipeitAssetOwner.ps1 +++ b/SnipeitPS/Public/Reset-SnipeitAssetOwner.ps1 @@ -75,5 +75,10 @@ function Reset-SnipeitAssetOwner() { $result = Invoke-SnipeitMethod @Parameters } + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + return $result } diff --git a/SnipeitPS/Public/Set-SnipeitAccessory.ps1 b/SnipeitPS/Public/Set-SnipeitAccessory.ps1 index cf76f59..a117e46 100644 --- a/SnipeitPS/Public/Set-SnipeitAccessory.ps1 +++ b/SnipeitPS/Public/Set-SnipeitAccessory.ps1 @@ -149,5 +149,12 @@ function Set-SnipeitAccessory() { $result } } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Set-SnipeitAccessoryOwner.ps1 b/SnipeitPS/Public/Set-SnipeitAccessoryOwner.ps1 index 2a6219f..49dbc28 100644 --- a/SnipeitPS/Public/Set-SnipeitAccessoryOwner.ps1 +++ b/SnipeitPS/Public/Set-SnipeitAccessoryOwner.ps1 @@ -72,4 +72,11 @@ function Set-SnipeitAccessoryOwner() { return $result } } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Set-SnipeitAsset.ps1 b/SnipeitPS/Public/Set-SnipeitAsset.ps1 index 5e1bebb..54a72e3 100644 --- a/SnipeitPS/Public/Set-SnipeitAsset.ps1 +++ b/SnipeitPS/Public/Set-SnipeitAsset.ps1 @@ -181,4 +181,11 @@ function Set-SnipeitAsset() { $result } } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Set-SnipeitAssetOwner.ps1 b/SnipeitPS/Public/Set-SnipeitAssetOwner.ps1 index 7035021..825aa7d 100644 --- a/SnipeitPS/Public/Set-SnipeitAssetOwner.ps1 +++ b/SnipeitPS/Public/Set-SnipeitAssetOwner.ps1 @@ -116,4 +116,11 @@ function Set-SnipeitAssetOwner() { return $result } } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Set-SnipeitCategory.ps1 b/SnipeitPS/Public/Set-SnipeitCategory.ps1 index 9d038f2..c234c40 100644 --- a/SnipeitPS/Public/Set-SnipeitCategory.ps1 +++ b/SnipeitPS/Public/Set-SnipeitCategory.ps1 @@ -109,4 +109,11 @@ function Set-SnipeitCategory() { $result } } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Set-SnipeitCompany.ps1 b/SnipeitPS/Public/Set-SnipeitCompany.ps1 index b96a75e..f7c7052 100644 --- a/SnipeitPS/Public/Set-SnipeitCompany.ps1 +++ b/SnipeitPS/Public/Set-SnipeitCompany.ps1 @@ -89,4 +89,10 @@ function Set-SnipeitCompany() { $result } } + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Set-SnipeitComponent.ps1 b/SnipeitPS/Public/Set-SnipeitComponent.ps1 index 4aeb291..bf8b5f2 100644 --- a/SnipeitPS/Public/Set-SnipeitComponent.ps1 +++ b/SnipeitPS/Public/Set-SnipeitComponent.ps1 @@ -129,4 +129,11 @@ function Set-SnipeitComponent() { $result } } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Set-SnipeitConsumable.ps1 b/SnipeitPS/Public/Set-SnipeitConsumable.ps1 index 5b037d8..bf3d773 100644 --- a/SnipeitPS/Public/Set-SnipeitConsumable.ps1 +++ b/SnipeitPS/Public/Set-SnipeitConsumable.ps1 @@ -169,4 +169,11 @@ function Set-SnipeitConsumable() { $result } } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Set-SnipeitCustomField.ps1 b/SnipeitPS/Public/Set-SnipeitCustomField.ps1 index 76557dd..4dd49ad 100644 --- a/SnipeitPS/Public/Set-SnipeitCustomField.ps1 +++ b/SnipeitPS/Public/Set-SnipeitCustomField.ps1 @@ -114,5 +114,11 @@ function Set-SnipeitCustomField() { $result } } + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Set-SnipeitDepartment.ps1 b/SnipeitPS/Public/Set-SnipeitDepartment.ps1 index a11885f..da4b877 100644 --- a/SnipeitPS/Public/Set-SnipeitDepartment.ps1 +++ b/SnipeitPS/Public/Set-SnipeitDepartment.ps1 @@ -105,5 +105,11 @@ function Set-SnipeitDepartment() { $result } } + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Set-SnipeitLicense.ps1 b/SnipeitPS/Public/Set-SnipeitLicense.ps1 index 912a5a4..2eb8abd 100644 --- a/SnipeitPS/Public/Set-SnipeitLicense.ps1 +++ b/SnipeitPS/Public/Set-SnipeitLicense.ps1 @@ -178,4 +178,10 @@ function Set-SnipeitLicense() { $result } } + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Set-SnipeitLicenseSeat.ps1 b/SnipeitPS/Public/Set-SnipeitLicenseSeat.ps1 index 07d1e43..c938847 100644 --- a/SnipeitPS/Public/Set-SnipeitLicenseSeat.ps1 +++ b/SnipeitPS/Public/Set-SnipeitLicenseSeat.ps1 @@ -98,5 +98,12 @@ function Set-SnipeitLicenseSeat() { return $result } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } } diff --git a/SnipeitPS/Public/Set-SnipeitLocation.ps1 b/SnipeitPS/Public/Set-SnipeitLocation.ps1 index fbc3bda..513d382 100644 --- a/SnipeitPS/Public/Set-SnipeitLocation.ps1 +++ b/SnipeitPS/Public/Set-SnipeitLocation.ps1 @@ -143,5 +143,12 @@ function Set-SnipeitLocation() { $result } } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Set-SnipeitManufacturer.ps1 b/SnipeitPS/Public/Set-SnipeitManufacturer.ps1 index cafbbc6..2426441 100644 --- a/SnipeitPS/Public/Set-SnipeitManufacturer.ps1 +++ b/SnipeitPS/Public/Set-SnipeitManufacturer.ps1 @@ -83,4 +83,11 @@ function Set-SnipeitManufacturer() { $result } } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Set-SnipeitModel.ps1 b/SnipeitPS/Public/Set-SnipeitModel.ps1 index daed46a..008dc38 100644 --- a/SnipeitPS/Public/Set-SnipeitModel.ps1 +++ b/SnipeitPS/Public/Set-SnipeitModel.ps1 @@ -112,4 +112,11 @@ function Set-SnipeitModel() { $result } } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Set-SnipeitStatus.ps1 b/SnipeitPS/Public/Set-SnipeitStatus.ps1 index f32826f..dbfa747 100644 --- a/SnipeitPS/Public/Set-SnipeitStatus.ps1 +++ b/SnipeitPS/Public/Set-SnipeitStatus.ps1 @@ -93,4 +93,11 @@ function Set-SnipeitStatus() { $result } } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Set-SnipeitSupplier.ps1 b/SnipeitPS/Public/Set-SnipeitSupplier.ps1 index 6d66d7d..19f01ed 100644 --- a/SnipeitPS/Public/Set-SnipeitSupplier.ps1 +++ b/SnipeitPS/Public/Set-SnipeitSupplier.ps1 @@ -139,5 +139,12 @@ function Set-SnipeitSupplier() { $result } } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/Public/Set-SnipeitUser.ps1 b/SnipeitPS/Public/Set-SnipeitUser.ps1 index 8eda999..55e275b 100644 --- a/SnipeitPS/Public/Set-SnipeitUser.ps1 +++ b/SnipeitPS/Public/Set-SnipeitUser.ps1 @@ -166,4 +166,11 @@ function Set-SnipeitUser() { $result } } + + end { + # reset legacy sessions + if ($PSBoundParameters.ContainsKey('url') -or $PSBoundParameters.ContainsKey('apiKey')) { + Reset-SnipeitPSLegacyApi + } + } } diff --git a/SnipeitPS/SnipeitPS.psm1 b/SnipeitPS/SnipeitPS.psm1 index 5d74c01..4133806 100644 --- a/SnipeitPS/SnipeitPS.psm1 +++ b/SnipeitPS/SnipeitPS.psm1 @@ -5,13 +5,13 @@ Powershell API for Snipeit Asset Management $scriptRoot = $PSScriptRoot + '\Public' Get-ChildItem $scriptRoot *.ps1 | ForEach-Object { - Import-Module $_.FullName + . $_.FullName } $scriptRoot = $PSScriptRoot + '\Private' Get-ChildItem $scriptRoot *.ps1 | ForEach-Object { - Import-Module $_.FullName + . $_.FullName } #Create unprefixed aliases @@ -24,9 +24,3 @@ $SnipeitPSSession = [ordered]@{ } New-Variable -Name SnipeitPSSession -Value $SnipeitPSSession -Scope Script -Force -#Config variable -$SnipeitPSConfig = [ordered]@{ - 'latest' = $null - 'connections' = [ordered]@{} -} -New-Variable -Name SnipeitPSConfig -Value $SnipeitPSConfig -Scope Script -Force