c2cgeoportal-geoportal 2.9rc125__py3-none-any.whl → 2.9rc126__py3-none-any.whl

c2cgeoportal_geoportal/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2024, Camptocamp SA
+# Copyright (c) 2011-2025, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -430,7 +430,7 @@ def create_get_user_from_request(
                     request.user_ = (
                         DBSession.query(User)
                         .filter_by(username=username, deactivated=False)
-                        .options(joinedload(User.roles))
+                        .options(joinedload(User.roles), joinedload(User.settings_role))
                         .first()
                     )
 

c2cgeoportal_geoportal/lib/authentication.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2024, Camptocamp SA
+# Copyright (c) 2014-2025, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -47,6 +47,7 @@ from pyramid.security import remember
 from pyramid_multiauth import MultiAuthenticationPolicy
 from zope.interface import implementer
 
+import c2cgeoportal_commons.models
 from c2cgeoportal_geoportal.lib import oauth2
 from c2cgeoportal_geoportal.resources import defaultgroupsfinder
 
@@ -147,6 +148,8 @@ class OAuth2AuthenticationPolicy(CallbackAuthenticationPolicy):  # type: ignore
         _LOG.debug("OAuth verify_request: %s", valid)
         if valid:
             request.user_ = oauth2_request.user
+            if request.user_ is not None and c2cgeoportal_commons.models.DBSession is not None:
+                c2cgeoportal_commons.models.DBSession.add(request.user_)
 
             return cast(str, request.user.username)
         return None

c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/CONST_CHANGELOG.txt

@@ -31,7 +31,7 @@ Information to know before starting the upgrade
 Information
 ===========
 
-1. Hostname check:
+1. Hostname / Referer check:
    We add a hostname check on the `came_from` parameter, in the oauth2 login, allowed by
    `vars.authentication.allowed_hosts` and in the OGC server clear cache, allowed by `vars.admin_interface.allowed_hosts`.
    The behavior change a little bit in the `vars.shortener.allowed_hosts` and in the `vars.authorized_referers`.

c2cgeoportal_geoportal/views/login.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2024, Camptocamp SA
+# Copyright (c) 2011-2025, Camptocamp SA
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -81,6 +81,7 @@ class Login:
 
     def _functionality(self) -> dict[str, list[str | int | float | bool | list[Any] | dict[str, Any]]]:
         functionality = {}
+
         for func_ in get_setting(self.settings, ("functionalities", "available_in_templates"), []):
             functionality[func_] = get_functionality(func_, self.request, is_intranet(self.request))
         return functionality

{c2cgeoportal_geoportal-2.9rc125.dist-info → c2cgeoportal_geoportal-2.9rc126.dist-info}/METADATA

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

{c2cgeoportal_geoportal-2.9rc125.dist-info → c2cgeoportal_geoportal-2.9rc126.dist-info}/RECORD

@@ -1,8 +1,8 @@
-c2cgeoportal_geoportal/__init__.py,sha256=l4Ld3FspBwhCvinvhgLvLl3cHgxD1txgW9TkW3v7aG0,38629
+c2cgeoportal_geoportal/__init__.py,sha256=hler6GARxGeT-VuGjkNtSi6a5_sMHBOdA6XNF3Fz3H8,38661
 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
-c2cgeoportal_geoportal/lib/authentication.py,sha256=Bfws50nNiboVa2qm3Hdy_-38tygnlB8sX5AW9Zfikw0,9833
+c2cgeoportal_geoportal/lib/authentication.py,sha256=Y45moPenxJ2dH3gIuk7yPr4tiS0Yw0OLw-bK8Ug92nE,10037
 c2cgeoportal_geoportal/lib/bashcolor.py,sha256=LQgOgtFUvgJ4Ed3-YW3RPjvhBMZBbXBBkUZKE4unRCI,1889
 c2cgeoportal_geoportal/lib/cacheversion.py,sha256=jc8jIKH_yE1NReC2kvUkTkpGERHObdWjPp6kGCWAU1o,3040
 c2cgeoportal_geoportal/lib/caching.py,sha256=BZzIjgEUfv7puP8XvWY6PAni7HybcLMZrGam3D3mCyA,7124
@@ -137,7 +137,7 @@ c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/tests/test_app.
 c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/tilegeneration/config.yaml.tmpl,sha256=9fRuzdxmdnuMX_s0iaWOYwTmdDgvljGgXNfWnZTg5Ow,6171
 c2cgeoportal_geoportal/scaffolds/update/cookiecutter.json,sha256=SoXjnW7KpNpm1fSGDEIZrr-_LbR7yiYmXKbdeXatflw,617
 c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/.upgrade.yaml,sha256=8tPCziX4Wh6a2EOdjpLtvyqNtKcI7Rtjo8-bLQO8_Gg,2741
-c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/CONST_CHANGELOG.txt,sha256=91pYtwxINRTuFbembQvo2z42dVnX8vzVPOBZfrlxlnQ,11891
+c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/CONST_CHANGELOG.txt,sha256=l-LxuoecCzWi8avbX8RDC5audvYzQ5uFIr59jSdbXsc,11901
 c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/CONST_create_template/tests/test_testapp.py,sha256=FNZI6uMsZttVpWi0_TEmBgV6MjQDUmE5ar9be3FFkV8,1794
 c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/geoportal/.CONST_vars.yaml.swp,sha256=ZaB6IqVy0WDyGXRP7VQf8_LL_wjccSdthJtdIzw8FmE,16384
 c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/geoportal/CONST_config-schema.yaml,sha256=yGKWjxc_U50dOpgknUwdAUHg1HK0Txn4fhEC1KeKg9c,23603
@@ -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=FjJa6QI8JMDCFV9_oEQjXgD00UQ4ke8qixH3nLYyETE,29141
+c2cgeoportal_geoportal/views/login.py,sha256=EC8rSfuKBhNN3_QuYM4Zk7sbqrorXBbLejQpj-JG608,29142
 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
@@ -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.9rc125.dist-info/METADATA,sha256=pR0Bnpa-kOI41FUZh1bkSrbmcZIh7UmEoBeFRcvBlhc,1887
-c2cgeoportal_geoportal-2.9rc125.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-c2cgeoportal_geoportal-2.9rc125.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
-c2cgeoportal_geoportal-2.9rc125.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
-c2cgeoportal_geoportal-2.9rc125.dist-info/RECORD,,
+c2cgeoportal_geoportal-2.9rc126.dist-info/METADATA,sha256=CzvqjC_Fv3TR3piyreJpPpiaZ7JkJhLAknf6tYMOtCk,1887
+c2cgeoportal_geoportal-2.9rc126.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+c2cgeoportal_geoportal-2.9rc126.dist-info/entry_points.txt,sha256=3dnX260FsLX_AubeNMdyeta_z1X4CxcD3steAlfPx2I,1414
+c2cgeoportal_geoportal-2.9rc126.dist-info/top_level.txt,sha256=PJIbY7Nx51dDrJ052f5mDA7c6Tehm5aD-Gb32L_CtJA,29
+c2cgeoportal_geoportal-2.9rc126.dist-info/RECORD,,