From 69b18c1fe1d7d876c86de850b716de396877ad9d Mon Sep 17 00:00:00 2001 From: Kamal Wickramanayake Date: Sat, 20 Jun 2026 22:02:32 +0530 Subject: A list of users are shown. Added error pages. --- .../security/controllers/UserController.java | 67 ++++++++++++++++++++++ .../spring/security/controllers/UserForm.java | 27 +++++++++ .../spring/security/repository/UserRepository.java | 6 +- .../security/service/CustomUserDetailsService.java | 1 - .../spring/security/service/UserService.java | 12 ++++ .../spring/security/service/UserServiceImpl.java | 49 ++++++++++++++++ 6 files changed, 158 insertions(+), 4 deletions(-) create mode 100644 spring-boot/10-role-based-security/src/main/java/com/example/spring/security/controllers/UserController.java create mode 100644 spring-boot/10-role-based-security/src/main/java/com/example/spring/security/controllers/UserForm.java create mode 100644 spring-boot/10-role-based-security/src/main/java/com/example/spring/security/service/UserService.java create mode 100644 spring-boot/10-role-based-security/src/main/java/com/example/spring/security/service/UserServiceImpl.java (limited to 'spring-boot/10-role-based-security/src/main/java/com/example/spring/security') diff --git a/spring-boot/10-role-based-security/src/main/java/com/example/spring/security/controllers/UserController.java b/spring-boot/10-role-based-security/src/main/java/com/example/spring/security/controllers/UserController.java new file mode 100644 index 0000000..d9f5fdd --- /dev/null +++ b/spring-boot/10-role-based-security/src/main/java/com/example/spring/security/controllers/UserController.java @@ -0,0 +1,67 @@ +package com.example.spring.security.controllers; + +import java.util.List; +import java.util.Optional; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; + +import com.example.spring.security.entity.User; +import com.example.spring.security.repository.UserRepository; +import com.example.spring.security.service.UserService; + +import jakarta.validation.Valid; + +@Controller +public class UserController { + + @Autowired + private UserService userService; + + @GetMapping("/security/users") + @PreAuthorize("hasRole('ADMIN')") + public String showUsers(Model model) { + List users = userService.findAll(); + + model.addAttribute("users", users); + + return "security/users"; + } + + @GetMapping("/security/user/update/{id}") + @PreAuthorize("hasRole('ADMIN')") + public String showEditForm(@PathVariable Long id, Model model) { + Optional userOpt = userService.findById(id); + + User user = userOpt.get(); + + UserForm form = new UserForm(); + form.setId(user.getId()); + form.setUsername(user.getUsername()); + form.setDescription(user.getDescription()); + + model.addAttribute("userForm", form); + + return "security/user-form"; + } + + @PostMapping("/security/user/update") + @PreAuthorize("hasRole('ADMIN')") + public String updateUser(@Valid @ModelAttribute UserForm userForm, BindingResult bindingResult, + Model model) { + if (bindingResult.hasErrors()) { + return "security/user-form"; + } + + userService.updateUser(userForm.getId(), userForm.getDescription()); + + return "redirect:/security/users"; + } +} diff --git a/spring-boot/10-role-based-security/src/main/java/com/example/spring/security/controllers/UserForm.java b/spring-boot/10-role-based-security/src/main/java/com/example/spring/security/controllers/UserForm.java new file mode 100644 index 0000000..8df4932 --- /dev/null +++ b/spring-boot/10-role-based-security/src/main/java/com/example/spring/security/controllers/UserForm.java @@ -0,0 +1,27 @@ +package com.example.spring.security.controllers; + +public class UserForm { + + private Long id; + private String username; + private String description; + + public Long getId() { + return id; + } + public void setId(Long id) { + this.id = id; + } + public String getUsername() { + return username; + } + public void setUsername(String username) { + this.username = username; + } + public String getDescription() { + return description; + } + public void setDescription(String description) { + this.description = description; + } +} diff --git a/spring-boot/10-role-based-security/src/main/java/com/example/spring/security/repository/UserRepository.java b/spring-boot/10-role-based-security/src/main/java/com/example/spring/security/repository/UserRepository.java index f67039c..24cf579 100644 --- a/spring-boot/10-role-based-security/src/main/java/com/example/spring/security/repository/UserRepository.java +++ b/spring-boot/10-role-based-security/src/main/java/com/example/spring/security/repository/UserRepository.java @@ -2,12 +2,12 @@ package com.example.spring.security.repository; import java.util.Optional; -import org.springframework.data.repository.ListCrudRepository; +import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; import com.example.spring.security.entity.User; @Repository -public interface UserRepository extends ListCrudRepository { +public interface UserRepository extends JpaRepository { Optional findByUsername(String username); -} +} \ No newline at end of file diff --git a/spring-boot/10-role-based-security/src/main/java/com/example/spring/security/service/CustomUserDetailsService.java b/spring-boot/10-role-based-security/src/main/java/com/example/spring/security/service/CustomUserDetailsService.java index cdced4a..1795109 100644 --- a/spring-boot/10-role-based-security/src/main/java/com/example/spring/security/service/CustomUserDetailsService.java +++ b/spring-boot/10-role-based-security/src/main/java/com/example/spring/security/service/CustomUserDetailsService.java @@ -21,5 +21,4 @@ public class CustomUserDetailsService implements UserDetailsService { return userRepository.findByUsername(username) .orElseThrow(() -> new UsernameNotFoundException("User not found")); } - } \ No newline at end of file diff --git a/spring-boot/10-role-based-security/src/main/java/com/example/spring/security/service/UserService.java b/spring-boot/10-role-based-security/src/main/java/com/example/spring/security/service/UserService.java new file mode 100644 index 0000000..a4e18be --- /dev/null +++ b/spring-boot/10-role-based-security/src/main/java/com/example/spring/security/service/UserService.java @@ -0,0 +1,12 @@ +package com.example.spring.security.service; + +import java.util.List; +import java.util.Optional; + +import com.example.spring.security.entity.User; + +public interface UserService { + public Optional findById(Long id); + public List findAll(); + public void updateUser(Long userId, String description); +} diff --git a/spring-boot/10-role-based-security/src/main/java/com/example/spring/security/service/UserServiceImpl.java b/spring-boot/10-role-based-security/src/main/java/com/example/spring/security/service/UserServiceImpl.java new file mode 100644 index 0000000..0d44d21 --- /dev/null +++ b/spring-boot/10-role-based-security/src/main/java/com/example/spring/security/service/UserServiceImpl.java @@ -0,0 +1,49 @@ +package com.example.spring.security.service; + +import java.util.List; +import java.util.Optional; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.stereotype.Service; + +import com.example.spring.security.entity.User; +import com.example.spring.security.repository.UserRepository; + +import jakarta.transaction.Transactional; + +@Service +public class UserServiceImpl implements UserService { + + @Autowired + private UserRepository userRepository; + + @Override + public Optional findById(Long id) { + return userRepository.findById(id); + } + + @Override + public List findAll() { + return userRepository.findAll(Sort.by(Sort.Direction.ASC, "username")); + } + + @PreAuthorize("hasRole('ADMIN')") + @Transactional + @Override + public void updateUser(Long id, String description) { + // Do whatever the work needed. + // ... + + Optional userOpt = userRepository.findById(id); + + User user = userOpt.get(); + + user.setDescription(description); + + // NO userRepository.save(user) IS ACTUALLY REQUIRED HERE since the method + // has been annotated with @Transactional! + // Transaction commits -> Hibernate issues the SQL UPDATE. + } +} -- cgit v1.2.3