fix(api): return as soon as one of the conditions is fulfilled

fixes gravitee-io/issues#4399
gravitee-io · Oct 20, 2020 · 0ef7d2d · 0ef7d2d
1 parent e8424b4
commit 0ef7d2d
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/...st-api-service/src/main/java/io/gravitee/rest/api/service/impl/PermissionServiceImpl.java b/...st-api-service/src/main/java/io/gravitee/rest/api/service/impl/PermissionServiceImpl.java
@@ -111,8 +111,6 @@ private boolean hasRelevantManagementRole(UserEntity user) {
         if (user.getRoles() == null) {
             return false ;
         }
-        boolean hasOrganizationCreateUpdateDeleteRole = false;
-        boolean hasEnvironmentCreateUpdateDeleteRoleExceptApplication = false ;
 
         for (UserRoleEntity userRoleEntity :  user.getRoles()) {
             if (userRoleEntity.getPermissions() != null) {
@@ -125,19 +123,19 @@ private boolean hasRelevantManagementRole(UserEntity user) {
 
                     if (currentScope.equals(RoleScope.ORGANIZATION)
                             && isCreateUpdateOrDelete) {
-                        hasOrganizationCreateUpdateDeleteRole = true;
+                        return true ;
                     }
 
                     if (currentScope.equals(RoleScope.ENVIRONMENT)
                             && !EnvironmentPermission.valueOf(permissionName).equals(EnvironmentPermission.APPLICATION)
                             && isCreateUpdateOrDelete
                     ) {
-                        hasEnvironmentCreateUpdateDeleteRoleExceptApplication = true;
+                        return true;
                     }
                 }
             }
         }
 
-        return hasOrganizationCreateUpdateDeleteRole || hasEnvironmentCreateUpdateDeleteRoleExceptApplication ;
+        return false;
     }
 }