From 456f945d1e3b0bda81f458cf8f742e46241cff98 Mon Sep 17 00:00:00 2001
From: Convly <jean-sebastien.herbaux@epitech.eu>
Date: Fri, 22 Jul 2022 10:43:06 +0200
Subject: [PATCH] Fix condition checks

---
 .../core/admin/server/services/permission/engine.js  |  2 --
 packages/core/permissions/lib/engine/index.js        | 12 +++++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/core/admin/server/services/permission/engine.js b/packages/core/admin/server/services/permission/engine.js
index b9879bc98d..e8fd6330fe 100644
--- a/packages/core/admin/server/services/permission/engine.js
+++ b/packages/core/admin/server/services/permission/engine.js
@@ -45,8 +45,6 @@ module.exports = params => {
         permission
       );
 
-      console.log(permissionWithSanitizedProperties);
-
       return permissionWithSanitizedProperties;
     })
 
diff --git a/packages/core/permissions/lib/engine/index.js b/packages/core/permissions/lib/engine/index.js
index 6530ac0bf9..6a55d18119 100644
--- a/packages/core/permissions/lib/engine/index.js
+++ b/packages/core/permissions/lib/engine/index.js
@@ -56,18 +56,20 @@ module.exports = {
      * @param {Permission} params.permission
      */
     const evaluate = async params => {
-      const { options, register, permission } = params;
+      const { options, register } = params;
 
       const preFormatValidation = await runValidationHook(
         'before-format::validate.permission',
-        createBeforeEvaluateContext(permission)
+        createBeforeEvaluateContext(params.permission)
       );
 
       if (preFormatValidation === false) {
         return;
       }
 
-      await state.hooks['format.permission'].call(createFormatContext(permission));
+      const permission = await state.hooks['format.permission'].call(
+        createFormatContext(params.permission)
+      );
 
       const postFormatValidation = await runValidationHook(
         'post-format::validate.permission',
@@ -114,11 +116,11 @@ module.exports = {
       const resultPropEq = _.propEq('result');
       const pickResults = _.map(_.prop('result'));
 
-      if (evaluatedConditions.every(resultPropEq(true))) {
+      if (evaluatedConditions.every(resultPropEq(false))) {
         return;
       }
 
-      if (_.isEmpty(evaluatedConditions) || evaluatedConditions.some(resultPropEq(false))) {
+      if (_.isEmpty(evaluatedConditions) || evaluatedConditions.some(resultPropEq(true))) {
         return register({ action, subject, properties });
       }