From f5d070d071c32200aa27e2fa803ebbc7a0649720 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Tue, 12 Nov 2024 15:40:36 +0100
Subject: [PATCH] =?UTF-8?q?CAS:=20si=20activ=C3=A9=20et=20forc=C3=A9=20et?=
 =?UTF-8?q?=20cas=5Fid=20renseign=C3=A9=20et=20cas=5Fallow=5Flogin,=20on?=
 =?UTF-8?q?=20ne=20peut=20pas=20se=20logguer=20(ajout=20condition=20cas=5F?=
 =?UTF-8?q?allow=5Flogin)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/auth/models.py | 6 +++++-
 sco_version.py     | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/auth/models.py b/app/auth/models.py
index 6749150d9..9126d6eda 100644
--- a/app/auth/models.py
+++ b/app/auth/models.py
@@ -222,7 +222,11 @@ class User(UserMixin, ScoDocModel):
                 )
                 return False
             # si CAS activé et forcé et cas_id renseigné, on ne peut pas se logguer
-            if self.cas_id and ScoDocSiteConfig.get("cas_force"):
+            if (
+                self.cas_id
+                and self.cas_allow_login
+                and ScoDocSiteConfig.get("cas_force")
+            ):
                 log(
                     f"""auth: login attempt for user {self.user_name
                         } (cas_id='{
diff --git a/sco_version.py b/sco_version.py
index 8e43f1a7e..b4af3b3e5 100644
--- a/sco_version.py
+++ b/sco_version.py
@@ -3,7 +3,7 @@
 
 "Infos sur version ScoDoc"
 
-SCOVERSION = "9.7.42"
+SCOVERSION = "9.7.43"
 
 SCONAME = "ScoDoc"