Merge branch 'develop'

Develop

CHANGELOG.md

@@ -1,5 +1,11 @@
 ## CHANGELOG
 
+### 1.2.1
+
+**Bugs**
+
+* [62: Fix cross-domain requests in REST API](https://github.com/acelaya/url-shortener/issues/62)
+
 ### 1.2.0
 
 **Features**

build.sh

@@ -40,5 +40,5 @@ rm -rf config/autoload/{{,*.}local.php{,.dist},.gitignore}
 
 # Compressing file
 rm -f "${projectdir}"/build/shlink_${version}_dist.zip
-zip -r "${projectdir}"/build/shlink_${version}_dist.zip .
+zip -ry "${projectdir}"/build/shlink_${version}_dist.zip .
 rm -rf "${builtcontent}"

module/Rest/config/middleware-pipeline.config.php

@@ -7,9 +7,9 @@ return [
         'rest' => [
             'path' => '/rest',
             'middleware' => [
+                Middleware\CrossDomainMiddleware::class,
                 Middleware\BodyParserMiddleware::class,
                 Middleware\CheckAuthenticationMiddleware::class,
-                Middleware\CrossDomainMiddleware::class,
             ],
             'priority' => 5,
         ],