Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/OpenApi/Operation.elm
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,12 @@ deprecated (Operation operation_) =
operation_.deprecated


{-| -}
security : Operation -> List SecurityRequirement
{-| SecurityRequirements the operation specifies (possibly an empty list), or Nothing if the operation does not specify any.

If an operation specifies `security`, the given value (even if it's an empty array) overrides the schema's top-level `security`. This is documented in the OpenAPI specification here: <https://swagger.io/specification/v3/#operation-object>.

-}
security : Operation -> Maybe (List SecurityRequirement)
security (Operation operation_) =
operation_.security

Expand Down
7 changes: 4 additions & 3 deletions src/OpenApi/Types.elm
Original file line number Diff line number Diff line change
Expand Up @@ -1083,7 +1083,7 @@ type alias OperationInternal =
, responses : Dict String (ReferenceOr Response)
, callbacks : Dict String (ReferenceOr Callback)
, deprecated : Bool
, security : List SecurityRequirement
, security : Maybe (List SecurityRequirement)
, servers : List Server
}

Expand Down Expand Up @@ -1116,7 +1116,7 @@ decodeOperation =
|> decodeOptionalDict "responses" (decodeRefOr decodeResponse)
|> Json.Decode.Pipeline.optional "callbacks" (Json.Decode.dict (decodeRefOr decodeCallback)) Dict.empty
|> Json.Decode.Pipeline.optional "deprecated" Json.Decode.bool False
|> Json.Decode.Pipeline.optional "security" (Json.Decode.list decodeSecurityRequirement) []
|> optionalNothing "security" (Json.Decode.list decodeSecurityRequirement)
|> Json.Decode.Pipeline.optional "servers" (Json.Decode.list decodeServer) []
|> Json.Decode.andThen
(\operation ->
Expand All @@ -1140,7 +1140,8 @@ encodeOperation (Operation operation) =
, Just ( "responses", Json.Encode.dict identity (encodeRefOr encodeResponse) operation.responses )
, Internal.maybeEncodeDictField ( "callbacks", identity, encodeRefOr encodeCallback ) operation.callbacks
, Just ( "deprecated", Json.Encode.bool operation.deprecated )
, Internal.maybeEncodeListField ( "security", encodeSecurityRequirement ) operation.security
, operation.security
|> Maybe.map (\security -> ( "security", Json.Encode.list encodeSecurityRequirement security ))
, Internal.maybeEncodeListField ( "servers", encodeServer ) operation.servers
]
|> List.filterMap identity
Expand Down
53 changes: 51 additions & 2 deletions tests/Test/OpenApi/Operation.elm
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module Test.OpenApi.Operation exposing (suite)
import Dict
import Expect
import Json.Decode
import Json.Encode
import OpenApi.Operation
import Test exposing (..)

Expand Down Expand Up @@ -68,8 +69,27 @@ suite =
, test "security" <|
\() ->
decodedOperation
|> Result.map (OpenApi.Operation.security >> List.length)
|> Expect.equal (Ok 1)
|> Result.map (OpenApi.Operation.security >> Maybe.map List.length)
|> Expect.equal (Ok (Just 1))
, test "security = []" <|
\() ->
Json.Decode.decodeString OpenApi.Operation.decode securityIsEmptyArrayExample
|> Result.map OpenApi.Operation.security
|> Expect.equal (Ok (Just []))
, describe "when 'security' is unspecified" <|
[ test "it decodes to Nothing" <|
\() ->
Json.Decode.decodeString OpenApi.Operation.decode securityUnspecifiedExample
|> Result.map OpenApi.Operation.security
|> Expect.equal (Ok Nothing)
, test "it is not encoded" <|
\() ->
Json.Decode.decodeString OpenApi.Operation.decode securityUnspecifiedExample
|> Result.map (OpenApi.Operation.encode >> Json.Encode.encode 0)
|> Result.andThen (Json.Decode.decodeString OpenApi.Operation.decode)
|> Result.map OpenApi.Operation.security
|> Expect.equal (Ok Nothing)
]
, test "servers" <|
\() ->
decodedOperation
Expand Down Expand Up @@ -148,6 +168,35 @@ example =
}"""


securityIsEmptyArrayExample : String
securityIsEmptyArrayExample =
"""{
"summary": "Updates a pet in the store with form data",
"operationId": "updatePetWithForm",
"security": [],
"responses": {
"200": {
"description": "Pet updated.",
"content": {}
}
}
}"""


securityUnspecifiedExample : String
securityUnspecifiedExample =
"""{
"summary": "Updates a pet in the store with form data",
"operationId": "updatePetWithForm",
"responses": {
"200": {
"description": "Pet updated.",
"content": {}
}
}
}"""


failingExample : String
failingExample =
"""{
Expand Down
Loading