aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-08-16 14:22:43 +0200
committerGitHub <noreply@github.com>2016-08-16 14:22:43 +0200
commit2e16a9033930ea33721f9ffba3fb12d145f5d56b (patch)
tree9ac1b865338c873847207330d2a08bde75196586 /app
parent00acc0d0067e22ef3765034b0ea385ca0829ed6a (diff)
parent848c2e1b9750d73113983fef8fcc9055500acfd4 (diff)
downloadwallabag-2e16a9033930ea33721f9ffba3fb12d145f5d56b.tar.gz
wallabag-2e16a9033930ea33721f9ffba3fb12d145f5d56b.tar.zst
wallabag-2e16a9033930ea33721f9ffba3fb12d145f5d56b.zip
Merge pull request #2216 from Rurik19/master
Enable CORS headers for OAUTH part
Diffstat (limited to 'app')
-rw-r--r--app/config/config.yml5
1 files changed, 5 insertions, 0 deletions
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:
155 allow_headers: ['X-Custom-Auth'] 155 allow_headers: ['X-Custom-Auth']
156 allow_methods: ['POST', 'PUT', 'GET', 'DELETE'] 156 allow_methods: ['POST', 'PUT', 'GET', 'DELETE']
157 max_age: 3600 157 max_age: 3600
158 '^/oauth/':
159 allow_origin: ['*']
160 allow_headers: ['X-Custom-Auth']
161 allow_methods: ['POST', 'PUT', 'GET', 'DELETE']
162 max_age: 3600
158 '^/': 163 '^/':
159 #origin_regex: true 164 #origin_regex: true
160 allow_origin: ['^http://localhost:[0-9]+'] 165 allow_origin: ['^http://localhost:[0-9]+']