From f2b80ba89f1352718aac0de208c7f04dec2cdb6d Mon Sep 17 00:00:00 2001
From: LeoMoulin <leomoulin125@gmail.com>
Date: Sun, 17 Mar 2024 19:17:38 +0100
Subject: [PATCH] Resolve conflicts and resolve condition bug in
 isNotSecretaryOrAdmin

---
 .../java/ovh/herisson/Clyde/Services/AuthenticatorService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/AuthenticatorService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/AuthenticatorService.java
index 63ef3c1..6afcdc0 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/AuthenticatorService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/AuthenticatorService.java
@@ -47,7 +47,7 @@ public class AuthenticatorService {
         User poster = getUserFromToken(authorization);
         if (poster == null) return true;
 
-        return poster.getRole() != Role.Secretary || poster.getRole() != Role.Admin;
+        return poster.getRole() != Role.Secretary && poster.getRole() != Role.Admin;
     }
 
     public boolean IsNotIn(Role[] roles, String token){