Revize 8549b80b

#10228 - mírna úprava response json objektu pro namapování na react

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/controller/UserController.java

@@ -13 +13 @@
 
 /**
  * Controller for providing basic support for user management
- * @version 1.0
+ *
  * @author Vaclav Hrabik, Jiri Trefil
+ * @version 1.0
  */
 @RestController
 @RequestMapping("v2/user")
@@ -28 +29 @@
 
     /**
      * Method to register new user in the app
-     * @param user  User who wants register in to the app
-     * @return      message
+     *
+     * @param user User who wants register in to the app
+     * @return message
      */
     @PostMapping(value = "/register")
     public ResponseEntity<String> registerUser(@RequestBody User user) {
         UserModelStatusCodes statusCode = userService.registerUser(user);
-        return getResponseEntity(statusCode);
+        return getResponseEntity(statusCode, null);
     }
 
     /**
      * Method to login user in to the app
-     * @param user  User who wants to login in to the app
-     * @return      message
+     *
+     * @param user User who wants to login in to the app
+     * @return message
      */
     @PostMapping(value = "/login")
     public ResponseEntity<String> loginUser(@RequestBody User user) {
         UserModelStatusCodes statusCode = userService.loginUser(user);
-        return getResponseEntity(statusCode);
+
+        String jwtToken = null;
+        if (statusCode.statusCode == 200)
+            jwtToken = "token";
+
+        return getResponseEntity(statusCode, jwtToken);
     }
 
     /**
      * Method to logout user from the app
-     * @param user  User who wants logout from the app
-     * @return      message after logout
+     *
+     * @param user User who wants logout from the app
+     * @return message after logout
      */
     @PostMapping(value = "/logout")
     public ResponseEntity<String> logoutUser(@RequestBody User user) {
         UserModelStatusCodes statusCode = userService.logoutUser(user);
-        return getResponseEntity(statusCode);
+        return getResponseEntity(statusCode, null);
     }
 
     /**
      * Method to create response
-     * @param statusCode    UserModelStatusCodes code
-     * @return              ResponseEntity with code and msg
+     *
+     * @param statusCode UserModelStatusCodes code
+     * @return ResponseEntity with code and msg
      */
-    private ResponseEntity<String> getResponseEntity(UserModelStatusCodes statusCode) {
-        String message = this.generateResponseObject(statusCode);
+    private ResponseEntity<String> getResponseEntity(UserModelStatusCodes statusCode, String jwtToken) {
+        String message = this.generateResponseObject(statusCode, jwtToken);
         int code = statusCode.statusCode;
         return new ResponseEntity<>(message, HttpStatus.valueOf(code));
     }
 
     /**
      * Method to create JSON object
-     * @param code  UserModelStatusCodes code
-     * @return      String that represents JSON object
+     *
+     * @param code UserModelStatusCodes code
+     * @return String that represents JSON object
      */
-    private String generateResponseObject(UserModelStatusCodes code){
+    private String generateResponseObject(UserModelStatusCodes code, String jwtToken) {
         HashMap<String, String> json = new HashMap<>();
         json.put("msg", code.label);
+        if (jwtToken != null) {
+            json.put("jwtToken", jwtToken);
+        }
         return JSONBuilder.buildJson(json);
-
     }
 
 
-
 }

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/dials/UserModelStatusCodes.java

@@ -16 +16 @@
     public final String label;
     public final int statusCode;
 
-    private UserModelStatusCodes(String s, int i) {
+    UserModelStatusCodes(String s, int i) {
         this.label = s;
         this.statusCode = i;
     }
+
 }