fixed permissions duplication

rndsolutions · Sep 2, 2016 · 24a5154 · 24a5154
1 parent 22c48a9
commit 24a5154
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/Server/src/main/java/net/hawkengine/services/filters/PermissionService.java b/Server/src/main/java/net/hawkengine/services/filters/PermissionService.java
@@ -44,9 +44,7 @@ public List<Permission> getUniqueUserGroupPermissions(User user) {
                 for (Permission userGroupPermissionFromDb : userGroupPermissionsFromDb) {
                     boolean isPermissionPresent = false;
                     for (Permission userPersmission : user.getPermissions()) {
-                        if (userGroupPermissionFromDb.getPermissionScope() == userPersmission.getPermissionScope() &&
-                                userGroupPermissionFromDb.getPermittedEntityId().equals(userPersmission.getPermittedEntityId()) &&
-                                userGroupPermissionFromDb.getPermissionType() == userPersmission.getPermissionType()) {
+                        if (userGroupPermissionFromDb.getPermittedEntityId().equals(userPersmission.getPermittedEntityId())) {
                             isPermissionPresent = true;
                             break;
                         }

diff --git a/Server/src/main/java/net/hawkengine/ws/WsEndpoint.java b/Server/src/main/java/net/hawkengine/ws/WsEndpoint.java
@@ -156,7 +156,7 @@ public void onWebSocketText(String message) {
             User currentUser = (User) this.userService.getById(this.loggedUser.getId()).getObject();
 
             this.setLoggedUser(currentUser);
-            this.loggedUser.getPermissions().addAll(this.permissionService.getUniqueUserGroupPermissions(this.loggedUser));
+            this.loggedUser.getPermissions().addAll(this.permissionService.getUniqueUserGroupPermissions(currentUser));
 
             List<Permission> orderedPermissions = this.permissionService.sortPermissions(this.loggedUser.getPermissions());