[PS][Experimental] add withHttpInfo support, fix "null" return (OpenA…

…PITools#5811) * add with http support * use full name in tests * using full name in test * skip type check
michaelpro1 · May 7, 2020 · 0c5ae07 · 0c5ae07
1 parent c21fe3c
commit 0c5ae07
Show file tree

Hide file tree

Showing 8 changed files with 284 additions and 68 deletions.
diff --git a/modules/openapi-generator/src/main/resources/powershell-experimental/api.mustache b/modules/openapi-generator/src/main/resources/powershell-experimental/api.mustache
@@ -15,6 +15,10 @@
 {{#description}}{{{description}}}{{/description}}{{^description}}No description available.{{/description}}
 
 {{/allParams}}
+.PARAMETER WithHttpInfo
+
+A switch when turned on will return a hash table of Response, StatusCode and Headers instead of just the Response
+
 .OUTPUTS
 
 {{#returnType}}{{{.}}}{{/returnType}}{{^returnType}}None{{/returnType}}
@@ -26,9 +30,11 @@ function {{{vendorExtensions.x-powershell-method-name}}} {
         [Parameter(Position = {{vendorExtensions.x-index}}{{#-first}}, ValueFromPipeline = $true{{/-first}}, ValueFromPipelineByPropertyName = $true, Mandatory = $false)]
         [{{{vendorExtensions.x-powershell-data-type}}}]
         {{=<% %>=}}
-        ${<%paramName%>}<%^-last%>,<%/-last%>
+        ${<%paramName%>},
         <%={{ }}=%>
     {{/allParams}}
+        [Switch]
+        $WithHttpInfo
     )
 
     Process {
@@ -42,7 +48,7 @@ function {{{vendorExtensions.x-powershell-method-name}}} {
         $LocalVarFormParameters = @{}
         $LocalVarPathParameters = @{}
         $LocalVarCookieParameters = @{}
-        $LocalVarBodyParameter
+        $LocalVarBodyParameter = $null
 
         $Configuration = Get-{{{apiNamePrefix}}}Configuration
         {{#hasProduces}}
@@ -194,7 +200,11 @@ function {{{vendorExtensions.x-powershell-method-name}}} {
                                 -CookieParameters $LocalVarCookieParameters `
                                 -ReturnType "{{#returnType}}{{{.}}}{{/returnType}}"
 
-        return $LocalVarResult["Response"]
+        if ($WithHttpInfo.IsPresent) {
+            return $LocalVarResult
+        } else {
+            return $LocalVarResult["Response"]
+        }
     }
 }
 

diff --git a/modules/openapi-generator/src/main/resources/powershell-experimental/api_client.mustache b/modules/openapi-generator/src/main/resources/powershell-experimental/api_client.mustache
@@ -110,7 +110,7 @@ function Invoke-{{{apiNamePrefix}}}ApiClient {
     return @{
         Response = DeserializeResponse -Response $Response -ReturnType $ReturnType
         StatusCode = $Response.StatusCode
-        Headers = $Response.ResponseHeaders
+        Headers = $Response.Headers
     }
 }