c2cgeoportal-geoportal 2.9rc11__py3-none-any.whl → 2.9rc14__py3-none-any.whl

c2cgeoportal_geoportal/__init__.py

@@ -738,6 +738,7 @@ def includeme(config: pyramid.config.Configurator) -> None:
     c2cgeoportal_geoportal.views.add_redirect(config, "apihelp_redirect", "/apihelp.html", "apihelp.html")
 
     config.add_route("themes", "/themes", request_method="GET", pregenerator=C2CPregenerator(role=True))
+    add_cors_route(config, "/themes", "themes")
 
     config.add_route("invalidate", "/invalidate", request_method="GET")
 

c2cgeoportal_geoportal/lib/common_headers.py

@@ -63,7 +63,12 @@ def _set_cors_headers(
     credentials: bool,
 ) -> None:
     """Handle CORS requests, as specified in https://www.w3.org/TR/cors/."""
-    response.vary = (response.vary or ()) + ("Origin",)
+    response.vary = (
+        *(response.vary or ()),
+        "Origin",
+        "Access-Control-Request-Headers",
+        *(("Access-Control-Request-Method",) if request.method == "OPTIONS" else ()),
+    )
 
     if "Origin" not in request.headers:
         return  # Not a CORS request if this header is missing

c2cgeoportal_geoportal/views/theme.py

@@ -985,18 +985,18 @@ class Theme:
         assert models.DBSession is not None
         tasks = set()
 
-        for ogc_server in models.DBSession.query(main.OGCServer).all():
+        for ogc_server, nb_layers in (
+            models.DBSession.query(
+                main.OGCServer, sqlalchemy.func.count(main.LayerWMS.id)  # pylint: disable=not-callable
+            )
+            .filter(main.LayerWMS.ogc_server_id == main.OGCServer.id)
+            .group_by(main.OGCServer.id)
+            .all()
+        ):
             # Don't load unused OGC servers, required for landing page, because the related OGC server
             # will be on error in those functions.
-            nb_layers = (
-                models.DBSession.query(
-                    sqlalchemy.func.count(main.LayerWMS.id)  # pylint: disable=not-callable
-                )
-                .filter(main.LayerWMS.ogc_server_id == ogc_server.id)
-                .one()
-            )
-            _LOG.debug("%i layers for OGC server '%s'", nb_layers[0], ogc_server.name)
-            if nb_layers[0] > 0:
+            _LOG.debug("%i layers for OGC server '%s'", nb_layers, ogc_server.name)
+            if nb_layers > 0:
                 _LOG.debug("Preload OGC server '%s'", ogc_server.name)
                 url_internal_wfs, _, _ = self.get_url_internal_wfs(ogc_server, errors)
                 if url_internal_wfs is not None:
@@ -1143,15 +1143,15 @@ class Theme:
                 _LOG.info("Do preload in %.3fs.", time.time() - start_time)
             _LOG.debug("Run garbage collection: %s", ", ".join([str(gc.collect(n)) for n in range(3)]))
             result["ogcServers"] = {}
