From 251f5c3f25ae7d3dfbfed49c896b7f012893b4c5 Mon Sep 17 00:00:00 2001 From: Maximilian Leopold Date: Mon, 25 Mar 2019 17:22:58 +0100 Subject: [PATCH] =?UTF-8?q?@RequestBody=20hinzugef=C3=BCgt=20beim=20login?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bugageocaching/controller/Controller.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java index 273dd02..b0b29d6 100644 --- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java +++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java @@ -48,20 +48,19 @@ public class Controller { @RequestMapping("/api/login") @ResponseBody - public ResponseEntity login(@RequestParam(value = "username", defaultValue = "") String username, - @RequestParam(value = "password", defaultValue = "") String password){ - if(username == "" || password == ""){ - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); + public ResponseEntity login(@RequestBody User user){ + if(user.getUsername() == null || user.getPassword() == null){ + return ResponseEntity.status(401).body(null); } - if(userRepository.findByUsername(username) == null){ - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); + if(userRepository.findByUsername(user.getUsername()) == null){ + return ResponseEntity.status(401).body(null); } - if(BCrypt.checkpw(password, userRepository.findByUsername(username).getPassword())){ + if(BCrypt.checkpw(user.getPassword(), userRepository.findByUsername(user.getUsername()).getPassword())){ String token = BCrypt.hashpw(String.valueOf(System.currentTimeMillis() + counter.incrementAndGet()), BCrypt.gensalt()); String hashedToken = BCrypt.hashpw(token, BCrypt.gensalt()); - userRepository.findByUsername(username).setToken(hashedToken); - userRepository.save(userRepository.findByUsername(username)); + userRepository.findByUsername(user.getUsername()).setToken(hashedToken); + userRepository.save(userRepository.findByUsername(user.getUsername())); return ResponseEntity.ok(new Gson().toJson(token)); } return ResponseEntity.status(HttpStatus.BAD_GATEWAY).body(null);