Merge remote-tracking branch 'origin/develop'

Author: jacquesfize

.github/workflows/sphinx.yml

@@ -1,4 +1,4 @@
-name: "Build Sphinx Documentation"
+name: 'Build Sphinx Documentation'
 
 on:
   release:
@@ -30,12 +30,11 @@ jobs:
       - uses: actions/checkout@master
         with:
           fetch-depth: 0
-          ref: update-doc
 
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: lts/gallium
+          node-version: lts/iron
 
       - name: Install JS librairies
         working-directory: ./frontend

VERSION

@@ -1 +1 @@
-2.14.1
+2.14.2

backend/dependencies/Nomenclature-api-module

@@ -133,6 +133,7 @@ def create_app(with_external_mods=True):
     if "CELERY" in app.config:
         from geonature.utils.celery import celery_app
 
+        celery_app.init_app(app)
         celery_app.conf.update(app.config["CELERY"])
 
     # Emails configuration

backend/dependencies/RefGeo

@@ -19,9 +19,12 @@
     session,
     Response,
 )
+from flask_login import login_user
+import sqlalchemy as sa
 from sqlalchemy import select
 from utils_flask_sqla.response import json_resp
 
+from pypnusershub.db import models
 from pypnusershub.db.models import User, Organisme, Application
 from pypnusershub.db.tools import encode_token
 from pypnusershub.routes import insert_or_update_organism, insert_or_update_role
@@ -94,7 +97,9 @@ def loginCas():
                 .id_application
             )
             token = encode_token(data)
-            response.set_cookie("token", token, expires=cookie_exp)
+
+            token_exp = datetime.datetime.now(datetime.timezone.utc)
+            token_exp += datetime.timedelta(seconds=current_app.config["COOKIE_EXPIRATION"])
 
             # User cookie
             organism_id = info_user["codeOrganisme"]
@@ -111,7 +116,15 @@ def loginCas():
                 "id_role": data["id_role"],
                 "id_organisme": organism_id,
             }
-            response.set_cookie("current_user", str(current_user), expires=cookie_exp)
+
+            # Log the user in
+            user = db.session.execute(
+                sa.select(models.User)
+                .where(models.User.identifiant == current_user["user_login"])
+                .where(models.User.filter_by_app())
+            ).scalar_one()
+            login_user(user)
+
             return response
         else:
             log.info("Erreur d'authentification lié au CAS, voir log du CAS")