c2cgeoportal-geoportal 2.9.0.174__py3-none-any.whl → 2.9.0.180__py3-none-any.whl

c2cgeoportal_geoportal/__init__.py

@@ -42,10 +42,8 @@ import c2cwsgiutils.db
 import c2cwsgiutils.index
 import dateutil.parser
 import pyramid.config
-import pyramid.renderers
 import pyramid.request
 import pyramid.response
-import pyramid.security
 import sqlalchemy
 import sqlalchemy.orm
 import zope.event.classhandler

c2cgeoportal_geoportal/lib/oidc.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2024, Camptocamp SA
+# Copyright (c) 2024-2025, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -28,6 +28,7 @@
 import datetime
 import json
 import logging
+import string
 from typing import TYPE_CHECKING, Any, NamedTuple, Optional, TypedDict, Union
 
 import pyramid.request
@@ -77,7 +78,7 @@ def get_oidc_client(request: pyramid.request.Request, host: str) -> simple_openi
         url=openid_connect["url"],
         authentication_redirect_uri=request.route_url("oidc_callback"),
         client_id=openid_connect["client_id"],
-        client_secret=openid_connect.get("client-secret"),
+        client_secret=openid_connect.get("client_secret"),
         scope=" ".join(openid_connect.get("scopes", ["openid", "profile", "email"])),
     )
 
@@ -124,16 +125,31 @@ def get_remember_from_user_info(
         ("settings_role", None),
         ("roles", None),
     ):
