aboutsummaryrefslogtreecommitdiff
path: root/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/UserController.java
diff options
context:
space:
mode:
authorGunther6070 <haydenhartman10@yahoo.com>2025-03-18 12:38:32 -0400
committerGunther6070 <haydenhartman10@yahoo.com>2025-03-18 12:38:32 -0400
commitcd24514f7b75e1cde515c99607bf3b2bc0f4fc88 (patch)
tree72fe95bb3f532bec92cd68de46da49b50e2d9a13 /ufund-api/src/main/java/com/ufund/api/ufundapi/controller/UserController.java
parentcbb02fb9fe06601ac419e804a7c87ff8452ed889 (diff)
parent0b41684e57c79374aee3a564307cd4fdef603e7c (diff)
downloadJellySolutions-cd24514f7b75e1cde515c99607bf3b2bc0f4fc88.tar.gz
JellySolutions-cd24514f7b75e1cde515c99607bf3b2bc0f4fc88.tar.bz2
JellySolutions-cd24514f7b75e1cde515c99607bf3b2bc0f4fc88.zip
Merge branch 'funding_basket' of https://github.com/RIT-SWEN-261-02/team-project-2245-swen-261-02-2b 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.java9
1 files changed, 5 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 adf17a1..024bfc9 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
@@ -102,8 +102,9 @@ public class UserController {
*/
@PutMapping("/{username}")
public ResponseEntity<User> updateUser(@RequestBody User user, @PathVariable String username, @RequestHeader("jelly-api-key") String key) {
+ System.out.println("controller: " + 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);
@@ -114,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);
+ // }
}
/**