merge conflcits
This commit is contained in:
commit
0f6ca8a9d9
@ -122,11 +122,11 @@ public class Controller {
|
||||
@CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
|
||||
@RequestMapping("api/logout")
|
||||
@ResponseBody
|
||||
String logout(@RequestParam String token) {
|
||||
boolean logout(@RequestParam String token) {
|
||||
|
||||
User user = userRepository.findByUsername(token.substring(0, token.indexOf("$")));
|
||||
user.setToken("abgemeldet");
|
||||
userRepository.save(user);
|
||||
return new Gson().toJson(user);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user