Windy/traccar
1
0
Fork 0
mirror of https://github.com/traccar/traccar.git synced 2025-01-07 03:07:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Default to registration disabled

Browse Source
This commit is contained in:
Anton Tananaev 2024-04-04 17:28:59 -07:00
parent e001c629d8
commit b209b3aa18
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
schema/changelog-4.0-clean.xml
View File

@ -335,7 +335,7 @@
<column name="id" type="INT" autoIncrement="true">
<constraints primaryKey="true" />
</column>
<column name="registration" type="BOOLEAN" defaultValueBoolean="true">
<column name="registration" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false" />
</column>
<column name="latitude" type="DOUBLE" defaultValueNumeric="0">
@ -614,7 +614,7 @@
<addForeignKeyConstraint baseTableName="tc_user_user" baseColumnNames="userid" constraintName="fk_user_user_userid" onDelete="CASCADE" referencedColumnNames="id" referencedTableName="tc_users" />
<insert tableName="tc_servers">
<column name="registration" valueBoolean="true" />
<column name="registration" valueBoolean="false" />
<column name="latitude" valueNumeric="0" />
<column name="longitude" valueNumeric="0" />
<column name="zoom" valueNumeric="0" />

10
src/main/java/org/traccar/api/resource/UserResource.java
View File

@ -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"),