-        user_info_field = settings_fields.get(field_, default_field)
-        if user_info_field is not None:
-            if user_info_field not in user_info:
-                _LOG.error(
-                    "Field '%s' not found in user info, available: %s.",
-                    user_info_field,
-                    ", ".join(user_info.keys()),
-                )
-                raise HTTPInternalServerError(f"Field '{user_info_field}' not found in user info.")
-            remember_object[field_] = user_info[user_info_field]  # type: ignore[literal-required]
+        _LOG.debug("User info keys: %s", ", ".join(user_info.keys()))
+        user_info_field_template = settings_fields.get(field_, default_field)
+        if user_info_field_template is not None:
+            if "{" in user_info_field_template:
+                formatter = string.Formatter()
+                attributes = formatter.parse(user_info_field_template)
+                user_info_fields = [e[1] for e in attributes if e[1] is not None]
+            else:
+                user_info_fields = [user_info_field_template]
+
+            for user_info_field in user_info_fields:
+                if user_info_field not in user_info:
+                    _LOG.error(
+                        "Field '%s' not found in user info, available: %s.",
+                        user_info_field,
+                        ", ".join(user_info.keys()),
+                    )
+                    raise HTTPInternalServerError(f"Field '{user_info_field}' not found in user info.")
+
+            user_info_value = (
+                user_info_field_template.format(**user_info)
+                if "{" in user_info_field_template
+                else user_info[user_info_field_template]
+            )
+            remember_object[field_] = user_info_value  # type: ignore[literal-required]
 
 
 def get_user_from_remember(
@@ -194,6 +210,11 @@ def get_user_from_remember(
                 user = static.User(username=username, email=email, display_name=display_name)
                 models.DBSession.add(user)
     else:
+        roles = []
+        role_names = remember_object.get("roles", [])
+        if role_names:
+            query = models.DBSession.query(main.Role).filter(main.Role.name.in_(role_names))
+            roles = query.all()
         user = DynamicUser(
             id=-1,
             username=username,
@@ -204,10 +225,7 @@ def get_user_from_remember(
                 if remember_object.get("settings_role") is not None
                 else None
             ),
-            roles=[
-                models.DBSession.query(main.Role).filter_by(name=role).one()
-                for role in remember_object.get("roles", [])
-            ],
+            roles=roles,
         )
     return user
 

c2cgeoportal_geoportal/views/login.py

@@ -331,8 +331,7 @@ class Login:
         if user is not None:
             result.update(
                 {
-                    "login": user.username,
-                    "username": user.display_name,
+                    "username": user.username,
                     "display_name": user.display_name,
                     "email": user.email,
                     "roles": [{"name": r.name, "id": r.id} for r in user.roles],
@@ -673,8 +672,7 @@ class Login:
                     # TODO respect the user interface...
                     json.dumps(
                         {
-                            "login": user.username,
-                            "username": user.display_name,
+                            "username": user.username,
                             "email": user.email,
                             "is_intranet": is_intranet(self.request),
                             "functionalities": self._functionality(),

c2cgeoportal_geoportal/views/theme.py

@@ -1279,8 +1279,7 @@ class Theme:
         if not self.request.user:
             raise pyramid.httpexceptions.HTTPForbidden()
 
-        admin_roles = [r for r in self.request.user.roles if r.name == ("role_admin")]
-        if not admin_roles:
+        if not self.request.has_permission("admin"):
             raise pyramid.httpexceptions.HTTPForbidden()
 
         self._ogc_server_clear_cache(

{c2cgeoportal_geoportal-2.9.0.174.dist-info → c2cgeoportal_geoportal-2.9.0.180.dist-info}/METADATA

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

{c2cgeoportal_geoportal-2.9.0.174.dist-info → c2cgeoportal_geoportal-2.9.0.180.dist-info}/RECORD

@@ -1,4 +1,4 @@
-c2cgeoportal_geoportal/__init__.py,sha256=uIVjYbQbRdoMC98xa2cScOPHYjb2rsvqFpLcEzbK2EE,38697
+c2cgeoportal_geoportal/__init__.py,sha256=yy2McB6HK2pGoLYAZ8sjkwXl_uxdKOVVmynOovyO0ks,38648
 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
@@ -20,7 +20,7 @@ c2cgeoportal_geoportal/lib/lingva_extractor.py,sha256=pS-B5oTcEkW__XUop6rWKdpJhn
 c2cgeoportal_geoportal/lib/loader.py,sha256=vfjyuN2ry33Djc5KMTbibQ96uAw8oZyomAAwk0gbW5Q,2613
 c2cgeoportal_geoportal/lib/metrics.py,sha256=5HryUs6Rk6cmVvag5_FN-W2gcwsyJt3Xf9105TSO4mQ,4847
 c2cgeoportal_geoportal/lib/oauth2.py,sha256=1hXo78-8lg3OBvB0TK5zG5QawZnvroPhaVpTBtPZg8I,41107
-c2cgeoportal_geoportal/lib/oidc.py,sha256=BYAXXo-k6vKTvVJDkT317641YDMT4DnvHJFR945H9x0,12222
+c2cgeoportal_geoportal/lib/oidc.py,sha256=r4O-htcKiyxUlzcNMkPJ3smaM7TkfHVT6bH1qYwm2Ss,13017
 c2cgeoportal_geoportal/lib/wmstparsing.py,sha256=EWFXxZ_nK3vpx8H3dSKIJTnNAXoJmfhhHYkcG1bXluI,12379
 c2cgeoportal_geoportal/lib/xsd.py,sha256=V5dXPWTVIz04LoI5GDkorFnaLrLUhlw--c6NzWsAxfk,7031
 c2cgeoportal_geoportal/scaffolds/advance_create/cookiecutter.json,sha256=1LVOM-j_nd00J89q0EI3bQUvIysbidApaVHDibA2ydk,524
@@ -160,7 +160,7 @@ c2cgeoportal_geoportal/views/fulltextsearch.py,sha256=uiidVzz-mQ-_eF1GL3ZCWd67-p
 c2cgeoportal_geoportal/views/geometry_processing.py,sha256=5dkJ20Lk12zqfzvmfws2YFxutSX2vxzdetQ4CmYxSi8,2958
 c2cgeoportal_geoportal/views/i18n.py,sha256=EEyM5Y7DSuQffiwpFrkFclUcneRCiir4bakXY6lGZjI,5343
 c2cgeoportal_geoportal/views/layers.py,sha256=I1_9N8Zui4b2t9qfX1Z4QGX7-vOPeUKKvyJWLH8g9Fo,29226
-c2cgeoportal_geoportal/views/login.py,sha256=P9Ay9LKK8xzAhNYS7ZqgLyijmdA3aPTqmx9mLvY22PQ,29293
+c2cgeoportal_geoportal/views/login.py,sha256=YdtAcOkdBOWcNpJEKBgtvnbhoNA_5DuMYjr9lF8ndZw,29189
 c2cgeoportal_geoportal/views/mapserverproxy.py,sha256=ii_389rDXNMbtk4cWD9BSp3dDBZVin0_KsbsxPvCtkk,9498
 c2cgeoportal_geoportal/views/memory.py,sha256=Vhw3vf4pjdl9DuW2PNOK6PZZOUPUn09Otym88_XIy3s,3754
 c2cgeoportal_geoportal/views/ogcproxy.py,sha256=2i3cuZ2cRybEH-DvAQbrLnUxd9y3B0iKnwkpaJvhwSc,5215
@@ -171,10 +171,10 @@ c2cgeoportal_geoportal/views/proxy.py,sha256=XxOGR8Snqrd1CKkUiK4IjavCR8PiUsd3tlE
 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/theme.py,sha256=jSpQcI3x2Exo31ubHdF8_ApGIhET7MnH7p0DN6yQLDI,55924
+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
-tests/__init__.py,sha256=KxmbgvRWDSJoEDH1cXnDIjbfBsgCzs2KdkTPuzYMq84,3826
+tests/__init__.py,sha256=QJY_VGdOehpa3uMdeiF0boDPvH8BVgxPWJRzyDTcvwA,3826
 tests/test_cachebuster.py,sha256=asI1X_qI0MGklYuKuWyqvCPVbvhQcUe4fX91Dk-hUsE,2923
 tests/test_caching.py,sha256=Juj7uwjOkjbPlTd-ll65SgWFzj3d2yDyf-eQ7ELk2eY,13222
 tests/test_checker.py,sha256=NaU6Ejg9XbwS2cwqXCtz5mJPRdBIPZb3d1MkXVufr0k,3638
@@ -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.174.dist-info/METADATA,sha256=Dq4E9oQX-aTNKCgz1iTq5kMJb4uJPiZHS6JXlhXVSeQ,1923
-c2cgeoportal_geoportal-2.9.0.174.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-c2cgeoportal_geoportal-2.9.0.174.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
-c2cgeoportal_geoportal-2.9.0.174.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
-c2cgeoportal_geoportal-2.9.0.174.dist-info/RECORD,,
+c2cgeoportal_geoportal-2.9.0.180.dist-info/METADATA,sha256=8rsohSha4kU5yh2iX3ENMGIBe9pvS39xWgcXAn2qZb4,1923
+c2cgeoportal_geoportal-2.9.0.180.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+c2cgeoportal_geoportal-2.9.0.180.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
+c2cgeoportal_geoportal-2.9.0.180.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
+c2cgeoportal_geoportal-2.9.0.180.dist-info/RECORD,,

tests/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2023, Camptocamp SA
+# Copyright (c) 2011-2025, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without