From 9ec2d09ad8a757d58f70812b9cf5e835321382e6 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Mon, 21 Feb 2022 17:33:58 -0800
Subject: Migrate permissions to storage

---
 .../java/org/traccar/database/DeviceManager.java   |  3 +--
 .../org/traccar/database/PermissionsManager.java   | 22 ----------------------
 2 files changed, 1 insertion(+), 24 deletions(-)

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

diff --git a/src/main/java/org/traccar/database/DeviceManager.java b/src/main/java/org/traccar/database/DeviceManager.java
index 40591e869..a9b8454eb 100644
--- a/src/main/java/org/traccar/database/DeviceManager.java
+++ b/src/main/java/org/traccar/database/DeviceManager.java
@@ -15,7 +15,6 @@
  */
 package org.traccar.database;
 
-import java.sql.SQLException;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -110,7 +109,7 @@ public class DeviceManager extends BaseObjectManager<Device> implements Identity
     }
 
     @Override
-    public Device getByUniqueId(String uniqueId) throws SQLException {
+    public Device getByUniqueId(String uniqueId) {
         boolean forceUpdate;
         try {
             readLock();
diff --git a/src/main/java/org/traccar/database/PermissionsManager.java b/src/main/java/org/traccar/database/PermissionsManager.java
index 2bb808033..9a673c784 100644
--- a/src/main/java/org/traccar/database/PermissionsManager.java
+++ b/src/main/java/org/traccar/database/PermissionsManager.java
@@ -264,45 +264,23 @@ public class PermissionsManager {
         return user != null && user.getReadonly();
     }
 
-    public boolean getUserDeviceReadonly(long userId) {
-        User user = getUser(userId);
-        return user != null && user.getDeviceReadonly();
-    }
-
     public boolean getUserLimitCommands(long userId) {
         User user = getUser(userId);
         return user != null && user.getLimitCommands();
     }
 
-    public boolean getUserDisableReport(long userId) {
-        User user = getUser(userId);
-        return user != null && user.getDisableReports();
-    }
-
     public void checkReadonly(long userId) throws SecurityException {
         if (!getUserAdmin(userId) && (server.getReadonly() || getUserReadonly(userId))) {
             throw new SecurityException("Account is readonly");
         }
     }
 
-    public void checkDeviceReadonly(long userId) throws SecurityException {
-        if (!getUserAdmin(userId) && (server.getDeviceReadonly() || getUserDeviceReadonly(userId))) {
-            throw new SecurityException("Account is device readonly");
-        }
-    }
-
     public void checkLimitCommands(long userId) throws SecurityException {
         if (!getUserAdmin(userId) && (server.getLimitCommands() || getUserLimitCommands(userId))) {
             throw new SecurityException("Account has limit sending commands");
         }
     }
 
-    public void checkDisableReports(long userId) throws SecurityException {
-        if (!getUserAdmin(userId) && (server.getDisableReports() || getUserDisableReport(userId))) {
-            throw new SecurityException("Account has reports disabled");
-        }
-    }
-
     public void checkUserDeviceCommand(long userId, long deviceId, long commandId) throws SecurityException {
         if (!getUserAdmin(userId) && Context.getCommandsManager().checkDeviceCommand(deviceId, commandId)) {
             throw new SecurityException("Command can not be sent to this device");
-- 
cgit v1.2.3


From b164114d23ad3d0f965c003489e31a6c0d78b0d3 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Wed, 6 Apr 2022 19:54:32 -0700
Subject: Fix user creation

---
 src/main/java/org/traccar/database/UsersManager.java | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/src/main/java/org/traccar/database/UsersManager.java b/src/main/java/org/traccar/database/UsersManager.java
index 31759dc8b..a54226cfe 100644
--- a/src/main/java/org/traccar/database/UsersManager.java
+++ b/src/main/java/org/traccar/database/UsersManager.java
@@ -59,6 +59,12 @@ public class UsersManager extends SimpleObjectManager<User> {
         }
     }
 
+    @Override
+    public void addItem(User user) throws StorageException {
+        super.addItem(user);
+        getDataManager().updateUserPassword(user);
+    }
+
     @Override
     public void updateItem(User user) throws StorageException {
         if (user.getHashedPassword() != null) {
-- 
cgit v1.2.3