Merge pull request #580 from Badgerati/Issue-578

Fixes 2 bugs in the OpenAPI functions
Badgerati · Jun 25, 2020 · cd17848 · cd17848
2 parents 7134d80 + 0c20620
commit cd17848
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 17 deletions.
diff --git a/examples/web-rest-openapi-shared.ps1 b/examples/web-rest-openapi-shared.ps1
@@ -30,6 +30,10 @@ Start-PodeServer {
         ))
     }
 
+    New-PodeOAIntProperty -Name 'userId' -Required |
+        ConvertTo-PodeOAParameter -In Path |
+        Add-PodeOAComponentParameter -Name 'UserId'
+
 
     Get-PodeAuthMiddleware -Name 'Validate' -Sessionless | Add-PodeMiddleware -Name 'AuthMiddleware' -Route '/api/*'
     Set-PodeOAGlobalAuth -Name 'Validate'
@@ -55,7 +59,7 @@ Start-PodeServer {
     } -PassThru |
         Set-PodeOARouteInfo -Summary 'A cool summary' -Tags 'Users' -PassThru |
         Set-PodeOARequest -Parameters @(
-            (New-PodeOAIntProperty -Name 'userId' -Required | ConvertTo-PodeOAParameter -In Path)
+            (ConvertTo-PodeOAParameter -Reference 'UserId')
         ) -PassThru |
         Add-PodeOAResponse -StatusCode 200 -Reference 'OK'
 

diff --git a/src/Private/Context.ps1 b/src/Private/Context.ps1
@@ -237,18 +237,7 @@ function New-PodeContext
     $ctx.Server.Sessions = @{}
 
     # swagger and openapi
-    $ctx.Server.OpenAPI = @{
-        Path = $null
-        Title = $null
-        components = @{
-            schemas = @{}
-            responses = @{}
-            securitySchemas = @{}
-            requestBodies = @{}
-            parameters = @{}
-        }
-        security = @()
-    }
+    $ctx.Server.OpenAPI = Get-PodeOABaseObject
 
     # server metrics
     $ctx.Metrics = @{

diff --git a/src/Private/OpenApi.ps1 b/src/Private/OpenApi.ps1
@@ -342,4 +342,20 @@ function ConvertTo-PodeOAPropertyFromCmdletParameter
     }
 
     New-PodeOAStringProperty -Name $Parameter.Name
+}
+
+function Get-PodeOABaseObject
+{
+    return @{
+        Path = $null
+        Title = $null
+        components = @{
+            schemas = @{}
+            responses = @{}
+            securitySchemas = @{}
+            requestBodies = @{}
+            parameters = @{}
+        }
+        security = @()
+    }
 }
diff --git a/src/Private/Server.ps1 b/src/Private/Server.ps1
@@ -142,7 +142,7 @@ function Restart-PodeInternalServer
         $PodeContext.Server.Endpoints = @()
 
         # clear openapi
-        $PodeContext.Server.OpenAPI.Clear()
+        $PodeContext.Server.OpenAPI = Get-PodeOABaseObject
 
         # clear the sockets
         $PodeContext.Server.Sockets.Listeners = @()

diff --git a/src/Public/OpenApi.ps1 b/src/Public/OpenApi.ps1
@@ -575,7 +575,7 @@ function New-PodeOARequestBody
                 throw "The OpenApi component request body doesn't exist: $($Reference)"
             }
 
-            return = @{
+            return @{
                 '$ref' = "#/components/requestBodies/$($Reference)"
             }
         }
@@ -700,7 +700,7 @@ function Add-PodeOAComponentParameter
         $Name = $Parameter.name
     }
 
-    $PodeContext.Server.OpenAPI.components.responses[$Name] = $Parameter
+    $PodeContext.Server.OpenAPI.components.parameters[$Name] = $Parameter
 }
 
 <#
@@ -1252,7 +1252,7 @@ function ConvertTo-PodeOAParameter
             throw "The OpenApi component request parameter doesn't exist: $($Reference)"
         }
 
-        return = @{
+        return @{
             '$ref' = "#/components/parameters/$($Reference)"
         }
     }