From 2733c1f2a323e069ccb27a6292cbf0732434639e Mon Sep 17 00:00:00 2001 From: tykayn Date: Wed, 28 Apr 2021 16:12:44 +0200 Subject: [PATCH] enable cors --- composer.lock | 143 +----------------- config/packages/nelmio_cors.yaml | 28 +++- config/packages/nelmio_cors.yaml~ | 15 -- public/index.php | 4 +- ...eTraitTrait.php => TimeStampableTrait.php} | 0 5 files changed, 24 insertions(+), 166 deletions(-) delete mode 100755 config/packages/nelmio_cors.yaml~ rename src/Traits/{TimeStampableTraitTrait.php => TimeStampableTrait.php} (100%) diff --git a/composer.lock b/composer.lock index 706f91c..271a45b 100644 --- a/composer.lock +++ b/composer.lock @@ -59,24 +59,6 @@ } ], "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", - "support": { - "issues": "https://github.com/composer/package-versions-deprecated/issues", - "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.1" - }, - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], "time": "2020-11-11T10:22:58+00:00" }, { @@ -229,24 +211,6 @@ "redis", "xcache" ], - "support": { - "issues": "https://github.com/doctrine/cache/issues", - "source": "https://github.com/doctrine/cache/tree/1.10.x" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcache", - "type": "tidelift" - } - ], "time": "2020-07-07T18:54:01+00:00" }, { @@ -312,10 +276,6 @@ "iterators", "php" ], - "support": { - "issues": "https://github.com/doctrine/collections/issues", - "source": "https://github.com/doctrine/collections/tree/1.6.7" - }, "time": "2020-07-27T17:53:49+00:00" }, { @@ -825,24 +785,6 @@ "event system", "events" ], - "support": { - "issues": "https://github.com/doctrine/event-manager/issues", - "source": "https://github.com/doctrine/event-manager/tree/1.1.x" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fevent-manager", - "type": "tidelift" - } - ], "time": "2020-05-29T18:28:51+00:00" }, { @@ -989,24 +931,6 @@ "constructor", "instantiate" ], - "support": { - "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.4.0" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", - "type": "tidelift" - } - ], "time": "2020-11-10T18:47:58+00:00" }, { @@ -1069,24 +993,6 @@ "parser", "php" ], - "support": { - "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/1.2.1" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", - "type": "tidelift" - } - ], "time": "2020-05-25T17:44:05+00:00" }, { @@ -1418,10 +1324,6 @@ "highlight", "sql" ], - "support": { - "issues": "https://github.com/doctrine/sql-formatter/issues", - "source": "https://github.com/doctrine/sql-formatter/tree/1.1.x" - }, "time": "2020-07-30T16:57:33+00:00" }, { @@ -2424,9 +2326,6 @@ "psr", "psr-3" ], - "support": { - "source": "https://github.com/php-fig/log/tree/1.1.3" - }, "time": "2020-03-23T09:12:05+00:00" }, { @@ -2767,7 +2666,6 @@ "suggest": { "symfony/cache-implementation": "" }, - "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -3136,23 +3034,6 @@ ], "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/master" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-09-07T11:33:47+00:00" }, { @@ -6371,10 +6252,6 @@ } ], "description": "JSONP callback validator.", - "support": { - "issues": "https://github.com/willdurand/JsonpCallbackValidator/issues", - "source": "https://github.com/willdurand/JsonpCallbackValidator/tree/master" - }, "time": "2014-01-20T22:35:06+00:00" }, { @@ -6573,24 +6450,6 @@ "Fixture", "persistence" ], - "support": { - "issues": "https://github.com/doctrine/DoctrineFixturesBundle/issues", - "source": "https://github.com/doctrine/DoctrineFixturesBundle/tree/3.4.0" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdoctrine-fixtures-bundle", - "type": "tidelift" - } - ], "time": "2020-11-14T09:36:49+00:00" }, { @@ -6749,5 +6608,5 @@ "ext-iconv": "*" }, "platform-dev": [], - "plugin-api-version": "2.0.0" + "plugin-api-version": "1.1.0" } diff --git a/config/packages/nelmio_cors.yaml b/config/packages/nelmio_cors.yaml index c766508..cc6b9e1 100644 --- a/config/packages/nelmio_cors.yaml +++ b/config/packages/nelmio_cors.yaml @@ -1,10 +1,24 @@ nelmio_cors: defaults: - origin_regex: true - allow_origin: ['%env(CORS_ALLOW_ORIGIN)%'] - allow_methods: ['GET', 'OPTIONS', 'POST', 'PUT', 'PATCH', 'DELETE'] - allow_headers: ['Content-Type', 'Authorization'] - expose_headers: ['Link'] - max_age: 3600 + allow_credentials: false + allow_origin: [] + allow_headers: [] + allow_methods: [] + expose_headers: [] + max_age: 0 + hosts: [] + origin_regex: false + forced_allow_origin_value: ~ paths: - '^/': null + '^/api/': + allow_origin: ['*'] + allow_headers: ['*'] + allow_methods: ['POST', 'PUT', 'GET', 'DELETE', 'OPTIONS'] + max_age: 3600 + '^/': + origin_regex: true + allow_origin: ['^http://localhost:[0-9]+'] + allow_headers: ['*'] + allow_methods: ['POST', 'PUT', 'GET', 'DELETE', 'OPTIONS'] + max_age: 3600 + hosts: ['^api\.'] diff --git a/config/packages/nelmio_cors.yaml~ b/config/packages/nelmio_cors.yaml~ deleted file mode 100755 index d49969b..0000000 --- a/config/packages/nelmio_cors.yaml~ +++ /dev/null @@ -1,15 +0,0 @@ -nelmio_cors: - defaults: - origin_regex: true - allow_origin: ['%env(CORS_ALLOW_ORIGIN)%'] - allow_methods: ['GET', 'OPTIONS', 'POST', 'PUT', 'PATCH', 'DELETE'] - allow_headers: ['Content-Type', 'Authorization'] - expose_headers: ['Link'] - max_age: 3600 - paths: - '^/': null - '^/api/': - allow_origin: ['*'] - allow_headers: ['X-Custom-Auth'] - allow_methods: ['GET', 'OPTIONS', 'POST', 'PUT', 'PATCH', 'DELETE'] - max_age: 3600 diff --git a/public/index.php b/public/index.php index d9cbd04..1eb8fbb 100644 --- a/public/index.php +++ b/public/index.php @@ -6,8 +6,8 @@ use Symfony\Component\HttpFoundation\Request; header( 'Access-Control-Allow-Origin: *' ); - header( "Access-Control-Allow-Headers: X-API-KEY, Origin, X-Requested-With, Content-Type, Accept, Access-Control-Request-Method" ); - header( "Access-Control-Allow-Methods: GET, POST, OPTIONS, PUT, DELETE" ); +// header( "Access-Control-Allow-Headers: X-API-KEY, Origin, X-Requested-With, Content-Type, Accept, Access-Control-Request-Method" ); +// header( "Access-Control-Allow-Methods: GET, POST, OPTIONS, PUT, DELETE" ); header( "Allow: GET, POST, OPTIONS, PUT, DELETE" ); $method = $_SERVER[ 'REQUEST_METHOD' ]; if ( $method == "OPTIONS" ) { diff --git a/src/Traits/TimeStampableTraitTrait.php b/src/Traits/TimeStampableTrait.php similarity index 100% rename from src/Traits/TimeStampableTraitTrait.php rename to src/Traits/TimeStampableTrait.php