-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feature/SHIBUI-1031' into feature/SHIBUI-1029
- Loading branch information
Showing
60 changed files
with
1,981 additions
and
102 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
115 changes: 115 additions & 0 deletions
115
...main/java/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| package edu.internet2.tier.shibboleth.admin.ui.security.controller; | ||
|
|
||
| import edu.internet2.tier.shibboleth.admin.ui.controller.ErrorResponse; | ||
| import edu.internet2.tier.shibboleth.admin.ui.security.model.User; | ||
| import edu.internet2.tier.shibboleth.admin.ui.security.repository.RoleRepository; | ||
| import edu.internet2.tier.shibboleth.admin.ui.security.repository.UserRepository; | ||
| import edu.internet2.tier.shibboleth.admin.ui.security.service.UserRoleService; | ||
| import org.apache.commons.lang.StringUtils; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
| import org.springframework.http.HttpStatus; | ||
| import org.springframework.http.ResponseEntity; | ||
| import org.springframework.security.crypto.bcrypt.BCrypt; | ||
| import org.springframework.transaction.annotation.Transactional; | ||
| import org.springframework.web.bind.annotation.DeleteMapping; | ||
| import org.springframework.web.bind.annotation.GetMapping; | ||
| import org.springframework.web.bind.annotation.PathVariable; | ||
| import org.springframework.web.bind.annotation.PostMapping; | ||
| import org.springframework.web.bind.annotation.PutMapping; | ||
| import org.springframework.web.bind.annotation.RequestBody; | ||
| import org.springframework.web.bind.annotation.RequestMapping; | ||
| import org.springframework.web.bind.annotation.RestController; | ||
| import org.springframework.web.client.HttpClientErrorException; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Optional; | ||
|
|
||
| import static org.springframework.http.HttpStatus.NOT_FOUND; | ||
|
|
||
| /** | ||
| * Implementation of the REST resource endpoints exposing system users. | ||
| * | ||
| * @author Dmitriy Kopylenko | ||
| */ | ||
| @RestController | ||
| @RequestMapping("/api/admin/users") | ||
| public class UsersController { | ||
|
|
||
| private static final Logger logger = LoggerFactory.getLogger(UsersController.class); | ||
|
|
||
| private UserRepository userRepository; | ||
| private RoleRepository roleRepository; | ||
| private UserRoleService userRoleService; | ||
|
|
||
| public UsersController(UserRepository userRepository, RoleRepository roleRepository, UserRoleService userRoleService) { | ||
| this.userRepository = userRepository; | ||
| this.roleRepository = roleRepository; | ||
| this.userRoleService = userRoleService; | ||
| } | ||
|
|
||
| @Transactional(readOnly = true) | ||
| @GetMapping | ||
| public List<User> getAll() { | ||
| return userRepository.findAll(); | ||
| } | ||
|
|
||
| @Transactional(readOnly = true) | ||
| @GetMapping("/{username}") | ||
| public ResponseEntity<?> getOne(@PathVariable String username) { | ||
| return ResponseEntity.ok(findUserOrThrowHttp404(username)); | ||
| } | ||
|
|
||
| @Transactional | ||
| @DeleteMapping("/{username}") | ||
| public ResponseEntity<?> deleteOne(@PathVariable String username) { | ||
| User user = findUserOrThrowHttp404(username); | ||
| userRepository.delete(user); | ||
| return ResponseEntity.noContent().build(); | ||
| } | ||
|
|
||
| @Transactional | ||
| @PostMapping | ||
| ResponseEntity<?> saveOne(@RequestBody User user) { | ||
| Optional<User> persistedUser = userRepository.findByUsername(user.getUsername()); | ||
| if (persistedUser.isPresent()) { | ||
| return ResponseEntity | ||
| .status(HttpStatus.CONFLICT) | ||
| .body(new ErrorResponse(String.valueOf(HttpStatus.CONFLICT.value()), | ||
| String.format("A user with username [%s] already exists within the system.", user.getUsername()))); | ||
| } | ||
| user.setPassword(BCrypt.hashpw(user.getPassword(), BCrypt.gensalt())); | ||
| userRoleService.updateUserRole(user); | ||
| User savedUser = userRepository.save(user); | ||
| return ResponseEntity.ok(savedUser); | ||
| } | ||
|
|
||
| @Transactional | ||
| @PutMapping("/{username}") | ||
| ResponseEntity<?> updateOne(@PathVariable(value = "username") String username, @RequestBody User user) { | ||
| User persistedUser = findUserOrThrowHttp404(username); | ||
| if (StringUtils.isNotBlank(user.getFirstName())) { | ||
| persistedUser.setFirstName(user.getFirstName()); | ||
| } | ||
| if (StringUtils.isNotBlank(user.getLastName())) { | ||
| persistedUser.setLastName(user.getLastName()); | ||
| } | ||
| if (StringUtils.isNotBlank(user.getEmailAddress())) { | ||
| persistedUser.setEmailAddress(user.getEmailAddress()); | ||
| } | ||
| if (StringUtils.isNotBlank(user.getPassword())) { | ||
| persistedUser.setPassword(BCrypt.hashpw(user.getPassword(), BCrypt.gensalt())); | ||
| } | ||
| if (StringUtils.isNotBlank(user.getRole())) { | ||
| persistedUser.setRole(user.getRole()); | ||
| userRoleService.updateUserRole(persistedUser); | ||
| } | ||
| User savedUser = userRepository.save(persistedUser); | ||
| return ResponseEntity.ok(savedUser); | ||
| } | ||
|
|
||
| private User findUserOrThrowHttp404(String username) { | ||
| return userRepository.findByUsername(username) | ||
| .orElseThrow(() -> new HttpClientErrorException(NOT_FOUND, String.format("User with username [%s] not found", username))); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
...rc/main/java/edu/internet2/tier/shibboleth/admin/ui/security/service/UserRoleService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| package edu.internet2.tier.shibboleth.admin.ui.security.service; | ||
|
|
||
| import edu.internet2.tier.shibboleth.admin.ui.security.model.Role; | ||
| import edu.internet2.tier.shibboleth.admin.ui.security.model.User; | ||
| import edu.internet2.tier.shibboleth.admin.ui.security.repository.RoleRepository; | ||
| import org.apache.commons.lang.StringUtils; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
|
|
||
| import java.util.HashSet; | ||
| import java.util.Optional; | ||
| import java.util.Set; | ||
|
|
||
| /** | ||
| * @author Bill Smith (wsmith@unicon.net) | ||
| */ | ||
| public class UserRoleService { | ||
|
|
||
| @Autowired | ||
| RoleRepository roleRepository; | ||
|
|
||
| /** | ||
| * Given a user with a defined User.role, update the User.roles collection with that role. | ||
| * | ||
| * This currently exists because users should only ever have one role in the system at this time. However, user | ||
| * roles are persisted as a set of roles (for future-proofing). Once we start allowing a user to have multiple roles, | ||
| * this method and User.role can go away. | ||
| * @param user | ||
| */ | ||
| public void updateUserRole(User user) { | ||
| if (StringUtils.isNotBlank(user.getRole())) { | ||
| Optional<Role> userRole = roleRepository.findByName(user.getRole()); | ||
| if (userRole.isPresent()) { | ||
| Set<Role> userRoles = new HashSet<>(); | ||
| userRoles.add(userRole.get()); | ||
| user.setRoles(userRoles); | ||
| } else { | ||
| throw new RuntimeException(String.format("User with username [%s] is defined with role [%s] which does not exist in the system!", user.getUsername(), user.getRole())); | ||
| } | ||
| } else { | ||
| throw new RuntimeException(String.format("User with username [%s] has no role defined and therefor cannot be updated!", user.getUsername())); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.