From 6c37905c1582a1a26bdb7a6d40944159eba078f0 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Fri, 29 Nov 2019 19:24:04 +0100 Subject: [PATCH] Fixed cross-domain headers being lost when ProblemDetailsMiddleware throws an error --- config/autoload/middleware-pipeline.global.php | 2 +- docs/swagger/paths/v1_short-urls.json | 2 +- docs/swagger/paths/v1_short-urls_{shortCode}.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/autoload/middleware-pipeline.global.php b/config/autoload/middleware-pipeline.global.php index f3370a7a..35a9a16b 100644 --- a/config/autoload/middleware-pipeline.global.php +++ b/config/autoload/middleware-pipeline.global.php @@ -20,6 +20,7 @@ return [ 'error-handler-rest' => [ 'path' => '/rest', 'middleware' => [ + Rest\Middleware\CrossDomainMiddleware::class, Rest\Middleware\BackwardsCompatibleProblemDetailsMiddleware::class, ProblemDetails\ProblemDetailsMiddleware::class, ], @@ -47,7 +48,6 @@ return [ 'rest' => [ 'path' => '/rest', 'middleware' => [ - Rest\Middleware\CrossDomainMiddleware::class, Expressive\Router\Middleware\ImplicitOptionsMiddleware::class, Rest\Middleware\BodyParserMiddleware::class, Rest\Middleware\AuthenticationMiddleware::class, diff --git a/docs/swagger/paths/v1_short-urls.json b/docs/swagger/paths/v1_short-urls.json index a8bf0368..d0aebfec 100644 --- a/docs/swagger/paths/v1_short-urls.json +++ b/docs/swagger/paths/v1_short-urls.json @@ -271,7 +271,7 @@ "type": "object", "allOf": [ { - "$ref": "./Error.json" + "$ref": "../definitions/Error.json" }, { "type": "object", diff --git a/docs/swagger/paths/v1_short-urls_{shortCode}.json b/docs/swagger/paths/v1_short-urls_{shortCode}.json index 1588d71c..95532868 100644 --- a/docs/swagger/paths/v1_short-urls_{shortCode}.json +++ b/docs/swagger/paths/v1_short-urls_{shortCode}.json @@ -154,7 +154,7 @@ "type": "object", "allOf": [ { - "$ref": "./Error.json" + "$ref": "../definitions/Error.json" }, { "type": "object",