From: Nicolas LÅ“uillet Date: Tue, 16 Aug 2016 12:22:43 +0000 (+0200) Subject: Merge pull request #2216 from Rurik19/master X-Git-Tag: 2.0.7~10 X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=2e16a9033930ea33721f9ffba3fb12d145f5d56b;hp=00acc0d0067e22ef3765034b0ea385ca0829ed6a Merge pull request #2216 from Rurik19/master Enable CORS headers for OAUTH part --- diff --git a/app/config/config.yml b/app/config/config.yml index bce38268..30d6de93 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -155,6 +155,11 @@ nelmio_cors: allow_headers: ['X-Custom-Auth'] allow_methods: ['POST', 'PUT', 'GET', 'DELETE'] max_age: 3600 + '^/oauth/': + allow_origin: ['*'] + allow_headers: ['X-Custom-Auth'] + allow_methods: ['POST', 'PUT', 'GET', 'DELETE'] + max_age: 3600 '^/': #origin_regex: true allow_origin: ['^http://localhost:[0-9]+']