merge develop for 2.1.2

VERSION

@@ -1,2 +1,2 @@
-2.1.1
+2.1.2
 

docs/changelog.rst

@@ -1,6 +1,13 @@
 CHANGELOG
 *********
 
+2.1.2 (2024-02-16)
+------------------
+
+**🐛 Corrections**
+
+- Debug de la route utilisée pour l'accès public dans GeoNature (#89)
+
 2.1.1 (2024-01-30)
 -----------------
 

src/pypnusershub/routes.py

@@ -142,15 +142,14 @@ def login():
 def public_login():
     if not current_app.config.get("PUBLIC_ACCESS_USERNAME", {}):
         raise Forbidden
+    login = current_app.config.get("PUBLIC_ACCESS_USERNAME")
 
     user = db.session.execute(
-        sa.select(models.AppUser)
-        .where(
-            models.AppUser.identifiant
-            == current_app.config.get("PUBLIC_ACCESS_USERNAME")
-        )
-        .filter(models.AppUser.id_application == get_current_app_id())
+        sa.select(models.User)
+        .where(models.User.identifiant == login)
+        .where(models.User.filter_by_app(code_app="GN"))
     ).scalar_one()
+
     user_dict = user.as_dict()
     login_user(user)
     # Génération d'un token

src/pypnusershub/utils.py

@@ -81,15 +81,11 @@ def get_current_app_id():
     elif "CODE_APPLICATION" in current_app.config:
         from pypnusershub.db.models import Application
 
-        return (
-            db.session.execute(
-                select(Application).filter_by(
-                    code_application=current_app.config["CODE_APPLICATION"],
-                )
+        return db.session.execute(
+            select(Application.id_application).filter_by(
+                code_application=current_app.config["CODE_APPLICATION"],
             )
-            .scalar_one()
-            .id_application
-        )
+        ).scalar_one()
     else:
         return None