-            for ogc_server in models.DBSession.query(main.OGCServer).all():
-                nb_layers = (
-                    models.DBSession.query(
-                        sqlalchemy.func.count(main.LayerWMS.id)  # pylint: disable=not-callable
-                    )
-                    .filter(main.LayerWMS.ogc_server_id == ogc_server.id)
-                    .one()
+            for ogc_server, nb_layers in (
+                models.DBSession.query(
+                    main.OGCServer, sqlalchemy.func.count(main.LayerWMS.id)  # pylint: disable=not-callable
                 )
-                if nb_layers[0] == 0:
+                .filter(main.LayerWMS.ogc_server_id == main.OGCServer.id)
+                .group_by(main.OGCServer.id)
+                .all()
+            ):
+                if nb_layers == 0:
                     # QGIS Server landing page requires an OGC server that can't be used here.
                     continue
 
@@ -1190,7 +1190,7 @@ class Theme:
                             if name in attributes:
                                 del attributes[name]
 
-                result["ogcServers"][ogc_server.name] = {  # type: ignore[call-overload]
+                result["ogcServers"][ogc_server.name] = {
                     "url": url.url() if url else None,
                     "urlWfs": url_wfs.url() if url_wfs else None,
                     "type": ogc_server.type,

{c2cgeoportal_geoportal-2.9rc11.dist-info → c2cgeoportal_geoportal-2.9rc14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: c2cgeoportal-geoportal
-Version: 2.9rc11
+Version: 2.9rc14
 Summary: c2cgeoportal geoportal
 Home-page: https://github.com/camptocamp/c2cgeoportal/
 Author: Camptocamp

{c2cgeoportal_geoportal-2.9rc11.dist-info → c2cgeoportal_geoportal-2.9rc14.dist-info}/RECORD

@@ -1,4 +1,4 @@
-c2cgeoportal_geoportal/__init__.py,sha256=Te7K9wopbz8ehFtjy_OW30BnTg5Sk_XD94Gws_1740M,39215
+c2cgeoportal_geoportal/__init__.py,sha256=vP3TAy-iFzxLhpfc8IPJICbKaKOLB6wn0u6YiXJk_yQ,39263
 c2cgeoportal_geoportal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 c2cgeoportal_geoportal/resources.py,sha256=n42Gns8DKw32GstDoUdNgud6xdAidaRwgAuNHqGH-c4,2158
 c2cgeoportal_geoportal/lib/__init__.py,sha256=_67fO_aXQZRnxPXcShHBcs38mdYU5ch0FNX89RwMTgA,10431
@@ -8,7 +8,7 @@ c2cgeoportal_geoportal/lib/cacheversion.py,sha256=8ETNA02fh7AX39pNAkDrEJsCmPXVzY
 c2cgeoportal_geoportal/lib/caching.py,sha256=BZzIjgEUfv7puP8XvWY6PAni7HybcLMZrGam3D3mCyA,7124
 c2cgeoportal_geoportal/lib/check_collector.py,sha256=98N43jvjzCOh19Agipf8varCD9S9I9V8XYQcrSujv0k,3396
 c2cgeoportal_geoportal/lib/checker.py,sha256=QLe0SUzfSwKYQFpGgFecWkJJlVjA1O2phwf-FvQQOUc,12547
-c2cgeoportal_geoportal/lib/common_headers.py,sha256=IYMMo1IT33o83h79_9yN2Ol6fqqIEHaXPTBzLkYX8go,6472
+c2cgeoportal_geoportal/lib/common_headers.py,sha256=iVm54HUQT81KqXEa3mkzywFbjoAwAG-_oNIkJQjPPHA,6622
 c2cgeoportal_geoportal/lib/dbreflection.py,sha256=viQotACmEAoLtJYHhQqAtcT3UQUvNVz9P_MlRCKgR9g,9759
 c2cgeoportal_geoportal/lib/filter_capabilities.py,sha256=nah7A3A_m87M5lSXcw3HRaEnHMCLnXcwTQ3PdoGN4js,14343
 c2cgeoportal_geoportal/lib/fulltextsearch.py,sha256=DrqO51QbDp56VpZa__2-8vp8U39izvLpyGhRCLTCaYc,2265
@@ -169,12 +169,12 @@ c2cgeoportal_geoportal/views/proxy.py,sha256=BCjFtnsrIQ2U30wk08YFLyt3Cq0yX3Rtwv5
 c2cgeoportal_geoportal/views/raster.py,sha256=94rMGBQ7zHTvlKewBl-18LdoYRdLjW4880XlODDvhsE,7535
 c2cgeoportal_geoportal/views/resourceproxy.py,sha256=S8PEqBpeJKsoLJlzA5lsqQoVDvh8pu5FEPh4OhJQU0Y,3183
 c2cgeoportal_geoportal/views/shortener.py,sha256=54HNEDpueIdsKIpbWuk1MDpFC2gyo01MoAXc0uMVcl8,6167
-c2cgeoportal_geoportal/views/theme.py,sha256=jVp5DWObPL4YGJRDetbzL4iBx1V-E0goag9uCEhZFvs,55966
+c2cgeoportal_geoportal/views/theme.py,sha256=aX2v3p9R9be7u4YL_avHQ7ixQKO7FRMDinxiNzY4MSA,55884
 c2cgeoportal_geoportal/views/tinyowsproxy.py,sha256=ydq3mKFd_KeQ0DG5ct59BlcIY8_2rsMAtGrAFE0407g,7916
 c2cgeoportal_geoportal/views/vector_tiles.py,sha256=t_pZ4l6JpispZFr42EodcDIwAwG2q-MX12yI03w7Y6I,3569
 tests/__init__.py,sha256=KxmbgvRWDSJoEDH1cXnDIjbfBsgCzs2KdkTPuzYMq84,3826
 tests/test_cachebuster.py,sha256=asI1X_qI0MGklYuKuWyqvCPVbvhQcUe4fX91Dk-hUsE,2923
-tests/test_caching.py,sha256=8exM2zAPPIoJLalFi8l3e1KA_l2WSwWGjTXDYN_tC9o,12493
+tests/test_caching.py,sha256=pqY7j9UyWei4MwP3IuXgrtivoEg1vxC_ORFrl_HRFPM,13126
 tests/test_checker.py,sha256=NaU6Ejg9XbwS2cwqXCtz5mJPRdBIPZb3d1MkXVufr0k,3638
 tests/test_decimaljson.py,sha256=CQrkqWs66kmq1iYur5kjzKhvdhw9b4TMcKEsuVayxA4,2223
 tests/test_headerstween.py,sha256=3PkfTbsUq2C7fEsckO_4aYu9-XGBSeOgf86ENSqx76o,2524
@@ -185,8 +185,8 @@ tests/test_mapserverproxy_route_predicate.py,sha256=SzILSSzIuilzIkUYVPZiVzLwW1du
 tests/test_raster.py,sha256=82NJ2MXgZlMqs0ytN-VgNw376iURdk4PkAg__dyh5ns,11948
 tests/test_wmstparsing.py,sha256=xjA8nJuXFl3H5Bfs4sJw_8qX8E8qvAALK7Hs2-DTP2A,9054
 tests/xmlstr.py,sha256=rkTKSU4FGjupBKLx75H8o-goB0KbQrxDvdpc6xVX_uQ,5985
-c2cgeoportal_geoportal-2.9rc11.dist-info/METADATA,sha256=eYjUQAmiBf6Ny6ETtc2qcJAX45ctlFyb5HDstOe8s24,1886
-c2cgeoportal_geoportal-2.9rc11.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-c2cgeoportal_geoportal-2.9rc11.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
-c2cgeoportal_geoportal-2.9rc11.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
-c2cgeoportal_geoportal-2.9rc11.dist-info/RECORD,,
+c2cgeoportal_geoportal-2.9rc14.dist-info/METADATA,sha256=N0gNOJgnMq9vKahtWBVyNg4o9Tl56IVUbK2p_563Eow,1886
+c2cgeoportal_geoportal-2.9rc14.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+c2cgeoportal_geoportal-2.9rc14.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
+c2cgeoportal_geoportal-2.9rc14.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
+c2cgeoportal_geoportal-2.9rc14.dist-info/RECORD,,

tests/test_caching.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2023, Camptocamp SA
+# Copyright (c) 2015-2024, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -64,7 +64,7 @@ class TestSetCorsHeaders(TestCase):
             "Cache-Control": "max-age=10, public",
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
-            "Vary": "Origin, Cookie",
+            "Vary": "Origin, Access-Control-Request-Headers, Cookie",
         }
 
         # 2. If the value of the Origin header is not a case-sensitive match for
@@ -74,7 +74,7 @@ class TestSetCorsHeaders(TestCase):
             "Cache-Control": "max-age=10, public",
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
-            "Vary": "Origin, Cookie",
+            "Vary": "Origin, Access-Control-Request-Headers, Cookie",
         }
 
         # 3. If the resource supports credentials add a single
@@ -85,7 +85,7 @@ class TestSetCorsHeaders(TestCase):
             "Cache-Control": "max-age=10, public",
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
-            "Vary": "Origin, Cookie",
+            "Vary": "Origin, Access-Control-Request-Headers, Cookie",
             "Access-Control-Max-Age": self.MAX_AGE,
             "Access-Control-Allow-Origin": self.ORIGIN2,
             "Access-Control-Allow-Methods": CORS_METHODS,
@@ -110,7 +110,7 @@ class TestSetCorsHeaders(TestCase):
         assert self._do("OPTIONS", {"Access-Control-Request-Method": "GET"}) == {
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
-            "Vary": "Origin",
+            "Vary": "Origin, Access-Control-Request-Headers, Access-Control-Request-Method",
         }
 
         # 2. If the value of the Origin header is not a case-sensitive match for
@@ -119,7 +119,7 @@ class TestSetCorsHeaders(TestCase):
         assert self._do("OPTIONS", {"Origin": "http://foe.com", "Access-Control-Request-Method": "GET"}) == {
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
-            "Vary": "Origin",
+            "Vary": "Origin, Access-Control-Request-Headers, Access-Control-Request-Method",
         }
 
         # 3. If there is no Access-Control-Request-Method header or if parsing
@@ -128,7 +128,7 @@ class TestSetCorsHeaders(TestCase):
         assert self._do("OPTIONS", {"Origin": self.ORIGIN1}) == {
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
-            "Vary": "Origin",
+            "Vary": "Origin, Access-Control-Request-Headers, Access-Control-Request-Method",
         }
 
         # 4. If there are no Access-Control-Request-Headers headers let header
@@ -136,7 +136,7 @@ class TestSetCorsHeaders(TestCase):
         assert self._do("OPTIONS", {"Origin": self.ORIGIN1, "Access-Control-Request-Method": "GET"}) == {
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
-            "Vary": "Origin",
+            "Vary": "Origin, Access-Control-Request-Headers, Access-Control-Request-Method",
             "Access-Control-Allow-Origin": self.ORIGIN1,
             "Access-Control-Max-Age": self.MAX_AGE,
             "Access-Control-Allow-Methods": CORS_METHODS,
@@ -162,7 +162,7 @@ class TestSetCorsHeaders(TestCase):
         ) == {
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
-            "Vary": "Origin",
+            "Vary": "Origin, Access-Control-Request-Headers, Access-Control-Request-Method",
             "Access-Control-Allow-Origin": self.ORIGIN1,
             "Access-Control-Allow-Credentials": "true",
             "Access-Control-Max-Age": self.MAX_AGE,
@@ -191,7 +191,7 @@ class TestSetCorsHeaders(TestCase):
         ) == {
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
-            "Vary": "Origin",
+            "Vary": "Origin, Access-Control-Request-Headers, Access-Control-Request-Method",
             "Access-Control-Allow-Origin": self.ORIGIN1,
             "Access-Control-Max-Age": self.MAX_AGE,
             "Access-Control-Allow-Methods": CORS_METHODS,
@@ -205,7 +205,7 @@ class TestSetCorsHeaders(TestCase):
             "Cache-Control": "max-age=10, public",
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
-            "Vary": "Origin, Cookie",
+            "Vary": "Origin, Access-Control-Request-Headers, Cookie",
         }
 
     def test_match_all(self):
@@ -220,7 +220,7 @@ class TestSetCorsHeaders(TestCase):
             "Cache-Control": "max-age=10, public",
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
-            "Vary": "Origin, Cookie",
+            "Vary": "Origin, Access-Control-Request-Headers, Cookie",
             "Access-Control-Max-Age": self.MAX_AGE,
             "Access-Control-Allow-Origin": self.ORIGIN1,
             "Access-Control-Allow-Methods": CORS_METHODS,
@@ -233,7 +233,7 @@ class TestSetCorsHeaders(TestCase):
             "Cache-Control": "max-age=10, public",
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
-            "Vary": "Origin, Cookie",
+            "Vary": "Origin, Access-Control-Request-Headers, Cookie",
             "Access-Control-Max-Age": self.MAX_AGE,
             "Access-Control-Allow-Origin": "*",
             "Access-Control-Allow-Methods": CORS_METHODS,
@@ -252,7 +252,7 @@ class TestSetCorsHeaders(TestCase):
         ) == {
             "Content-Length": "0",
             "Content-Type": "text/html; charset=UTF-8",
-            "Vary": "Origin",
+            "Vary": "Origin, Access-Control-Request-Headers, Access-Control-Request-Method",
             "Access-Control-Allow-Origin": "*",
             "Access-Control-Max-Age": self.MAX_AGE,
             "Access-Control-Allow-Methods": CORS_METHODS,