Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[UI]fix for getting username from SecurityContext #7609

Merged
merged 2 commits into from
Apr 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,10 @@ public class SecureController {

/**
* Return user name if there is one or null. Passing null as the user to a rest call should result in a user not authorized error.
* @param request servlet request
* @return userName or null if there is not one
*/
protected String getUser(HttpServletRequest request) {
String userName = null;
Authentication auth = SecurityContextHolder.getContext().getAuthentication();
if(auth != null && auth.getDetails() != null && (auth.getDetails() instanceof TokenUser)){
userName = ((TokenUser) auth.getDetails()).getUsername();
}

protected String getUser() {
String userName = SecurityContextHolder.getContext().getAuthentication().getName();
if(userName == null){
throw new UserNotAuthorizedException("User is not authorized");
}
Expand Down
Loading