c2cgeoportal-geoportal 2.9.0.208__py3-none-any.whl → 2.9.0.211__py3-none-any.whl

c2cgeoportal_geoportal/__init__.py

@@ -783,6 +783,7 @@ def includeme(config: pyramid.config.Configurator) -> None:
     add_cors_route(config, "/short/create", "shortener")
     config.add_route("shortener_create", "/short/create", request_method="POST")
     config.add_route("shortener_get", "/s/{ref}", request_method="GET")
+    config.add_route("shortener_fetch", "/short/get/{ref}", request_method="GET")
 
     # Geometry processing
     config.add_route("difference", "/difference", request_method="POST")

c2cgeoportal_geoportal/views/shortener.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2024, Camptocamp SA
+# Copyright (c) 2013-2025, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -46,7 +46,7 @@ logger = logging.getLogger(__name__)
 
 
 class Shortener:
-    """All the views conserne the shortener."""
+    """All the views concern the shortener."""
 
     def __init__(self, request: pyramid.request.Request):
         self.request = request
@@ -55,8 +55,7 @@ class Shortener:
         if "base_url" in self.settings:
             self.short_bases.append(self.settings["base_url"])
 
-    @view_config(route_name="shortener_get")  # type: ignore[misc]
-    def get(self) -> HTTPFound:
+    def _read(self) -> str:
         assert DBSession is not None
 
         ref = self.request.matchdict["ref"]
@@ -68,8 +67,19 @@ class Shortener:
         short_urls[0].nb_hits += 1
         short_urls[0].last_hit = datetime.now()
 
+        return short_urls[0].url
+
+    @view_config(route_name="shortener_get")  # type: ignore[misc]
+    def get(self) -> HTTPFound:
+        long_url = self._read()
+        set_common_headers(self.request, "shortener", Cache.PUBLIC_NO)
+        return HTTPFound(location=long_url)
+
+    @view_config(route_name="shortener_fetch", renderer="json")  # type: ignore[misc]
+    def fetch(self) -> dict[str, str]:
+        long_url = self._read()
         set_common_headers(self.request, "shortener", Cache.PUBLIC_NO)
-        return HTTPFound(location=short_urls[0].url)
+        return {"long_url": long_url}
 
     @view_config(route_name="shortener_create", renderer="json")  # type: ignore[misc]
     def create(self) -> dict[str, str]:

{c2cgeoportal_geoportal-2.9.0.208.dist-info → c2cgeoportal_geoportal-2.9.0.211.dist-info}/METADATA

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

{c2cgeoportal_geoportal-2.9.0.208.dist-info → c2cgeoportal_geoportal-2.9.0.211.dist-info}/RECORD

@@ -1,4 +1,4 @@
-c2cgeoportal_geoportal/__init__.py,sha256=DMoU-3sCR_yJb-dCddKrLfVA3MKiel8fy7byGBHbM5w,39988
+c2cgeoportal_geoportal/__init__.py,sha256=hPoVL78ef1gwRn_thABVX63JpQ8huWorCJ6N4LtoR50,40070
 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
@@ -170,7 +170,7 @@ c2cgeoportal_geoportal/views/profile.py,sha256=tVQxJ3_eS5HcDCzQm5Loq5WEH62GtMc--
 c2cgeoportal_geoportal/views/proxy.py,sha256=XxOGR8Snqrd1CKkUiK4IjavCR8PiUsd3tlEM9lZE9TI,10468
 c2cgeoportal_geoportal/views/raster.py,sha256=kY6rYo4SxQP9JLbsq3_kdWdbaTVkdQDdpjrG9lUtAIM,9242
 c2cgeoportal_geoportal/views/resourceproxy.py,sha256=pcHwU6hAXHeh_Ef6tuHxpRzGje8nqVKUxyZwZKOPCjI,3189
-c2cgeoportal_geoportal/views/shortener.py,sha256=t-05vHSbsp6aIYV6fKk-ic6Zo45TLePIlGnPAzwrzQU,6179
+c2cgeoportal_geoportal/views/shortener.py,sha256=7_yQYPhtm-ddCLILnh2c0_WCgUq1D3bLhgyscGuTGUg,6530
 c2cgeoportal_geoportal/views/theme.py,sha256=npI1Z-Z3304ZrLDnCOwxbQGTA0D9AsTr70VIEpJ1lVY,55862
 c2cgeoportal_geoportal/views/tinyowsproxy.py,sha256=_wPN1Vfo4RNcCQ1xRPU_funie7mDPocL-ox_4hlF1-Y,8178
 c2cgeoportal_geoportal/views/vector_tiles.py,sha256=2bF3j6WvOpXAJULsEfy7pfeUBeKVheMlcUOWzHVow90,3575
@@ -187,8 +187,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.9.0.208.dist-info/METADATA,sha256=9WA_Fvubbi9XWdlgBXBFX0R695i1mfPaGlogWD9tPPM,1923
-c2cgeoportal_geoportal-2.9.0.208.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-c2cgeoportal_geoportal-2.9.0.208.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
-c2cgeoportal_geoportal-2.9.0.208.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
-c2cgeoportal_geoportal-2.9.0.208.dist-info/RECORD,,
+c2cgeoportal_geoportal-2.9.0.211.dist-info/METADATA,sha256=0WHKUVSglzb3pHkxu3H9j4hqzJPSTfajD8kC1HN1KBk,1923
+c2cgeoportal_geoportal-2.9.0.211.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+c2cgeoportal_geoportal-2.9.0.211.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
+c2cgeoportal_geoportal-2.9.0.211.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
+c2cgeoportal_geoportal-2.9.0.211.dist-info/RECORD,,