diff --git a/server/build.gradle.kts b/server/build.gradle.kts index 6cee94b..9a7cdd5 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -56,7 +56,7 @@ dependencies { annotationProcessor("org.projectlombok:lombok") annotationProcessor("org.springframework.boot:spring-boot-configuration-processor") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1") testImplementation("org.springframework.boot:spring-boot-starter-test") testImplementation("org.springframework.security:spring-security-test") } diff --git a/server/src/main/java/com/ticketing/server/global/security/WebSecurityConfig.java b/server/src/main/java/com/ticketing/server/global/security/WebSecurityConfig.java index c4e2365..2fceedd 100644 --- a/server/src/main/java/com/ticketing/server/global/security/WebSecurityConfig.java +++ b/server/src/main/java/com/ticketing/server/global/security/WebSecurityConfig.java @@ -18,7 +18,7 @@ import org.springframework.security.crypto.password.PasswordEncoder; @Configuration @EnableWebSecurity -@EnableGlobalMethodSecurity(prePostEnabled = true) +@EnableGlobalMethodSecurity(securedEnabled = true) @RequiredArgsConstructor public class WebSecurityConfig extends WebSecurityConfigurerAdapter { diff --git a/server/src/main/java/com/ticketing/server/user/application/UserController.java b/server/src/main/java/com/ticketing/server/user/application/UserController.java index b2070c2..178e191 100644 --- a/server/src/main/java/com/ticketing/server/user/application/UserController.java +++ b/server/src/main/java/com/ticketing/server/user/application/UserController.java @@ -17,7 +17,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.security.access.annotation.Secured; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PatchMapping; @@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequiredArgsConstructor -@RequestMapping("/user") +@RequestMapping("/api/user") @Slf4j public class UserController { @@ -44,14 +44,14 @@ public class UserController { } @DeleteMapping - @PreAuthorize("hasRole('GUEST')") + @Secured("ROLE_GUEST") public ResponseEntity deleteUser(@RequestBody @Valid UserDeleteRequest request) { User user = userService.delete(request.toDeleteUserDto(passwordEncoder)); return ResponseEntity.status(HttpStatus.OK).body(UserDeleteResponse.of(user)); } @PatchMapping("/password") - @PreAuthorize("hasRole('GUEST')") + @Secured("ROLE_GUEST") public ResponseEntity changePassword(@RequestBody @Valid UserModifyPasswordRequest request) { if (request.oldEqualNew()) { log.error("기존 패스워드와 동일한 패스워드로 변경할 수 없습니다.");