Merge pull request #1380 from akto-api-security/hotfix/fix_logs_blocking

Fixing logs api call
akto-api-security · Aug 21, 2024 · ecc21d9 · ecc21d9
2 parents 6839c95 + 90dd9ea
commit ecc21d9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/users/Users.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/users/Users.jsx
@@ -19,14 +19,7 @@ const Users = () => {
     const [loading, setLoading] = useState(false)
     const [users, setUsers] = useState([])
     const [roleHierarchy, setRoleHierarchy] = useState([])
-    const stiggFeatures = window.STIGG_FEATURE_WISE_ALLOWED
-    let rbacAccess = false;
-
-    if (!stiggFeatures || Object.keys(stiggFeatures).length === 0) {
-        rbacAccess = true
-    } else if(stiggFeatures && stiggFeatures['RBAC_FEATURE']){
-        rbacAccess = stiggFeatures['RBAC_FEATURE'].isGranted
-    }
+    const rbacAccess = func.checkForRbacFeature();
 
     const [roleSelectionPopup, setRoleSelectionPopup] = useState({})
 

diff --git a/apps/dashboard/web/polaris_web/web/src/util/func.js b/apps/dashboard/web/polaris_web/web/src/util/func.js
@@ -1518,7 +1518,21 @@ showConfirmationModal(modalContent, primaryActionContent, primaryAction) {
     }
     return false;
   },
+  checkForRbacFeature(){
+    const stiggFeatures = window.STIGG_FEATURE_WISE_ALLOWED
+    let rbacAccess = false;
+    if (!stiggFeatures || Object.keys(stiggFeatures).length === 0) {
+        rbacAccess = true
+    } else if(stiggFeatures && stiggFeatures['RBAC_FEATURE']){
+        rbacAccess = stiggFeatures['RBAC_FEATURE'].isGranted
+    }
+    return rbacAccess;
+  },
   checkUserValidForIntegrations(){
+    const rbacAccess = this.checkForRbacFeature();
+    if(!rbacAccess){
+      return true;
+    }
     const userRole = window.USER_ROLE
     return !(userRole === "GUEST" || userRole === "MEMBER")
   },