From b23ca6de800be9f2bbedcc4109a65f06bb245713 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Sat, 18 Jun 2022 12:26:22 -0700
Subject: Remove permissions manager

---
 src/main/java/org/traccar/api/BaseObjectResource.java       |  7 -------
 .../java/org/traccar/api/resource/PermissionsResource.java  | 13 +++----------
 2 files changed, 3 insertions(+), 17 deletions(-)

(limited to 'src/main/java/org/traccar/api')

diff --git a/src/main/java/org/traccar/api/BaseObjectResource.java b/src/main/java/org/traccar/api/BaseObjectResource.java
index 78aa12dbe..abfed9682 100644
--- a/src/main/java/org/traccar/api/BaseObjectResource.java
+++ b/src/main/java/org/traccar/api/BaseObjectResource.java
@@ -80,9 +80,6 @@ public abstract class BaseObjectResource<T extends BaseModel> extends BaseResour
         cacheManager.invalidate(User.class, getUserId(), baseClass, entity.getId());
         LogAction.link(getUserId(), User.class, getUserId(), baseClass, entity.getId());
 
-        if (baseClass.equals(Group.class) || baseClass.equals(Device.class)) {
-            Context.getPermissionsManager().refreshDeviceAndGroupPermissions();
-        }
         return Response.ok(entity).build();
     }
 
@@ -115,9 +112,6 @@ public abstract class BaseObjectResource<T extends BaseModel> extends BaseResour
 
         LogAction.edit(getUserId(), entity);
 
-        if (baseClass.equals(Group.class) || baseClass.equals(Device.class)) {
-            Context.getPermissionsManager().refreshDeviceAndGroupPermissions();
-        }
         return Response.ok(entity).build();
     }
 
@@ -141,7 +135,6 @@ public abstract class BaseObjectResource<T extends BaseModel> extends BaseResour
             if (baseClass.equals(Group.class)) {
                 Context.getDeviceManager().updateDeviceCache(true);
             }
-            Context.getPermissionsManager().refreshDeviceAndGroupPermissions();
         }
         return Response.noContent().build();
     }
diff --git a/src/main/java/org/traccar/api/resource/PermissionsResource.java b/src/main/java/org/traccar/api/resource/PermissionsResource.java
index b92e6e9d9..7174a3eff 100644
--- a/src/main/java/org/traccar/api/resource/PermissionsResource.java
+++ b/src/main/java/org/traccar/api/resource/PermissionsResource.java
@@ -16,7 +16,6 @@
  */
 package org.traccar.api.resource;
 
-import org.traccar.Context;
 import org.traccar.api.BaseResource;
 import org.traccar.helper.LogAction;
 import org.traccar.model.Permission;
@@ -46,7 +45,7 @@ public class PermissionsResource  extends BaseResource {
     @Inject
     private CacheManager cacheManager;
 
-    private void checkPermission(Permission permission, boolean link) throws StorageException {
+    private void checkPermission(Permission permission) throws StorageException {
         if (permissionsService.notAdmin(getUserId())) {
             permissionsService.checkPermission(permission.getOwnerClass(), getUserId(), permission.getOwnerId());
             permissionsService.checkPermission(permission.getOwnerClass(), getUserId(), permission.getOwnerId());
@@ -70,16 +69,13 @@ public class PermissionsResource  extends BaseResource {
         checkPermissionTypes(entities);
         for (LinkedHashMap<String, Long> entity: entities) {
             Permission permission = new Permission(entity);
-            checkPermission(permission, true);
+            checkPermission(permission);
             storage.addPermission(permission);
             cacheManager.invalidate(permission.getOwnerClass(), permission.getOwnerId(),
                     permission.getPropertyClass(), permission.getPropertyId());
             LogAction.link(getUserId(), permission.getOwnerClass(), permission.getOwnerId(),
                     permission.getPropertyClass(), permission.getPropertyId());
         }
-        if (!entities.isEmpty()) {
-            Context.getPermissionsManager().refreshPermissions(new Permission(entities.get(0)));
-        }
         return Response.noContent().build();
     }
 
@@ -95,16 +91,13 @@ public class PermissionsResource  extends BaseResource {
         checkPermissionTypes(entities);
         for (LinkedHashMap<String, Long> entity: entities) {
             Permission permission = new Permission(entity);
-            checkPermission(permission, false);
+            checkPermission(permission);
             storage.removePermission(permission);
             cacheManager.invalidate(permission.getOwnerClass(), permission.getOwnerId(),
                     permission.getPropertyClass(), permission.getPropertyId());
             LogAction.unlink(getUserId(), permission.getOwnerClass(), permission.getOwnerId(),
                     permission.getPropertyClass(), permission.getPropertyId());
         }
-        if (!entities.isEmpty()) {
-            Context.getPermissionsManager().refreshPermissions(new Permission(entities.get(0)));
-        }
         return Response.noContent().build();
     }
 
-- 
cgit v1.2.3