[SHIBUI-1058]

Replaced getPrincipal with getCurrentUser. Now returns the user object instead of just Principal.getName.
TIER · Jan 21, 2019 · 36ee155 · 36ee155
1 parent 4aad65c
commit 36ee155
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/...main/java/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersController.java b/...main/java/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersController.java
@@ -57,8 +57,12 @@ public List<User> getAll() {
 
     @Transactional(readOnly = true)
     @GetMapping("/current")
-    public ResponseEntity<?> getPrincipal(Principal principal) {
-        return ResponseEntity.ok(principal);
+    public ResponseEntity<?> getCurrentUser(Principal principal) {
+        if (principal != null && principal.getName() != null) {
+            return ResponseEntity.ok(userRepository.findByUsername(principal.getName()));
+        } else {
+            return ResponseEntity.notFound().build();
+        }
     }
 
     @Transactional(readOnly = true)