From b041df03d31c5caca7ba26a0b03f26d56d5d33e5 Mon Sep 17 00:00:00 2001
From: Luke <lomah001@gold.ac.uk>
Date: Mon, 22 Apr 2019 12:05:18 +0100
Subject: [PATCH] upd: added react friendly return
---
.../backend/glowhouse/controller/UserController.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/backend/glowhouse/controller/UserController.java b/src/main/java/com/backend/glowhouse/controller/UserController.java
index fd8141e..a98dda7 100644
--- a/src/main/java/com/backend/glowhouse/controller/UserController.java
+++ b/src/main/java/com/backend/glowhouse/controller/UserController.java
@@ -7,6 +7,8 @@ import com.backend.glowhouse.model.response.UserSummary;
import com.backend.glowhouse.model.User;
import com.backend.glowhouse.repository.UserRepository;
import com.backend.glowhouse.security.UserPrincipal;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,16 +19,19 @@ import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/api")
public class UserController {
+ ObjectMapper mapper = new ObjectMapper();
@Autowired
private UserRepository userRepository;
private static final Logger logger = LoggerFactory.getLogger(UserController.class);
- @GetMapping("/user/me")
+ @GetMapping("/user/details")
@PreAuthorize("hasRole('USER')")
- public UserSummary getCurrentUser(@AuthenticationPrincipal UserPrincipal currentUser) {
- return new UserSummary(currentUser.getId(), currentUser.getUsername(), currentUser.getName());
+ public String getCurrentUserDetails(@AuthenticationPrincipal UserPrincipal currentUser) throws JsonProcessingException {
+ UserSummary userSummary = new UserSummary(currentUser.getId(), currentUser.getUsername(), currentUser.getName());
+
+ return mapper.writeValueAsString(userSummary);
}
@GetMapping("/user/checkUsernameAvailability")
--
GitLab