c2cgeoportal-geoportal 2.9rc83__py3-none-any.whl → 2.9.0.352__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
@@ -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
@@ -408,17 +406,36 @@ def create_get_user_from_request(
                         access_token_expires = dateutil.parser.isoparse(
                             user_info_remember["access_token_expires"]
                         )
-                        if access_token_expires < datetime.datetime.now():
+                        # If access_token_expires is not offset-aware make it offset-aware
+                        if access_token_expires.tzinfo is None:
+                            _LOG.warning(
+                                "access_token_expires is not offset-aware, "
+                                "make it offset-aware by replacing tzinfo with UTC"
+                            )
+                            access_token_expires = access_token_expires.replace(tzinfo=datetime.timezone.utc)
+                        if access_token_expires < datetime.datetime.now(datetime.timezone.utc):
                             if user_info_remember["refresh_token_expires"] is None:
                                 return None
+                            refresh_token = request.cookies.get("refresh_token")
+                            if refresh_token is None:
+                                return None
                             refresh_token_expires = dateutil.parser.isoparse(
                                 user_info_remember["refresh_token_expires"]
                             )
-                            if refresh_token_expires < datetime.datetime.now():
+                            # If refresh_token_expires is not offset-aware make it offset-aware
+                            if refresh_token_expires.tzinfo is None:
+                                _LOG.warning(
+                                    "refresh_token_expires is not offset-aware, "
+                                    "make it offset-aware by replacing tzinfo with UTC"
+                                )
+                                refresh_token_expires = refresh_token_expires.replace(
+                                    tzinfo=datetime.timezone.utc
+                                )
+                            if refresh_token_expires < datetime.datetime.now(datetime.timezone.utc):
                                 return None
                             token_response = oidc.get_oidc_client(
                                 request, request.host
-                            ).exchange_refresh_token(user_info_remember["refresh_token"])
+                            ).exchange_refresh_token(refresh_token)
                             user_info_remember = oidc.OidcRemember(request).remember(
                                 token_response, request.host
                             )
@@ -430,7 +447,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()
                     )
 
@@ -674,9 +691,11 @@ def includeme(config: pyramid.config.Configurator) -> None:
         "/mapserv_proxy/{ogcserver}/wfs3/*path",
         mapserverproxy=True,
         pregenerator=C2CPregenerator(role=True),
-        request_method="GET",
+        request_method=("GET", "POST", "PUT", "DELETE", "PATCH"),
     )
     add_cors_route(config, "/mapserv_proxy", "mapserver")
+    add_cors_route(config, "/mapserv_proxy/{ogcserver}/ogcapi/*path", "mapserver_ogcapi_mapserver")
+    add_cors_route(config, "/mapserv_proxy/{ogcserver}/wfs3/*path", "mapserver_ogcapi_qgisserver")
 
     # Add route to the tinyows proxy
     config.add_route("tinyowsproxy", "/tinyows_proxy", pregenerator=C2CPregenerator(role=True))
@@ -767,6 +786,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/lib/__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

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/lib/bashcolor.py

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

c2cgeoportal_geoportal/lib/cacheversion.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

c2cgeoportal_geoportal/lib/caching.py

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

c2cgeoportal_geoportal/lib/check_collector.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

c2cgeoportal_geoportal/lib/checker.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

c2cgeoportal_geoportal/lib/dbreflection.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

c2cgeoportal_geoportal/lib/filter_capabilities.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

c2cgeoportal_geoportal/lib/fulltextsearch.py

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

c2cgeoportal_geoportal/lib/functionality.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

c2cgeoportal_geoportal/lib/headers.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

c2cgeoportal_geoportal/lib/i18n.py

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

c2cgeoportal_geoportal/lib/layers.py

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

c2cgeoportal_geoportal/lib/loader.py

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

c2cgeoportal_geoportal/lib/metrics.py

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

c2cgeoportal_geoportal/lib/oauth2.py

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

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,10 +28,10 @@
 import datetime
 import json
 import logging
+import string
 from typing import TYPE_CHECKING, Any, NamedTuple, Optional, TypedDict, Union
 
 import pyramid.request
