diff options
| author | Akash Keshav <112591754+domesticchores@users.noreply.github.com> | 2025-03-18 17:10:14 -0400 |
|---|---|---|
| committer | Akash Keshav <112591754+domesticchores@users.noreply.github.com> | 2025-03-18 17:10:14 -0400 |
| commit | 28339dd8694a91c9f7d08bc5155fe6765440428a (patch) | |
| tree | 2ac44e862a46a87475deb865a2cc37f9e81d3670 /ufund-api/src/main/java/com/ufund/api/ufundapi/controller/UserController.java | |
| parent | 0268894e5b80c908d2c3eb5c2228ee22fde52904 (diff) | |
| parent | 9044bbbff92618990fa4a4bd82cfcc96781da526 (diff) | |
| download | JellySolutions-28339dd8694a91c9f7d08bc5155fe6765440428a.tar.gz JellySolutions-28339dd8694a91c9f7d08bc5155fe6765440428a.tar.bz2 JellySolutions-28339dd8694a91c9f7d08bc5155fe6765440428a.zip | |
Merge branch 'funding_basket' of https://github.com/RIT-SWEN-261-02/team-project-2245-swen-261-02-2b-jellysolutions into funding_basket
Diffstat (limited to 'ufund-api/src/main/java/com/ufund/api/ufundapi/controller/UserController.java')
| -rw-r--r-- | ufund-api/src/main/java/com/ufund/api/ufundapi/controller/UserController.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/UserController.java b/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/UserController.java index a16fdec..fd6a960 100644 --- a/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/UserController.java +++ b/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/UserController.java @@ -104,7 +104,7 @@ public class UserController { public ResponseEntity<User> updateUser(@RequestBody User user, @PathVariable String username, @RequestHeader("jelly-api-key") String key) { LOG.log(Level.INFO,"PUT: " + user + " " + username + " " + key.toString()); try { - //authService.authenticate(username, key); + authService.authenticate(username, key); user = userService.updateUser(user, username); if (user != null) { return new ResponseEntity<>(user, HttpStatus.OK); @@ -115,9 +115,9 @@ public class UserController { return new ResponseEntity<>(HttpStatus.BAD_REQUEST); } catch (IOException e) { return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR); - } //catch (IllegalAccessException e) { - // return new ResponseEntity<>(HttpStatus.UNAUTHORIZED); - // } + } catch (IllegalAccessException e) { + return new ResponseEntity<>(HttpStatus.UNAUTHORIZED); + } } /** |