Skip to content
This repository was archived by the owner on Nov 23, 2025. It is now read-only.
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 @@ -228,7 +228,7 @@ public ResponseEntity<?> changePassword(@Valid @RequestBody ChangePasswordReques
@ApiResponse(responseCode = "403", description = "Admin role required")
})
@PostMapping("/users/employee")
@PreAuthorize("hasRole('ADMIN')")
@PreAuthorize("hasRole('ADMIN') or hasRole('SUPER_ADMIN')")
public ResponseEntity<?> createEmployee(@Valid @RequestBody CreateEmployeeRequest createEmployeeRequest) {
try {
// Now we are calling the method that was previously unused
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ public LoginResponse verifyEmail(String token, HttpServletRequest request) {
Set<String> roleNames = updatedUser.getRoles() != null ?
updatedUser.getRoles().stream()
.map(role -> role.getName().name())
.collect(Collectors.toList());
.collect(Collectors.toSet()) :
Set.of("CUSTOMER");

Expand Down Expand Up @@ -294,11 +295,11 @@ public LoginResponse refreshToken(String refreshTokenString) {
com.techtorque.auth_service.entity.RefreshToken refreshToken = tokenService.validateRefreshToken(refreshTokenString);

User user = refreshToken.getUser();

List<String> roles = user.getRoles().stream()
.map(role -> role.getName().name())
.collect(Collectors.toList());

String jwt = jwtUtil.generateJwtToken(new org.springframework.security.core.userdetails.User(
user.getUsername(),
user.getPassword(),
Expand Down
4 changes: 2 additions & 2 deletions auth-service/src/main/resources/META-INF/spring.factories
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
org.springframework.context.ApplicationContextInitializer=\
com.techtorque.auth_service.config.DatabasePreflightInitializer
#org.springframework.context.ApplicationContextInitializer=\
#com.techtorque.auth_service.config.DatabasePreflightInitializer
Loading