Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix casting non-objects against discriminator #551 #552

Merged
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
6 changes: 5 additions & 1 deletion lib/open_api_spex/cast/discriminator.ex
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ defmodule OpenApiSpex.Cast.Discriminator do
end
end

defp cast_discriminator(%_{value: value, schema: schema} = ctx) do
defp cast_discriminator(%_{value: %{} = value, schema: schema} = ctx) do
{discriminator_property, mappings} = discriminator_details(schema)

case value["#{discriminator_property}"] || value[discriminator_property] do
Expand All @@ -53,6 +53,10 @@ defmodule OpenApiSpex.Cast.Discriminator do
end
end

defp cast_discriminator(ctx) do
Cast.error(ctx, {:invalid_type, :object})
end

# When the composite key `allOf` is set we have to cast all the schemas even when the discriminator is set
defp cast_composition(
%_{schema: %{allOf: [_ | _]}} = composite_ctx,
Expand Down
12 changes: 12 additions & 0 deletions test/cast/discriminator_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,18 @@ defmodule OpenApiSpex.CastDiscriminatorTest do
]} = cast(value: input_value, schema: discriminator_schema)
end

test "value is not an object", %{schemas: %{dog: dog, wolf: wolf, cat: cat}} do
input_value = "this is a string but discriminator only works on objects"

discriminator_schema =
build_discriminator_schema([dog, wolf, cat], :anyOf, String.to_atom(@discriminator), nil)

assert {:error, [error]} = cast(value: input_value, schema: discriminator_schema)
assert error.reason == :invalid_type
assert error.type == :object
assert error.value == input_value
end

test "invalid property on discriminator schema", %{
schemas: %{dog: dog, wolf: wolf}
} do
Expand Down