jeff/umap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1689 from umap-project/cors-headers

Browse source 
Set CORS-related header for oEmbed and map views
This commit is contained in:
David Larlet 2024-03-13 14:12:15 -04:00 committed by GitHub
commit 95ce3467ce
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
umap/tests/test_map_views.py
View file

@ -148,6 +148,13 @@ def test_should_not_consider_the_query_string_for_canonical_check(client, map):
assert response.status_code == 200 assert response.status_code == 200
def test_map_headers(client, map):
url = reverse("map", kwargs={"map_id": map.pk, "slug": map.slug})
response = client.get(url)
assert response.status_code == 200
assert response.headers["Access-Control-Allow-Origin"] == "*"
def test_short_url_should_redirect_to_canonical(client, map): def test_short_url_should_redirect_to_canonical(client, map):
url = reverse("map_short_url", kwargs={"pk": map.pk}) url = reverse("map_short_url", kwargs={"pk": map.pk})
canonical = reverse("map", kwargs={"map_id": map.pk, "slug": map.slug}) canonical = reverse("map", kwargs={"map_id": map.pk, "slug": map.slug})
@ -804,6 +811,7 @@ def test_oembed_map(client, map, datalayer):
url = f"{reverse('map_oembed')}?url=http://testserver{map.get_absolute_url()}" url = f"{reverse('map_oembed')}?url=http://testserver{map.get_absolute_url()}"
response = client.get(url) response = client.get(url)
assert response.status_code == 200 assert response.status_code == 200
assert response.headers["Access-Control-Allow-Origin"] == "*"
j = json.loads(response.content.decode()) j = json.loads(response.content.decode())
assert j["type"] == "rich" assert j["type"] == "rich"
assert j["version"] == "1.0" assert j["version"] == "1.0"

8
umap/views.py
View file

@ -615,7 +615,9 @@ class MapView(MapDetailMixin, PermissionsMixin, DetailView):
if request.META.get("QUERY_STRING"): if request.META.get("QUERY_STRING"):
canonical = "?".join([canonical, request.META["QUERY_STRING"]]) canonical = "?".join([canonical, request.META["QUERY_STRING"]])
return HttpResponsePermanentRedirect(canonical) return HttpResponsePermanentRedirect(canonical)
return super(MapView, self).get(request, *args, **kwargs) response = super(MapView, self).get(request, *args, **kwargs)
response["Access-Control-Allow-Origin"] = "*"
return response
def get_canonical_url(self): def get_canonical_url(self):
return self.object.get_absolute_url() return self.object.get_absolute_url()
@ -724,7 +726,9 @@ class MapOEmbed(View):
f'<p><a href="//{netloc}{map_url}">{label}</a></p>' f'<p><a href="//{netloc}{map_url}">{label}</a></p>'
) )
data["html"] = html data["html"] = html
return simple_json_response(**data) response = simple_json_response(**data)
response["Access-Control-Allow-Origin"] = "*"
return response
class MapViewGeoJSON(MapView): class MapViewGeoJSON(MapView):