diff --git a/lib/plausible_web/plugins/api/schemas/error.ex b/lib/plausible_web/plugins/api/schemas/error.ex index 2285f1e8e..6804ef3ff 100644 --- a/lib/plausible_web/plugins/api/schemas/error.ex +++ b/lib/plausible_web/plugins/api/schemas/error.ex @@ -11,6 +11,6 @@ defmodule PlausibleWeb.Plugins.API.Schemas.Error do """, type: :object, required: [:detail], - properties: %{detail: %OpenApiSpex.Schema{type: :string}} + properties: %{detail: %Schema{type: :string}} }) end diff --git a/lib/plausible_web/plugins/api/schemas/goal/list_response.ex b/lib/plausible_web/plugins/api/schemas/goal/list_response.ex index b458d64d3..4d5f433c4 100644 --- a/lib/plausible_web/plugins/api/schemas/goal/list_response.ex +++ b/lib/plausible_web/plugins/api/schemas/goal/list_response.ex @@ -14,15 +14,12 @@ defmodule PlausibleWeb.Plugins.API.Schemas.Goal.ListResponse do items: Schemas.Goal, type: :array }, - meta: %OpenApiSpex.Schema{ + meta: %Schema{ required: [:pagination], - properties: %{ - pagination: %OpenApiSpex.Reference{ - "$ref": "#/components/schemas/PaginationMetadata" - } - }, type: :object, - items: Schemas.PaginationMetadata + properties: %{ + pagination: Schemas.PaginationMetadata + } } } }) diff --git a/lib/plausible_web/plugins/api/schemas/link.ex b/lib/plausible_web/plugins/api/schemas/link.ex index 676687ead..7082b5128 100644 --- a/lib/plausible_web/plugins/api/schemas/link.ex +++ b/lib/plausible_web/plugins/api/schemas/link.ex @@ -8,6 +8,6 @@ defmodule PlausibleWeb.Plugins.API.Schemas.Link do title: "Link", type: :object, required: [:url], - properties: %{url: %OpenApiSpex.Schema{type: :string}} + properties: %{url: %Schema{type: :string}} }) end diff --git a/lib/plausible_web/plugins/api/schemas/not_found.ex b/lib/plausible_web/plugins/api/schemas/not_found.ex index 7d0efd723..0cb8ffcc2 100644 --- a/lib/plausible_web/plugins/api/schemas/not_found.ex +++ b/lib/plausible_web/plugins/api/schemas/not_found.ex @@ -13,7 +13,7 @@ defmodule PlausibleWeb.Plugins.API.Schemas.NotFound do title: "NotFoundError", required: [:errors], properties: %{ - errors: %OpenApiSpex.Schema{ + errors: %Schema{ items: Schemas.Error, type: :array } diff --git a/lib/plausible_web/plugins/api/schemas/pagination_metadata.ex b/lib/plausible_web/plugins/api/schemas/pagination_metadata.ex index 00a3651e7..7df4a1b28 100644 --- a/lib/plausible_web/plugins/api/schemas/pagination_metadata.ex +++ b/lib/plausible_web/plugins/api/schemas/pagination_metadata.ex @@ -10,13 +10,12 @@ defmodule PlausibleWeb.Plugins.API.Schemas.PaginationMetadata do type: :object, required: [:has_next_page, :has_prev_page], properties: %{ - has_next_page: %OpenApiSpex.Schema{type: :boolean}, - has_prev_page: %OpenApiSpex.Schema{type: :boolean}, - links: %OpenApiSpex.Schema{ - items: Schemas.Link, + has_next_page: %Schema{type: :boolean}, + has_prev_page: %Schema{type: :boolean}, + links: %Schema{ properties: %{ - next: %OpenApiSpex.Reference{"$ref": "#/components/schemas/Link"}, - prev: %OpenApiSpex.Reference{"$ref": "#/components/schemas/Link"} + next: Schemas.Link, + prev: Schemas.Link }, type: :object } diff --git a/lib/plausible_web/plugins/api/schemas/payment_required.ex b/lib/plausible_web/plugins/api/schemas/payment_required.ex index ab22e6952..6eb5ee2ce 100644 --- a/lib/plausible_web/plugins/api/schemas/payment_required.ex +++ b/lib/plausible_web/plugins/api/schemas/payment_required.ex @@ -14,7 +14,7 @@ defmodule PlausibleWeb.Plugins.API.Schemas.PaymentRequired do title: "PaymentRequiredError", required: [:errors], properties: %{ - errors: %OpenApiSpex.Schema{ + errors: %Schema{ items: Schemas.Error, type: :array } diff --git a/lib/plausible_web/plugins/api/schemas/shared_link/list_response.ex b/lib/plausible_web/plugins/api/schemas/shared_link/list_response.ex index 87464c463..575fa9860 100644 --- a/lib/plausible_web/plugins/api/schemas/shared_link/list_response.ex +++ b/lib/plausible_web/plugins/api/schemas/shared_link/list_response.ex @@ -14,15 +14,12 @@ defmodule PlausibleWeb.Plugins.API.Schemas.SharedLink.ListResponse do items: Schemas.SharedLink, type: :array }, - meta: %OpenApiSpex.Schema{ + meta: %Schema{ required: [:pagination], - properties: %{ - pagination: %OpenApiSpex.Reference{ - "$ref": "#/components/schemas/PaginationMetadata" - } - }, type: :object, - items: Schemas.PaginationMetadata + properties: %{ + pagination: Schemas.PaginationMetadata + } } } }) diff --git a/lib/plausible_web/plugins/api/schemas/unauthorized.ex b/lib/plausible_web/plugins/api/schemas/unauthorized.ex index ceaf6f724..c1d84e4ea 100644 --- a/lib/plausible_web/plugins/api/schemas/unauthorized.ex +++ b/lib/plausible_web/plugins/api/schemas/unauthorized.ex @@ -13,7 +13,7 @@ defmodule PlausibleWeb.Plugins.API.Schemas.Unauthorized do title: "UnauthorizedError", required: [:errors], properties: %{ - errors: %OpenApiSpex.Schema{ + errors: %Schema{ items: Schemas.Error, type: :array } diff --git a/lib/plausible_web/plugins/api/schemas/unprocessable_entity.ex b/lib/plausible_web/plugins/api/schemas/unprocessable_entity.ex index 76c3db73f..e8109e005 100644 --- a/lib/plausible_web/plugins/api/schemas/unprocessable_entity.ex +++ b/lib/plausible_web/plugins/api/schemas/unprocessable_entity.ex @@ -14,7 +14,7 @@ defmodule PlausibleWeb.Plugins.API.Schemas.UnprocessableEntity do title: "UnprocessableEntityError", required: [:errors], properties: %{ - errors: %OpenApiSpex.Schema{ + errors: %Schema{ items: Schemas.Error, type: :array }