diff --git a/src/main/java/life/mosu/mosuserver/global/config/SecurityConfig.java b/src/main/java/life/mosu/mosuserver/global/config/SecurityConfig.java index 9ebc44a0..033dda09 100644 --- a/src/main/java/life/mosu/mosuserver/global/config/SecurityConfig.java +++ b/src/main/java/life/mosu/mosuserver/global/config/SecurityConfig.java @@ -4,7 +4,15 @@ import java.util.HashMap; import java.util.List; import java.util.Map; - +import life.mosu.mosuserver.application.oauth.OAuthUserService; +import life.mosu.mosuserver.global.filter.TokenExceptionFilter; +import life.mosu.mosuserver.global.filter.TokenFilter; +import life.mosu.mosuserver.global.handler.AuthLogoutHandler; +import life.mosu.mosuserver.global.handler.AuthLogoutSuccessHandler; +import life.mosu.mosuserver.global.handler.OAuth2LoginFailureHandler; +import life.mosu.mosuserver.global.handler.OAuth2LoginSuccessHandler; +import life.mosu.mosuserver.global.resolver.AuthorizationRequestRedirectResolver; +import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpMethod; @@ -31,16 +39,6 @@ import org.springframework.web.cors.CorsConfigurationSource; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; -import life.mosu.mosuserver.application.oauth.OAuthUserService; -import life.mosu.mosuserver.global.filter.TokenExceptionFilter; -import life.mosu.mosuserver.global.filter.TokenFilter; -import life.mosu.mosuserver.global.handler.AuthLogoutHandler; -import life.mosu.mosuserver.global.handler.AuthLogoutSuccessHandler; -import life.mosu.mosuserver.global.handler.OAuth2LoginFailureHandler; -import life.mosu.mosuserver.global.handler.OAuth2LoginSuccessHandler; -import life.mosu.mosuserver.global.resolver.AuthorizationRequestRedirectResolver; -import lombok.RequiredArgsConstructor; - @Configuration @EnableWebSecurity @EnableMethodSecurity diff --git a/src/main/java/life/mosu/mosuserver/global/config/WebMvcConfig.java b/src/main/java/life/mosu/mosuserver/global/config/WebMvcConfig.java index 6a4ccdb7..e861aa3f 100644 --- a/src/main/java/life/mosu/mosuserver/global/config/WebMvcConfig.java +++ b/src/main/java/life/mosu/mosuserver/global/config/WebMvcConfig.java @@ -1,16 +1,14 @@ package life.mosu.mosuserver.global.config; import java.util.List; - +import life.mosu.mosuserver.global.resolver.PhoneNumberArgumentResolver; +import life.mosu.mosuserver.global.resolver.UserIdArgumentResolver; +import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Configuration; import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import life.mosu.mosuserver.global.resolver.PhoneNumberArgumentResolver; -import life.mosu.mosuserver.global.resolver.UserIdArgumentResolver; -import lombok.RequiredArgsConstructor; - @Configuration @RequiredArgsConstructor public class WebMvcConfig implements WebMvcConfigurer { diff --git a/src/main/java/life/mosu/mosuserver/global/handler/OAuthErrorType.java b/src/main/java/life/mosu/mosuserver/global/handler/OAuthErrorType.java index 9ae0e07a..7dac694c 100644 --- a/src/main/java/life/mosu/mosuserver/global/handler/OAuthErrorType.java +++ b/src/main/java/life/mosu/mosuserver/global/handler/OAuthErrorType.java @@ -6,7 +6,8 @@ public enum OAuthErrorType { CANCELED("CANCELED"), DUPLICATE("DUPLICATE"), - UNKNOWN("UNKNOWN"); + UNKNOWN("UNKNOWN"), + INVALID_TOKEN("INVALID_TOKEN"); private final String message; @@ -21,6 +22,8 @@ public static OAuthErrorType from(String text) { return switch (text) { case "DUPLICATE" -> DUPLICATE; case "[access_denied] User denied access" -> CANCELED; + case "[invalid_token_response] An error occurred while attempting to retrieve the OAuth 2.0 Access Token Response: 401 : [no body]" -> + INVALID_TOKEN; default -> UNKNOWN; }; } diff --git a/src/main/java/life/mosu/mosuserver/presentation/profile/ProfileController.java b/src/main/java/life/mosu/mosuserver/presentation/profile/ProfileController.java index f2264d3c..0687a969 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/profile/ProfileController.java +++ b/src/main/java/life/mosu/mosuserver/presentation/profile/ProfileController.java @@ -37,7 +37,7 @@ public ResponseEntity> create( } @PutMapping - @PreAuthorize("isAuthenticated() and hasRole('USER')") + @PreAuthorize("hasRole('USER')") public ResponseEntity> update( @UserId Long userId, @Valid @RequestBody EditProfileRequest request @@ -47,7 +47,7 @@ public ResponseEntity> update( } @GetMapping - @PreAuthorize("isAuthenticated() and hasRole('USER')") + @PreAuthorize("hasRole('USER')") public ResponseEntity> getProfile( @UserId Long userId ) {