merge conflcits

This commit is contained in:
Michael 2019-03-28 17:13:21 +01:00
commit 0f6ca8a9d9

View File

@ -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;
}
}