aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/database/DataManager.java
diff options
context:
space:
mode:
authorDemian <dalonso@ecotaxi.com>2015-06-16 18:25:28 -0300
committerDemian <dalonso@ecotaxi.com>2015-06-16 18:42:13 -0300
commit92ac9aaa10fcf65a005c4e06245ce4a9427d5148 (patch)
tree57a23077fc9af137baffbb51bcb4ba82cff2f94b /src/org/traccar/database/DataManager.java
parent80f766554a3dd117b2958fd8c55b8fab2b73f9f9 (diff)
downloadtrackermap-server-92ac9aaa10fcf65a005c4e06245ce4a9427d5148.tar.gz
trackermap-server-92ac9aaa10fcf65a005c4e06245ce4a9427d5148.tar.bz2
trackermap-server-92ac9aaa10fcf65a005c4e06245ce4a9427d5148.zip
Separated the persisted password (hashedPassword) from the password sent from the web request. Improved JSON serialization so it doesnt send as a response the hashed password and salt.
Diffstat (limited to 'src/org/traccar/database/DataManager.java')
-rw-r--r--src/org/traccar/database/DataManager.java10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index 79de15998..1aae7da4e 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -167,7 +167,7 @@ public class DataManager {
admin.setName("admin");
admin.setEmail("admin");
admin.setAdmin(true);
- admin.hashPassword("admin");
+ admin.setPassword("admin");
admin.setId(QueryBuilder.create(dataSource, properties.getProperty("database.insertUser"))
.setObject(admin)
.executeUpdate());
@@ -232,20 +232,18 @@ public class DataManager {
.executeQuery(new User());
}
- public void addUser(User user, String password) throws SQLException {
- user.hashPassword(password);
+ public void addUser(User user) throws SQLException {
user.setId(QueryBuilder.create(dataSource, properties.getProperty("database.insertUser"))
.setObject(user)
.executeUpdate());
Context.getPermissionsManager().refresh();
}
- public void updateUser(User user, String password) throws SQLException {
+ public void updateUser(User user) throws SQLException {
QueryBuilder.create(dataSource, properties.getProperty("database.updateUser"))
.setObject(user)
.executeUpdate();
- if(password != null) {
- user.hashPassword(password);
+ if(user.getHashedPassword() != null) {
QueryBuilder.create(dataSource, properties.getProperty("database.updateUserPassword"))
.setObject(user)
.executeUpdate();