discours.io/core
5
0
Fork 0
Code Pull Requests Actions Projects Activity

cors-

Browse Source
This commit is contained in:
tonyrewin 2022-11-28 09:00:54 +03:00
parent 846458373b
commit 0ad7d28c00
2 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
nginx.conf.sigil
View File

@ -5,7 +5,7 @@
{{ $upstream_port := index $port_map_list 2 }} {{ $upstream_port := index $port_map_list 2 }}
map $http_origin $allow_origin { map $http_origin $allow_origin {
~^https?:\/\/((.*\.)?localhost(:\d+)?|discoursio-webapp(-(.*))?\.vercel\.app|(.*\.)?discours\.io)$ $http_origin; ~^https?:\/\/((.*\.)?localhost(:\d+)?|discoursio-webapp-git(.*)?\.vercel\.app|(.*\.)?discours\.io(:\d+)?)$ $http_origin;
default ""; default "";
} }
@ -114,20 +114,37 @@ server {
{{ if $.PROXY_X_FORWARDED_SSL }}proxy_set_header X-Forwarded-Ssl {{ $.PROXY_X_FORWARDED_SSL }};{{ end }} {{ if $.PROXY_X_FORWARDED_SSL }}proxy_set_header X-Forwarded-Ssl {{ $.PROXY_X_FORWARDED_SSL }};{{ end }}
if ($request_method = 'OPTIONS') { if ($request_method = 'OPTIONS') {
add_header Access-Control-Allow-Origin $allow_origin always; add_header 'Access-Control-Allow-Origin' $allow_origin always;
add_header Access-Control-Allow-Methods 'GET, PATCH, POST, OPTIONS'; add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
add_header Access-Control-Allow-Headers 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization' always; #
add_header Access-Control-Allow-Credentials 'true'; # Custom headers and headers various browsers *should* be OK with but aren't
add_header Access-Control-Max-Age 1728000; #
add_header Content-Type 'text/plain; charset=utf-8'; add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization';
add_header Content-Length' 0; add_header 'Access-Control-Allow-Credentials' 'true';
#
# Tell client that this pre-flight info is valid for 20 days
#
add_header 'Access-Control-Max-Age' 1728000;
add_header 'Content-Type' 'text/plain; charset=utf-8';
add_header 'Content-Length' 0;
return 204; return 204;
} }
add_header Access-Control-Allow-Origin $allow_origin always;
add_header Access-Control-Allow-Methods 'GET, PATCH, POST, OPTIONS' always; if ($request_method = 'POST') {
add_header Access-Control-Allow-Headers 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization' always; add_header 'Access-Control-Allow-Origin' $allow_origin always;
add_header Access-Control-Expose-Headers 'Content-Length,Content-Range' always; add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
add_header Access-Control-Allow-Credentials 'true' always; add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization' always;
add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always;
add_header 'Access-Control-Allow-Credentials' 'true' always;
}
if ($request_method = 'GET') {
add_header 'Access-Control-Allow-Origin' $allow_origin always;
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization' always;
add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always;
add_header 'Access-Control-Allow-Credentials' 'true' always;
}
} }
{{ if $.CLIENT_MAX_BODY_SIZE }}client_max_body_size {{ $.CLIENT_MAX_BODY_SIZE }};{{ end }} {{ if $.CLIENT_MAX_BODY_SIZE }}client_max_body_size {{ $.CLIENT_MAX_BODY_SIZE }};{{ end }}

5
resolvers/zine/reactions.py
View File

@ -197,11 +197,10 @@ async def delete_reaction(_, info, rid):
def map_result_item(result_item): def map_result_item(result_item):
reaction = result_item[0] [user, shout, reaction] = result_item
user = result_item[1]
shout = result_item[2]
reaction.createdBy = user reaction.createdBy = user
reaction.shout = shout reaction.shout = shout
reaction.replyTo = reaction
return reaction return reaction