aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorAnton Tananaev <anton@traccar.org>2024-04-04 17:28:59 -0700
committerAnton Tananaev <anton@traccar.org>2024-04-04 17:28:59 -0700
commitb209b3aa18db7bf3b2095ce924edb09ffb831542 (patch)
treee5e63dc88a1768565919be79b651c4cf18ff8137 /src/main/java
parente001c629d89e75fae1b13f69fb71517b134f3e09 (diff)
downloadtrackermap-server-b209b3aa18db7bf3b2095ce924edb09ffb831542.tar.gz
trackermap-server-b209b3aa18db7bf3b2095ce924edb09ffb831542.tar.bz2
trackermap-server-b209b3aa18db7bf3b2095ce924edb09ffb831542.zip
Default to registration disabled
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/traccar/api/resource/UserResource.java10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/main/java/org/traccar/api/resource/UserResource.java b/src/main/java/org/traccar/api/resource/UserResource.java
index 47ea9b07c..fbc31e46a 100644
--- a/src/main/java/org/traccar/api/resource/UserResource.java
+++ b/src/main/java/org/traccar/api/resource/UserResource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 - 2022 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2024 Anton Tananaev (anton@traccar.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -95,7 +95,9 @@ public class UserResource extends BaseObjectResource<User> {
}
}
} else {
- if (!permissionsService.getServer().getRegistration()) {
+ if (UserUtil.isEmpty(storage)) {
+ entity.setAdministrator(true);
+ } else if (!permissionsService.getServer().getRegistration()) {
throw new SecurityException("Registration disabled");
}
if (permissionsService.getServer().getBoolean(Keys.WEB_TOTP_FORCE.getKey())
@@ -106,10 +108,6 @@ public class UserResource extends BaseObjectResource<User> {
}
}
- if (UserUtil.isEmpty(storage)) {
- entity.setAdministrator(true);
- }
-
entity.setId(storage.addObject(entity, new Request(new Columns.Exclude("id"))));
storage.updateObject(entity, new Request(
new Columns.Include("hashedPassword", "salt"),