Modify UserPrincipal creation.

techkuz · Nov 24, 2018 · 7981a72 · 7981a72
1 parent ae83c60
commit 7981a72
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/app-server/src/main/java/com/hack/junction/sharecity/controller/UserController.java b/app-server/src/main/java/com/hack/junction/sharecity/controller/UserController.java
@@ -38,10 +38,10 @@ public class UserController {
     private static final Logger logger = LoggerFactory.getLogger(UserController.class);
 
     @GetMapping("/user/me")
-    @PreAuthorize("hasRole('STARTUP')")
+    @PreAuthorize("hasRoles('CORPORATE', 'STARTUP')")
     public UserSummary getCurrentUser(@CurrentUser UserPrincipal currentUser) {
         UserSummary userSummary = new UserSummary(currentUser.getId(), currentUser.getUsername(), currentUser.getName(),
-                RoleName.ROLE_STARTUP.name());
+                currentUser.getRole().getName().name());
         return userSummary;
     }
 

diff --git a/app-server/src/main/java/com/hack/junction/sharecity/security/UserPrincipal.java b/app-server/src/main/java/com/hack/junction/sharecity/security/UserPrincipal.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.hack.junction.sharecity.model.AppUser;
+import com.hack.junction.sharecity.model.Role;
 import com.hack.junction.sharecity.model.User;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -34,6 +35,9 @@ public class UserPrincipal implements UserDetails {
     @JsonIgnore
     private String password;
 
+    @JsonIgnore
+    private Role role;
+
     private Collection<? extends GrantedAuthority> authorities;
 
     public static UserPrincipal create(AppUser user ) {
@@ -47,6 +51,7 @@ public static UserPrincipal create(AppUser user ) {
                 user.getUsername(),
                 user.getEmail(),
                 user.getPassword(),
+                user.getRoles().iterator().next(),
                 authorities
         );
     }