From eb4796ca34de947a7539141ece9095450b37cff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Micha=C5=82ek?= Date: Mon, 15 Dec 2014 20:59:49 +0100 Subject: [PATCH] save registration id on server during login --- .../java/application/controllers/UserController.java | 9 ++++++++- src/main/java/application/model/User.java | 11 +++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main/java/application/controllers/UserController.java b/src/main/java/application/controllers/UserController.java index 1d86b00..8852d36 100644 --- a/src/main/java/application/controllers/UserController.java +++ b/src/main/java/application/controllers/UserController.java @@ -49,16 +49,23 @@ public class UserController { @RequestMapping(value = "/login", method = RequestMethod.POST) @ResponseBody - public String login(@RequestParam String login,@RequestParam String password) throws JSONException{ + public String login(@RequestParam String login, @RequestParam String password, @RequestParam String registrationId) throws JSONException{ JSONObject loginResponse = new JSONObject(); boolean userFound = false; for(User user: userRepository.findAll()){ if(login.equals(user.getEmail()) && password.equals(user.getPassword())){ userFound = true; + + //save users registration id + user.setRegistratioId(registrationId); + userRepository.save(user); + loginResponse.put("success", true); loginResponse.put("userId", user.getUserId()); + loginResponse.put("registrationId", user.getRegistratioId()); + //access codes JSONArray accessCodes = new JSONArray(); for(Role role : user.getRoles()){ diff --git a/src/main/java/application/model/User.java b/src/main/java/application/model/User.java index b5409d0..08a8f3a 100644 --- a/src/main/java/application/model/User.java +++ b/src/main/java/application/model/User.java @@ -24,6 +24,17 @@ public class User { @Basic private String password; + public String getRegistratioId() { + return registratioId; + } + + public void setRegistratioId(String registratioId) { + this.registratioId = registratioId; + } + + @Basic + private String registratioId; + @ManyToMany(cascade=CascadeType.ALL, fetch=FetchType.EAGER) @JoinTable( name="User_Role",