-import pyramid.response
 import simple_openid_connect.client
 import simple_openid_connect.data
 from pyramid.httpexceptions import HTTPBadRequest, HTTPInternalServerError, HTTPUnauthorized
@@ -77,7 +77,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"])),
     )
 
@@ -87,9 +87,7 @@ class OidcRememberObject(TypedDict):
     The JSON object that is stored in a cookie to remember the user.
     """
 
-    access_token: str
     access_token_expires: str
-    refresh_token: str | None
     refresh_token_expires: str | None
     username: str | None
     display_name: str | None
@@ -124,16 +122,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(
@@ -155,60 +168,66 @@ def get_user_from_remember(
     assert models.DBSession is not None
 
     user: static.User | DynamicUser | None
-    username = remember_object["username"]
-    assert username is not None
-    email = remember_object["email"]
-    assert email is not None
-    display_name = remember_object["display_name"] or email
-
-    openid_connect_configuration = request.registry.settings.get("authentication", {}).get(
-        "openid_connect", {}
-    )
-    provide_roles = openid_connect_configuration.get("provide_roles", False)
-    if provide_roles is False:
-        user_query = models.DBSession.query(static.User)
-        match_field = openid_connect_configuration.get("match_field", "username")
-        if match_field == "username":
-            user_query = user_query.filter_by(username=username)
-        elif match_field == "email":
-            user_query = user_query.filter_by(email=email)
+    try:
+        username = remember_object["username"]
+        assert username is not None
+        email = remember_object["email"]
+        assert email is not None
+        display_name = remember_object["display_name"] or email
+
+        openid_connect_configuration = request.registry.settings.get("authentication", {}).get(
+            "openid_connect", {}
+        )
+        provide_roles = openid_connect_configuration.get("provide_roles", False)
+        if provide_roles is False:
+            user_query = models.DBSession.query(static.User)
+            match_field = openid_connect_configuration.get("match_field", "username")
+            if match_field == "username":
+                user_query = user_query.filter_by(username=username)
+            elif match_field == "email":
+                user_query = user_query.filter_by(email=email)
+            else:
+                raise HTTPInternalServerError(
+                    f"Unknown match_field: '{match_field}', allowed values are 'username' and 'email'"
+                )
+            user = user_query.one_or_none()
+            if update_create_user is True:
+                if user is not None:
+                    for field in openid_connect_configuration.get("update_fields", []):
+                        if field == "username":
+                            user.username = username
+                        elif field == "display_name":
+                            user.display_name = display_name
+                        elif field == "email":
+                            user.email = email
+                        else:
+                            raise HTTPInternalServerError(
+                                f"Unknown update_field: '{field}', allowed values are 'username', 'display_name' and 'email'"
+                            )
+                elif openid_connect_configuration.get("create_user", False) is True:
+                    user = static.User(username=username, email=email, display_name=display_name)
+                    models.DBSession.add(user)
         else:
-            raise HTTPInternalServerError(
-                f"Unknown match_field: '{match_field}', allowed values are 'username' and 'email'"
+            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,
+                display_name=display_name,
+                email=email,
+                settings_role=(
+                    models.DBSession.query(main.Role).filter_by(name=remember_object["settings_role"]).first()
+                    if remember_object.get("settings_role") is not None
+                    else None
+                ),
+                roles=roles,
             )
-        user = user_query.one_or_none()
-        if update_create_user is True:
-            if user is not None:
-                for field in openid_connect_configuration.get("update_fields", []):
-                    if field == "username":
-                        user.username = username
-                    elif field == "display_name":
-                        user.display_name = display_name
-                    elif field == "email":
-                        user.email = email
-                    else:
-                        raise HTTPInternalServerError(
-                            f"Unknown update_field: '{field}', allowed values are 'username', 'display_name' and 'email'"
-                        )
-            elif openid_connect_configuration.get("create_user", False) is True:
-                user = static.User(username=username, email=email, display_name=display_name)
-                models.DBSession.add(user)
-    else:
-        user = DynamicUser(
-            id=-1,
-            username=username,
-            display_name=display_name,
-            email=email,
-            settings_role=(
-                models.DBSession.query(main.Role).filter_by(name=remember_object["settings_role"]).first()
-                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", [])
-            ],
-        )
+    except KeyError:
+        _LOG.exception("Missing field in remember object")
+        return None
     return user
 
 
@@ -248,17 +267,36 @@ class OidcRemember:
             raise HTTPUnauthorized("See server logs for details")
 
         openid_connect = self.authentication_settings.get("openid_connect", {})
+        self.request.response.set_cookie(
+            "access_token",
+            token_response.access_token,
+            max_age=token_response.expires_in,
+            secure=True,
+            httponly=True,
+            samesite="Lax",
+            domain=self.request.domain,
+        )
+        if token_response.refresh_expires_in is not None:
+            self.request.response.set_cookie(
+                "refresh_token",
+                token_response.refresh_token,
+                max_age=token_response.refresh_expires_in,
+                secure=True,
+                httponly=True,
+                samesite="Lax",
+                domain=self.request.domain,
+            )
         remember_object: OidcRememberObject = {
-            "access_token": token_response.access_token,
             "access_token_expires": (
-                datetime.datetime.now() + datetime.timedelta(seconds=token_response.expires_in)
+                datetime.datetime.now(datetime.timezone.utc)
+                + datetime.timedelta(seconds=token_response.expires_in)
             ).isoformat(),
-            "refresh_token": token_response.refresh_token,
             "refresh_token_expires": (
                 None
                 if token_response.refresh_expires_in is None
                 else (
-                    datetime.datetime.now() + datetime.timedelta(seconds=token_response.refresh_expires_in)
+                    datetime.datetime.now(datetime.timezone.utc)
+                    + datetime.timedelta(seconds=token_response.refresh_expires_in)
                 ).isoformat()
             ),
             "username": None,

c2cgeoportal_geoportal/lib/wmstparsing.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

c2cgeoportal_geoportal/lib/xsd.py

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

c2cgeoportal_geoportal/resources.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

c2cgeoportal_geoportal/scaffolds/advance_create/ci/config.yaml

@@ -1,15 +1,4 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/c2cciutils/master/c2cciutils/schema.json
-
-checks:
-  black: False
-  isort: False
-  prettier: False
-  codespell: False
-  eof: False
-  required_workflows: False
-  dependabot_config: False
-  prospector_config: False
-  setup: False
+# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/c2cciutils/1.7/c2cciutils/schema.json
 
 version:
   branch_to_version_re:

c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/Dockerfile

@@ -19,7 +19,7 @@ RUN make build
 RUN mv webpack.apps.js webpack.apps.js.tmpl
 
 ENTRYPOINT [ "/usr/bin/eval-templates" ]
-CMD [ "webpack", "serve", "--open", "--mode=development", "--watch", "--no-inline" ]
+CMD [ "webpack", "serve", "--open", "--mode=development" ]
 
 ###############################################################################
 
@@ -33,8 +33,8 @@ WORKDIR /app
 COPY . /app
 # Workaround, see:https://github.com/moby/moby/issues/37965
 RUN true
-COPY --from=builder /opt/c2cgeoportal/geoportal/node_modules/ngeo/dist/* /etc/static-ngeo/
-RUN rm /etc/static-ngeo/*.html
+COPY --from=builder /opt/c2cgeoportal/geoportal/node_modules/ngeo/dist/vendor.* /etc/static-ngeo/
+COPY --from=builder /opt/c2cgeoportal/geoportal/node_modules/ngeo/dist/*_alt.* /etc/static-ngeo/
 COPY --from=builder /etc/static-ngeo/* /etc/static-ngeo/
 COPY --from=builder /app/alembic.ini /app/alembic.yaml ./
 RUN chmod go+w /etc/static-ngeo/

c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/Makefile

@@ -1,5 +1,5 @@
 # Language provided by the application
-LANGUAGES ?= en fr de
+LANGUAGES ?= en fr de it rm
 NGEO_INTERFACES ?= desktop mobile iframe_api
 NGEO_API ?= TRUE
 

c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/alembic.ini

@@ -44,13 +44,13 @@ qualname = alembic
 
 [handler_console]
 class = StreamHandler
-kwargs = {'stream': 'ext://sys.stderr'}
+args = (sys.stderr,)
 level = NOTSET
 formatter = generic
 
 [handler_json]
 class = c2cwsgiutils.pyramid_logging.JsonLogHandler
-kwargs = {'stream': 'ext://sys.stdout'}
+args = (sys.stderr,)
 level = NOTSET
 
 [formatter_generic]

c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/gunicorn.conf.py

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

c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/language_mapping

@@ -1,3 +1,4 @@
 fr=fr-ch
 de=de-ch
 it=it-ch
+rm=rm-ch

c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/webpack.apps.js

@@ -42,10 +42,20 @@ module.exports = {
     publicPath: devServer ? '${VISIBLE_ENTRY_POINT}dev/' : '.__ENTRY_POINT__static-ngeo/',
   },
   devServer: {
-    publicPath: '${VISIBLE_WEB_PROTOCOL}://${VISIBLE_WEB_HOST}${VISIBLE_ENTRY_POINT}dev/',
+    devMiddleware: {
+      publicPath: '${VISIBLE_WEB_PROTOCOL}://${VISIBLE_WEB_HOST}${VISIBLE_ENTRY_POINT}dev/',
+    },
     port: 8080,
     host: 'webpack_dev_server',
     hot: true,
+    compress: false,
+    client: {
+      webSocketURL: {
+        hostname: 'localhost',
+        port: 8080,
+        protocol: 'ws',
+      },
+    },
   },
   entry: entry,
   plugins: plugins,

c2cgeoportal_geoportal/scaffolds/advance_update/cookiecutter.json

@@ -5,6 +5,8 @@
   "extent": "",
   "extent_mapserver": "",
   "authtkt_secret": "",
+  "tilecloud_chain_session_secret": "",
+  "tilecloud_chain_session_salt": "",
   "unsafe_long_version": false,
   "geomapfish_version": "",
   "geomapfish_main_version": "",

c2cgeoportal_geoportal/scaffolds/create/cookiecutter.json

@@ -5,6 +5,8 @@
   "extent": "",
   "extent_mapserver": "",
   "authtkt_secret": "",
+  "tilecloud_chain_session_secret": "",
+  "tilecloud_chain_session_salt": "",
   "unsafe_long_version": false,
   "geomapfish_version": "",
   "geomapfish_main_version": "",

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.github/workflows/main.yaml

@@ -6,7 +6,6 @@ on:
 
 # To publish the images to be used on Kubernetes
 # env:
-#   PROJECT: {{cookiecutter.package}}
 #   HAS_SECRETS: ${{'{{'}} secrets.HAS_SECRETS }}
 
 jobs:
@@ -19,6 +18,7 @@ jobs:
       - uses: actions/checkout@v4
 
       # To publish the images to be used on Kubernetes
+      # Requires CI_GPG_PRIVATE_KEY and GOPASS_CI_GITHUB_TOKEN secrets.
       # - uses: camptocamp/initialise-gopass-summon-action@v2
       #   with:
       #     ci-gpg-private-key: ${{'{{'}} secrets.CI_GPG_PRIVATE_KEY }}

c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.github/workflows/rebuild.yaml

@@ -5,13 +5,6 @@ on:
   schedule:
     - cron: '30 2 * * *'
 
-env:
-  PROJECT: {{cookiecutter.package}}
-  # Requires CI_GPG_PRIVATE_KEY and GOPASS_CI_GITHUB_TOKEN secrets.
-  # OPENSHIFT_PROJECT: gs-gmf-{{cookiecutter.package}}
-  # The release branches
-  HELM_RELEASE_NAMES: int-{{cookiecutter.geomapfish_main_version_dash}},prod-{{cookiecutter.geomapfish_main_version_dash}}
-
 jobs:
   rebuild:
     runs-on: ubuntu-24.04
@@ -30,6 +23,7 @@ jobs:
         with:
           ref: ${{'{{'}} matrix.branch }}
 
+      # Requires CI_GPG_PRIVATE_KEY and GOPASS_CI_GITHUB_TOKEN secrets.
       - uses: camptocamp/initialise-gopass-summon-action@v2
         with:
           ci-gpg-private-key: ${{'{{'}} secrets.CI_GPG_PRIVATE_KEY }}