Corrected issue with netscaler protocol scope

Author: dbroeglin

NetScaler/NetScaler.psm1

@@ -18,7 +18,6 @@ limitations under the License.
 Set-StrictMode -Version 3
 
 $script:session = $null
-$script:protocol = $null
 
 # Load DLLs
 #$dll1 = Resolve-Path -Path "$PSScriptRoot\DLL\Newtonsoft.Json.dll"

NetScaler/Private/_InvokeNSRestApi.ps1

@@ -63,9 +63,9 @@ function _InvokeNSRestApi {
     )
 
     if ($Stat) {
-        $uri = "$($Script:protocol)://$($Session.Endpoint)/nitro/v1/stat/$Type"
+        $uri = $Session.CreateUri("stat", $Type)
     } else {
-        $uri = "$($Script:protocol)://$($Session.Endpoint)/nitro/v1/config/$Type"
+        $uri = $Session.CreateUri("config", $Type)
     }
 
     if (-not [string]::IsNullOrEmpty($Resource)) {

NetScaler/Public/Connect-NetScaler.ps1

@@ -71,13 +71,28 @@ function Connect-NetScaler {
         $endpoint = $Hostname
     }
 
-    if ($PSBoundParameters.ContainsKey('Https')) {
-        $Script:protocol = 'https'
+    if ($Https) {
+        $scheme = 'https'
     } else {
-        $script:protocol = 'http'
+        $scheme = 'http'
     }
 
-    Write-Verbose -Message "Connecting to $endpoint..."
+
+    $session = New-Object -TypeName PSObject
+    $session | Add-Member -NotePropertyName Endpoint -NotePropertyValue $endpoint -TypeName String
+    $session | Add-Member -NotePropertyName Scheme   -NotePropertyValue $scheme -TypeName String
+    $session | Add-Member -Name Uri -MemberType ScriptProperty -Value {
+        "$($this.scheme)://$($this.endpoint)/nitro/v1"
+    } 
+    $session | Add-Member -Name CreateUri -MemberType ScriptMethod -Value {
+        Param(
+            [String]$service,
+            [String]$type
+        )
+        "$($this.Uri)/$service/$type"
+    } 
+
+    Write-Verbose -Message "Connecting to $($session.Uri)..."
 
     try {
         $login = @{
@@ -91,7 +106,7 @@ function Connect-NetScaler {
 
         $saveSession = @{}
         $params = @{
-            Uri = "$($Script:protocol)://$endpoint/nitro/v1/config/login"
+            Uri = "$($session.Uri)/config/login"
             Method = 'POST'
             Body = $loginJson
             SessionVariable = 'saveSession'
@@ -108,12 +123,10 @@ function Connect-NetScaler {
         throw $_
     }
 
-    $session = New-Object -TypeName PSObject
-    $session | Add-Member -NotePropertyName Endpoint -NotePropertyValue $endpoint -TypeName String
-    $session | Add-Member -NotePropertyName WebSession  -NotePropertyValue $saveSession -TypeName Microsoft.PowerShell.Commands.WebRequestSession   
-
+    $session | Add-Member -NotePropertyName WebSession -NotePropertyValue $saveSession -TypeName Microsoft.PowerShell.Commands.WebRequestSession
     $script:session = $session
 
+
     if ($PSBoundParameters.ContainsKey('PassThru')) {
         return $session
     }

NetScaler/Public/Disable-NSFeature.ps1

@@ -48,8 +48,8 @@ function Disable-NSFeature {
     param(
         $Session = $script:session,
 
-        [parameter(Mandatory,ValueFromPipeline = $true, ValueFromPipelineByPropertyName)]
-        [string[]]$Name = (Read-Host -Prompt 'NetScaler feature'),
+        [parameter(Mandatory, ValueFromPipeline = $true, ValueFromPipelineByPropertyName)]
+        [string[]]$Name,
 
         [switch]$Force,
 

NetScaler/Public/Disconnect-NetScaler.ps1

@@ -45,7 +45,7 @@ function Disconnect-NetScaler {
     try {
         Write-Verbose -Message 'Logging out of NetScaler'
         $params = @{
-            Uri =  "$($script:protocol)://$($Session.Endpoint)/nitro/v1/config/logout"
+            Uri = $Session.CreateUri("config", "logout")
             Body = ConvertTo-Json -InputObject @{logout = @{}}
             Method = 'POST'
             ContentType = 'application/json'

NetScaler/Public/Restart-NetScaler.ps1

@@ -119,7 +119,7 @@ function Restart-NetScaler {
                         $response = $null
                         try {
                             $params = @{
-                                Uri = "$($script:protocol)://$ip/nitro/v1/config"
+                                Uri = $Session.CreateUri("config")
                                 Method = 'GET'
                                 ContentType = 'application/json'
                                 ErrorVariable = 'connectTestError'

Tests/Unit/Public/Connect-NetScaler.tests.ps1

@@ -29,9 +29,14 @@ describe 'Connect-NetScaler' {
                 $script:session | should not benullorempty
             }
 
+            it 'Connects via HTTP' {
+                Connect-NetScaler -Hostname 'localhost' -Credential $credential
+                $script:session.scheme | should be 'http'
+            }
+
             it 'Connects via HTTPs' {
                 Connect-NetScaler -Hostname 'localhost' -Credential $credential -HTTPs
-                $script:protocol | should be 'https'
+                $script:session.scheme | should be 'https'
             }
         }