diff options
| author | Hayden Hartman <haydenhartman10@gmail.com> | 2025-03-18 07:50:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-18 07:50:55 -0400 |
| commit | 3362bba1ccf1cee3985be95ab74a2456e6503d7a (patch) | |
| tree | 64f6b52fbd4714a29be0102ac988cb7ab02dbb33 /ufund-api/src | |
| parent | f063bf6e8634386f6ae3a3cf13fe2228e74454c9 (diff) | |
| parent | bd41fc58b5537a12072625bbf75baf75d5ed2274 (diff) | |
| download | JellySolutions-2.0.tar.gz JellySolutions-2.0.tar.bz2 JellySolutions-2.0.zip | |
Merge pull request #13 from RIT-SWEN-261-02/funding_basketv2.0
funding-basket merge
Diffstat (limited to 'ufund-api/src')
| -rw-r--r-- | ufund-api/src/main/java/com/ufund/api/ufundapi/model/User.java | 4 | ||||
| -rw-r--r-- | ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ufund-api/src/main/java/com/ufund/api/ufundapi/model/User.java b/ufund-api/src/main/java/com/ufund/api/ufundapi/model/User.java index f08f9f0..1c1d474 100644 --- a/ufund-api/src/main/java/com/ufund/api/ufundapi/model/User.java +++ b/ufund-api/src/main/java/com/ufund/api/ufundapi/model/User.java @@ -67,4 +67,8 @@ public class User { return type; } + public void copyPassword(User other) { + this.passwordHash = other.passwordHash; + } + } diff --git a/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java b/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java index f17f8f2..f809aac 100644 --- a/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java +++ b/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java @@ -81,7 +81,8 @@ public class UserFileDAO implements UserDAO { public User updateUser(User user) throws IOException { synchronized (users) { if (users.containsKey(user.getUsername())) { - users.put(user.getUsername(), user); + var old = users.put(user.getUsername(), user); + user.copyPassword(old); save(); return user; } else { |