From 2068403a6b232eccb9b722fd4a1edf16c86a4bb5 Mon Sep 17 00:00:00 2001 From: Mehara Rothila Ranawaka Date: Fri, 7 Nov 2025 00:41:34 +0530 Subject: [PATCH 1/2] Update authentication controller and service --- .../techtorque/auth_service/controller/AuthController.java | 2 +- .../com/techtorque/auth_service/service/AuthService.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/auth-service/src/main/java/com/techtorque/auth_service/controller/AuthController.java b/auth-service/src/main/java/com/techtorque/auth_service/controller/AuthController.java index be6e0fa..22f5952 100644 --- a/auth-service/src/main/java/com/techtorque/auth_service/controller/AuthController.java +++ b/auth-service/src/main/java/com/techtorque/auth_service/controller/AuthController.java @@ -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 diff --git a/auth-service/src/main/java/com/techtorque/auth_service/service/AuthService.java b/auth-service/src/main/java/com/techtorque/auth_service/service/AuthService.java index caaeac7..57e8b08 100644 --- a/auth-service/src/main/java/com/techtorque/auth_service/service/AuthService.java +++ b/auth-service/src/main/java/com/techtorque/auth_service/service/AuthService.java @@ -237,7 +237,7 @@ public LoginResponse verifyEmail(String token, HttpServletRequest request) { List 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(), @@ -288,11 +288,11 @@ public LoginResponse refreshToken(String refreshTokenString) { com.techtorque.auth_service.entity.RefreshToken refreshToken = tokenService.validateRefreshToken(refreshTokenString); User user = refreshToken.getUser(); - + List 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(), From 698ab1de8dc22d7ae9d3f5508a42b1ffac937ab5 Mon Sep 17 00:00:00 2001 From: Mehara Rothila Ranawaka Date: Fri, 7 Nov 2025 00:41:42 +0530 Subject: [PATCH 2/2] Update Spring Boot configuration --- auth-service/src/main/resources/META-INF/spring.factories | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/auth-service/src/main/resources/META-INF/spring.factories b/auth-service/src/main/resources/META-INF/spring.factories index 540b00f..d172548 100644 --- a/auth-service/src/main/resources/META-INF/spring.factories +++ b/auth-service/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ -org.springframework.context.ApplicationContextInitializer=\ -com.techtorque.auth_service.config.DatabasePreflightInitializer +#org.springframework.context.ApplicationContextInitializer=\ +#com.techtorque.auth_service.config.DatabasePreflightInitializer