From 5aade9edf89f1463b5d0d5a34ab39825c8e07c40 Mon Sep 17 00:00:00 2001 From: aqrms Date: Tue, 21 Nov 2023 10:44:13 +0900 Subject: [PATCH 01/21] [feat] #118. Apply gitignore to logfiles --- backend/orury/.gitignore | 1 + .../main/java/com/kernel360/orury/config/SecurityConfig.java | 1 + .../kernel360/orury/domain/admin/service/AdminPostService.java | 2 -- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/orury/.gitignore b/backend/orury/.gitignore index d99209a..863e9a4 100644 --- a/backend/orury/.gitignore +++ b/backend/orury/.gitignore @@ -6,6 +6,7 @@ build/ !**/src/test/**/build/ LOCAL_LOG_URL_IS_UNDEFINED .DS_Store +AWS_LOG_URL_IS_UNDEFINED/ ### STS ### .apt_generated diff --git a/backend/orury/src/main/java/com/kernel360/orury/config/SecurityConfig.java b/backend/orury/src/main/java/com/kernel360/orury/config/SecurityConfig.java index 8960757..80a36ca 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/config/SecurityConfig.java +++ b/backend/orury/src/main/java/com/kernel360/orury/config/SecurityConfig.java @@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.core.annotation.Order; import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.http.SessionCreationPolicy; diff --git a/backend/orury/src/main/java/com/kernel360/orury/domain/admin/service/AdminPostService.java b/backend/orury/src/main/java/com/kernel360/orury/domain/admin/service/AdminPostService.java index 95bd13d..a8b4699 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/domain/admin/service/AdminPostService.java +++ b/backend/orury/src/main/java/com/kernel360/orury/domain/admin/service/AdminPostService.java @@ -39,8 +39,6 @@ public PostDto createPost( .postContent(postRequest.getPostContent()) .userId(1L) .board(boardEntity) - // .thumbnailUrl(postRequest.getPostImageList().isEmpty() ? null : postRequest.getPostImageList().get(0)) - // .images(postRequest.getPostImageList().isEmpty() ? null : String.join(",", postRequest.getPostImageList())) .createdBy(Constant.ADMIN.getMessage()) .createdAt(LocalDateTime.now()) .updatedBy(Constant.ADMIN.getMessage()) From f47bf58762542b7db1cf6370e9b683a4c3d4ec05 Mon Sep 17 00:00:00 2001 From: aqrms Date: Tue, 21 Nov 2023 19:22:25 +0900 Subject: [PATCH 02/21] Add AdminAuthorizationFilter --- .../orury/config/SecurityConfig.java | 74 +++++++++- .../orury/config/jwt/TokenProvider.java | 92 +++++++------ .../jwt/admin/AdminAuthenticationFilter.java | 87 ++++++++++++ .../jwt/admin/AdminAuthorizationFilter.java | 130 ++++++++++++++++++ .../controller/AdminBoardController.java | 5 + .../orury/src/main/resources/application.yml | 21 +-- .../templates/layout/charts-apexcharts.html | 2 +- .../templates/layout/charts-chartjs.html | 2 +- .../templates/layout/charts-echarts.html | 2 +- .../layout/components-accordion.html | 2 +- .../templates/layout/components-alerts.html | 2 +- .../templates/layout/components-badges.html | 2 +- .../layout/components-breadcrumbs.html | 2 +- .../templates/layout/components-buttons.html | 2 +- .../templates/layout/components-cards.html | 2 +- .../templates/layout/components-carousel.html | 2 +- .../layout/components-list-group.html | 2 +- .../templates/layout/components-modal.html | 2 +- .../layout/components-pagination.html | 2 +- .../templates/layout/components-progress.html | 2 +- .../templates/layout/components-spinners.html | 2 +- .../templates/layout/components-tabs.html | 2 +- .../templates/layout/components-tooltips.html | 2 +- .../templates/layout/forms-editors.html | 2 +- .../templates/layout/forms-elements.html | 2 +- .../templates/layout/forms-layouts.html | 2 +- .../templates/layout/forms-validation.html | 2 +- .../templates/layout/icons-bootstrap.html | 2 +- .../templates/layout/icons-boxicons.html | 2 +- .../templates/layout/icons-remix.html | 2 +- .../templates/layout/pages-blank.html | 2 +- .../templates/layout/pages-contact.html | 2 +- .../resources/templates/layout/pages-faq.html | 2 +- .../templates/layout/pages-register.html | 2 +- .../templates/layout/tables-general.html | 2 +- .../templates/layout/users-profile.html | 2 +- .../templates/{layout => }/pages-login.html | 4 +- 37 files changed, 384 insertions(+), 89 deletions(-) create mode 100644 backend/orury/src/main/java/com/kernel360/orury/config/jwt/admin/AdminAuthenticationFilter.java create mode 100644 backend/orury/src/main/java/com/kernel360/orury/config/jwt/admin/AdminAuthorizationFilter.java rename backend/orury/src/main/resources/templates/{layout => }/pages-login.html (95%) diff --git a/backend/orury/src/main/java/com/kernel360/orury/config/SecurityConfig.java b/backend/orury/src/main/java/com/kernel360/orury/config/SecurityConfig.java index 80a36ca..5d6f748 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/config/SecurityConfig.java +++ b/backend/orury/src/main/java/com/kernel360/orury/config/SecurityConfig.java @@ -1,13 +1,18 @@ package com.kernel360.orury.config; import com.kernel360.orury.config.jwt.*; +import com.kernel360.orury.config.jwt.admin.AdminAuthenticationFilter; +import com.kernel360.orury.config.jwt.admin.AdminAuthorizationFilter; +import com.kernel360.orury.domain.user.db.UserRepository; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.annotation.Order; +import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -15,9 +20,12 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; +import org.springframework.security.web.authentication.www.BasicAuthenticationFilter; +import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import org.springframework.web.filter.CorsFilter; import java.util.List; +import java.util.Map; /** author : aqrms @@ -36,10 +44,18 @@ public class SecurityConfig { "/api/notify/**" // sse 테스트를 위해 임시로 ); private final TokenProvider tokenProvider; + private final UserRepository userRepository; private final CorsFilter corsFilter; private final JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint; private final JwtAccessDeniedHandler jwtAccessDeniedHandler; - private CustomAuthenticationFailureHandler failureHandler; + @Value("${token.cookie.name}") + private String cookieName; + @Value("${token.cookie.refresh-name}") + private String cookieRefreshName; + @Value("${jwt.access-validity}") + private String accessCookieMaxAge; + @Value("${jwt.refresh-validity}") + private String refreshCookieMaxAge; @Bean public PasswordEncoder passwordEncoder() { @@ -47,9 +63,59 @@ public PasswordEncoder passwordEncoder() { } @Bean - public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { + @Order(1) + public SecurityFilterChain adminFilterChain(HttpSecurity http) throws Exception { + AuthenticationManager authenticationManager = (AuthenticationManager)http.getSharedObjects(); http - // token을 사용하는 방식이기 때문에 csrf를 disable합니다. + .requestMatchers(requestMatchers -> requestMatchers + .antMatchers("/admin/**") + ) + .csrf().disable() + .httpBasic().disable() + + .addFilterBefore(new AdminAuthenticationFilter( + authenticationManager, + tokenProvider, + cookieName, + cookieRefreshName, + accessCookieMaxAge, + refreshCookieMaxAge + ), + UsernamePasswordAuthenticationFilter.class) + .addFilterBefore( + new AdminAuthorizationFilter( + userRepository, + tokenProvider, + cookieName, + cookieRefreshName, + accessCookieMaxAge), + BasicAuthenticationFilter.class + ) + .authorizeHttpRequests(authorizeHttpRequests -> authorizeHttpRequests + .antMatchers("/assets/**").permitAll() + .anyRequest().authenticated() + ) + .formLogin() + .loginPage("/admin/login") + .usernameParameter("emailAddr") + .passwordParameter("password") + .failureUrl("/admin/login") + .permitAll(); + http + .logout() + .logoutRequestMatcher(new AntPathRequestMatcher("/logout")) + .logoutSuccessUrl("/admin") + .invalidateHttpSession(true); + return http.build(); + } + + @Bean + @Order(2) + public SecurityFilterChain apiFilterChain(HttpSecurity http) throws Exception { + http + .requestMatchers(requestMatchers -> requestMatchers + .antMatchers("/api/**") + ) .csrf(csrf -> csrf.disable()) .addFilterBefore(corsFilter, UsernamePasswordAuthenticationFilter.class) @@ -60,8 +126,6 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { .authorizeHttpRequests(authorizeHttpRequests -> authorizeHttpRequests .mvcMatchers(SWAGGER.toArray(new String[0])).permitAll() - .antMatchers("/assets/**").permitAll() - .antMatchers("/admin/**").permitAll() .antMatchers("/api/hello", "/api/auth/login", "/api/user/signup").permitAll() .anyRequest().authenticated() ) diff --git a/backend/orury/src/main/java/com/kernel360/orury/config/jwt/TokenProvider.java b/backend/orury/src/main/java/com/kernel360/orury/config/jwt/TokenProvider.java index d89b847..174a832 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/config/jwt/TokenProvider.java +++ b/backend/orury/src/main/java/com/kernel360/orury/config/jwt/TokenProvider.java @@ -11,6 +11,7 @@ import com.kernel360.orury.global.exception.TokenExpiredException; import com.kernel360.orury.global.exception.TokenNotFoundException; import com.kernel360.orury.global.message.errors.ErrorMessages; + import io.jsonwebtoken.*; import io.jsonwebtoken.io.Decoders; import io.jsonwebtoken.security.Keys; @@ -54,7 +55,7 @@ public TokenProvider( @Value("${jwt.secret}") String secret, UserRepository userRepository, RefreshTokenRepository tokenRepository - ) { + ) { this.refreshValidityMs = refershValiditySec * 1000L; this.accessValidityMs = accessValiditySec * 1000L; this.secret = secret; @@ -69,52 +70,51 @@ public void afterPropertiesSet() { this.key = Keys.hmacShaKeyFor(keyBytes); } - - - public String createAccessToken(Authentication authentication){ + public String createAccessToken(Authentication authentication) { String authorities = authentication.getAuthorities().stream() - .map(GrantedAuthority::getAuthority) - .collect(Collectors.joining(",")); + .map(GrantedAuthority::getAuthority) + .collect(Collectors.joining(",")); long now = (new Date()).getTime(); Date validity = new Date(now + accessValidityMs); UserEntity user = userRepository.findByEmailAddr(authentication.getName()).orElseThrow( - ()-> new RuntimeException(ErrorMessages.THERE_IS_NO_USER.getMessage()) + () -> new RuntimeException(ErrorMessages.THERE_IS_NO_USER.getMessage()) ); return Jwts.builder() - .claim(Constant.USERID.getMessage(), user.getId()) - .setSubject(authentication.getName()) - .claim(AUTHORITIES_KEY, authorities) - .signWith(key, SignatureAlgorithm.HS512) - .setExpiration(validity) - .compact(); + .claim(Constant.USERID.getMessage(), user.getId()) + .setSubject(authentication.getName()) + .claim(AUTHORITIES_KEY, authorities) + .signWith(key, SignatureAlgorithm.HS512) + .setExpiration(validity) + .compact(); } - public String createRefreshToken(Authentication authentication){ + + public String createRefreshToken(Authentication authentication) { long now = (new Date()).getTime(); Date validity = new Date(now + this.refreshValidityMs); // var userId = userRepository.findByEmailAddr(authentication.getName()).orElseThrow( - ()-> new RuntimeException(ErrorMessages.THERE_IS_NO_USER.getMessage()) + () -> new RuntimeException(ErrorMessages.THERE_IS_NO_USER.getMessage()) ).getId(); return Jwts.builder() - .claim( Constant.USERID.getMessage(), userId) - .signWith(key, SignatureAlgorithm.HS512) - .setExpiration(validity) - .compact(); + .claim(Constant.USERID.getMessage(), userId) + .signWith(key, SignatureAlgorithm.HS512) + .setExpiration(validity) + .compact(); } // 토큰을 파라미터로 받아서 클레임을 만들고 이를 이용해 유저 객체를 만들고 Authentication 객체 리턴 public Authentication getAuthentication(String token) throws JsonProcessingException { -// Claims claims = Jwts -// .parserBuilder() -// .setSigningKey(key) -// .build() -// .parseClaimsJws(token) -// .getBody(); - + // Claims claims = Jwts + // .parserBuilder() + // .setSigningKey(key) + // .build() + // .parseClaimsJws(token) + // .getBody(); + String[] chunks = token.split("\\."); String payload = new String(Base64.getUrlDecoder().decode(chunks[1])); @@ -123,7 +123,7 @@ public Authentication getAuthentication(String token) throws JsonProcessingExcep JsonNode jsonNode = objectMapper.readTree(payload); // 필요한 정보 추출 -// String userId = jsonNode.get("userId").asText(); + // String userId = jsonNode.get("userId").asText(); String sub = jsonNode.get("sub").asText(); String auth = jsonNode.get("auth").asText(); @@ -137,43 +137,42 @@ public Authentication getAuthentication(String token) throws JsonProcessingExcep return new UsernamePasswordAuthenticationToken(principal, token, authorities); } - - public boolean validateToken(String token ) throws ExpiredJwtException{ + public boolean validateToken(String token) throws ExpiredJwtException { Jwts.parserBuilder().setSigningKey(key).build().parseClaimsJws(token); return true; } - public void storeToken(String token){ + public void storeToken(String token) { Claims claims = Jwts - .parserBuilder() - .setSigningKey(key) - .build() - .parseClaimsJws(token) - .getBody(); + .parserBuilder() + .setSigningKey(key) + .build() + .parseClaimsJws(token) + .getBody(); var userId = Long.parseLong(claims.get("userId").toString()); var user = userRepository.findById(userId).orElseThrow( - () -> new RuntimeException(ErrorMessages.THERE_IS_NO_USER.getMessage()) + () -> new RuntimeException(ErrorMessages.THERE_IS_NO_USER.getMessage()) ); RefreshTokenEntity existingToken = refreshTokenRepository.findByUserId(userId).orElse(null); - if(existingToken != null){ + if (existingToken != null) { refreshTokenRepository.delete(existingToken); } var expiredDate = claims.getExpiration().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(); var refreshTokenEntity = RefreshTokenEntity.builder() - .tokenValue(token) - .user(user) - .expirationDate(expiredDate) - .build(); + .tokenValue(token) + .user(user) + .expirationDate(expiredDate) + .build(); refreshTokenRepository.save(refreshTokenEntity); } public boolean validateRefreshToken(String refreshToken) { var refreshTokenEntity = refreshTokenRepository.findByTokenValue(refreshToken).orElseThrow( - () -> new TokenNotFoundException(ErrorMessages.ILLEGAL_REFRESH_JWT.getMessage()) + () -> new TokenNotFoundException(ErrorMessages.ILLEGAL_REFRESH_JWT.getMessage()) ); var expireDate = refreshTokenEntity.getExpirationDate(); @@ -184,5 +183,14 @@ public boolean validateRefreshToken(String refreshToken) { return validateToken(refreshToken); } + public boolean isTokenExpired(String token) { + Date expirationDate = Jwts.parserBuilder() + .setSigningKey(key) + .build() + .parseClaimsJws(token) + .getBody() + .getExpiration(); + return expirationDate.before(new Date()); + } } \ No newline at end of file diff --git a/backend/orury/src/main/java/com/kernel360/orury/config/jwt/admin/AdminAuthenticationFilter.java b/backend/orury/src/main/java/com/kernel360/orury/config/jwt/admin/AdminAuthenticationFilter.java new file mode 100644 index 0000000..72a208c --- /dev/null +++ b/backend/orury/src/main/java/com/kernel360/orury/config/jwt/admin/AdminAuthenticationFilter.java @@ -0,0 +1,87 @@ +package com.kernel360.orury.config.jwt.admin; + +import java.io.IOException; +import java.util.ArrayList; + +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; + +import com.kernel360.orury.config.jwt.TokenProvider; + +import lombok.RequiredArgsConstructor; + +@RequiredArgsConstructor +public class AdminAuthenticationFilter extends UsernamePasswordAuthenticationFilter { + + private final AuthenticationManager authenticationManager; + private final TokenProvider tokenProvider; + private final String cookieName; + private final String cookieRefreshName; + private final String accessCookieMaxAge; + private final String refreshCookieMaxAge; + + @Override + public Authentication attemptAuthentication( + HttpServletRequest request, + HttpServletResponse response + ) throws AuthenticationException { + UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken( + request.getParameter("userEmail"), + request.getParameter("password"), + new ArrayList<>() + ); + return authenticationManager.authenticate(authenticationToken); + } + + @Override + protected void successfulAuthentication(HttpServletRequest request, HttpServletResponse response, FilterChain chain, + Authentication authResult) throws IOException, ServletException { + String accessToken = tokenProvider.createAccessToken(authResult); + String refreshToken = tokenProvider.createRefreshToken(authResult); + tokenProvider.storeToken(refreshToken); + + addAuthenticationCookie(request, response, accessToken, true); + addAuthenticationCookie(request, response, refreshToken, false); + + String preLoginUrl = request.getParameter("preLoginUrl"); + if (preLoginUrl != null && !preLoginUrl.isBlank()) { + response.sendRedirect(preLoginUrl); + } else { + response.sendRedirect("/admin"); + } + } + + private void addAuthenticationCookie(HttpServletRequest request, HttpServletResponse response, String token, + boolean isAccessToken) { + Cookie authCookie; + int maxAge; + + if (isAccessToken) { + authCookie = new Cookie(cookieName, token); + maxAge = Integer.parseInt(accessCookieMaxAge) * 1000; + } else { + authCookie = new Cookie(cookieRefreshName, token); + maxAge = Integer.parseInt(refreshCookieMaxAge) * 1000; + } + authCookie.setMaxAge(maxAge); + authCookie.setPath("/"); + authCookie.setHttpOnly(true); + authCookie.setSecure(request.isSecure()); + response.addCookie(authCookie); + } + + @Override + protected void unsuccessfulAuthentication(HttpServletRequest request, HttpServletResponse response, + AuthenticationException failed) throws IOException, ServletException { + response.sendRedirect("/admin/login"); + } +} diff --git a/backend/orury/src/main/java/com/kernel360/orury/config/jwt/admin/AdminAuthorizationFilter.java b/backend/orury/src/main/java/com/kernel360/orury/config/jwt/admin/AdminAuthorizationFilter.java new file mode 100644 index 0000000..04ec002 --- /dev/null +++ b/backend/orury/src/main/java/com/kernel360/orury/config/jwt/admin/AdminAuthorizationFilter.java @@ -0,0 +1,130 @@ +package com.kernel360.orury.config.jwt.admin; + +import java.io.IOException; +import java.util.Collections; +import java.util.Optional; + +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.web.filter.OncePerRequestFilter; + +import com.kernel360.orury.config.jwt.TokenProvider; +import com.kernel360.orury.domain.user.db.UserRepository; + +import lombok.RequiredArgsConstructor; + +@RequiredArgsConstructor +public class AdminAuthorizationFilter extends OncePerRequestFilter { + + private final UserRepository userRepository; + private final TokenProvider tokenProvider; + private final String cookieName; + private final String cookieRefreshName; + private final String accessCookieMaxAge; + + @Override + protected void doFilterInternal( + HttpServletRequest request, + HttpServletResponse response, + FilterChain chain + ) throws IOException, ServletException { + + Optional accessToken = extractTokenFromCookie(request, cookieName); + Optional refreshToken = extractTokenFromCookie(request, cookieRefreshName); + + if (accessToken.isPresent()) { + processAccessToken(accessToken.get(), response); + } else { + refreshToken.ifPresentOrElse( + presentRefreshToken -> processRefreshToken(presentRefreshToken, response), + () -> clearAuthenticationAndCookie(response) + ); + } + + chain.doFilter(request, response); + } + + private void processAccessToken(String accessToken, HttpServletResponse response) { + if (tokenProvider.isTokenExpired(accessToken)) { + clearAuthenticationAndCookie(response); + } else { + validateAndAuthenticateToken(response, accessToken); + } + } + + private void processRefreshToken(String refreshToken, HttpServletResponse response) { + if (!tokenProvider.isTokenExpired(refreshToken)) { + try { + String newAccessToken = tokenProvider.createAccessTokenByRefreshToken(refreshToken); + addAuthenticationCookie(response, newAccessToken); + validateAndAuthenticateToken(response, newAccessToken); + } catch (Exception e) { + clearAuthenticationAndCookie(response); + } + } else { + clearAuthenticationAndCookie(response); + } + } + + private Optional extractTokenFromCookie(HttpServletRequest request, String cookieName) { + Cookie[] cookies = request.getCookies(); + if (cookies != null) { + for (Cookie cookie : cookies) { + if (cookieName.equals(cookie.getName())) { + return Optional.of(cookie.getValue()); + } + } + } + return Optional.empty(); + } + + private void addAuthenticationCookie(HttpServletResponse response, String token) { + Cookie accessTokenCookie = new Cookie(cookieName, token); + accessTokenCookie.setHttpOnly(true); + accessTokenCookie.setPath("/"); + accessTokenCookie.setMaxAge(Integer.parseInt(accessCookieMaxAge) * 1000); + response.addCookie(accessTokenCookie); + } + + private void validateAndAuthenticateToken(HttpServletResponse response, String token) { + try { + if (tokenProvider.validateToken(token)) { + Authentication authentication = tokenProvider.getAuthentication(token); + SecurityContextHolder.getContext().setAuthentication(authentication); + } + // String userEmail = tokenProvider.getUserEmail(token); + // userRepository.findActiveUserByUserEmail(userEmail).ifPresent(user -> { + // Authentication auth = getAuthentication(user); + // SecurityContextHolder.getContext().setAuthentication(auth); + // }); + } catch (Exception e) { + clearAuthenticationAndCookie(response); + } + } + + // private Authentication getAuthentication(User user) { + // return new UsernamePasswordAuthenticationToken( + // user.getUserName(), + // null, + // Collections.singletonList( + // new SimpleGrantedAuthority("ROLE_" + user.getUserPermissionType().getValue().toUpperCase())) + // ); + // } + + private void clearAuthenticationAndCookie(HttpServletResponse response) { + SecurityContextHolder.clearContext(); + Cookie cookie = new Cookie(cookieName, null); + cookie.setPath("/"); + cookie.setHttpOnly(true); + cookie.setMaxAge(0); + response.addCookie(cookie); + } +} diff --git a/backend/orury/src/main/java/com/kernel360/orury/domain/admin/controller/AdminBoardController.java b/backend/orury/src/main/java/com/kernel360/orury/domain/admin/controller/AdminBoardController.java index c7070a7..1560518 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/domain/admin/controller/AdminBoardController.java +++ b/backend/orury/src/main/java/com/kernel360/orury/domain/admin/controller/AdminBoardController.java @@ -25,6 +25,11 @@ public class AdminBoardController { private final BoardService boardService; + @GetMapping("/login") + public String login() { + return "pages-login"; + } + @GetMapping public String index() { return "index"; diff --git a/backend/orury/src/main/resources/application.yml b/backend/orury/src/main/resources/application.yml index e4ba82f..f38f31a 100644 --- a/backend/orury/src/main/resources/application.yml +++ b/backend/orury/src/main/resources/application.yml @@ -19,18 +19,19 @@ spring: show_sql: true datasource: driver-class-name: com.mysql.cj.jdbc.Driver -# url: ${LOCAL_DB_URL} # configuration에서 설정 필요 - url: ENC(4t9k8jNC5SIDd1hpsqRJiw5NgwtRAZ9l2cY42PcN3v6GNDC61KXk4X3nYwwUdW4+aC6g41zh14HyfWg+2fPmfuTXHg7aw+vTvL9Oomq1wEKM2r2ZHJbhmakdpmbeMVjVALC/MSk28Tp4a5sBhUFRWdpaFO2qQcpdUHUd9KsuJh0=) -# username: ${LOCAL_DB_USERNAME} - username: ENC(2STroDy2TfWobkrTroFwbRcxLke05156ZFMrqwKmVssNcN4foSX4I6ax8YAgdW3R) -# password: ${LOCAL_DB_USER_PASSWORD} - password: ENC(a8l7l/AYNz2x1HPYyu+urOBwVcBhQkeWgTi6Fvt+lQFq1QyHsL8yyi5+wr7lh26P) + url: ${LOCAL_DB_URL} # configuration에서 설정 필요 + # url: ENC(4t9k8jNC5SIDd1hpsqRJiw5NgwtRAZ9l2cY42PcN3v6GNDC61KXk4X3nYwwUdW4+aC6g41zh14HyfWg+2fPmfuTXHg7aw+vTvL9Oomq1wEKM2r2ZHJbhmakdpmbeMVjVALC/MSk28Tp4a5sBhUFRWdpaFO2qQcpdUHUd9KsuJh0=) + username: ${LOCAL_DB_USERNAME} + # username: ENC(2STroDy2TfWobkrTroFwbRcxLke05156ZFMrqwKmVssNcN4foSX4I6ax8YAgdW3R) + password: ${LOCAL_DB_USER_PASSWORD} +# password: ENC(a8l7l/AYNz2x1HPYyu+urOBwVcBhQkeWgTi6Fvt+lQFq1QyHsL8yyi5+wr7lh26P) jwt: header: Authorization #HS512 알고리즘을 사용할 것이기 때문에 512bit, 즉 64byte 이상의 secret key를 사용해야 한다. #echo 'silvernine-tech-spring-boot-jwt-tutorial-secret-silvernine-tech-spring-boot-jwt-tutorial-secret'|base64 -# secret: ${LOCAL_JWT_SECRET_KEY} - secret: ENC(XNkGVBeK1sJZhLhri+zz7pJOhHCvfif265mvT8OUIbOGeQcOCtHNnG2s3qjsKNe2u+dLoNVQBzbF1bKUfDxi8Po5tL7jQbZMPA33Dg1QMQFQWV46IyrYnLykYXQQvpin/SNPXW04ECDoRLF3TNwcS22D8uWEwe8L2wtcauyHeO1z+J6lUQArPHy76O2pzC7FHlBjOTw3STd23e3dd1WBQtHAYVmOIvNuPreulzSaHXc=) - access-validity: 36000 - refresh-validity: 7200 + secret: ${LOCAL_JWT_SECRET_KEY} + # secret: ENC(XNkGVBeK1sJZhLhri+zz7pJOhHCvfif265mvT8OUIbOGeQcOCtHNnG2s3qjsKNe2u+dLoNVQBzbF1bKUfDxi8Po5tL7jQbZMPA33Dg1QMQFQWV46IyrYnLykYXQQvpin/SNPXW04ECDoRLF3TNwcS22D8uWEwe8L2wtcauyHeO1z+J6lUQArPHy76O2pzC7FHlBjOTw3STd23e3dd1WBQtHAYVmOIvNuPreulzSaHXc=) + access-validity: 20 + refresh-validity: 604800 + diff --git a/backend/orury/src/main/resources/templates/layout/charts-apexcharts.html b/backend/orury/src/main/resources/templates/layout/charts-apexcharts.html index 243ab4c..2614ff7 100644 --- a/backend/orury/src/main/resources/templates/layout/charts-apexcharts.html +++ b/backend/orury/src/main/resources/templates/layout/charts-apexcharts.html @@ -484,7 +484,7 @@
Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/charts-chartjs.html b/backend/orury/src/main/resources/templates/layout/charts-chartjs.html index e4e1f9b..bed1ef3 100644 --- a/backend/orury/src/main/resources/templates/layout/charts-chartjs.html +++ b/backend/orury/src/main/resources/templates/layout/charts-chartjs.html @@ -484,7 +484,7 @@
    Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/charts-echarts.html b/backend/orury/src/main/resources/templates/layout/charts-echarts.html index ccc10a7..7ea8731 100644 --- a/backend/orury/src/main/resources/templates/layout/charts-echarts.html +++ b/backend/orury/src/main/resources/templates/layout/charts-echarts.html @@ -484,7 +484,7 @@
    Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/components-accordion.html b/backend/orury/src/main/resources/templates/layout/components-accordion.html index f91c91d..e595276 100644 --- a/backend/orury/src/main/resources/templates/layout/components-accordion.html +++ b/backend/orury/src/main/resources/templates/layout/components-accordion.html @@ -484,7 +484,7 @@
    Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/components-alerts.html b/backend/orury/src/main/resources/templates/layout/components-alerts.html index 401ba8f..e62fee6 100644 --- a/backend/orury/src/main/resources/templates/layout/components-alerts.html +++ b/backend/orury/src/main/resources/templates/layout/components-alerts.html @@ -484,7 +484,7 @@
    Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/components-badges.html b/backend/orury/src/main/resources/templates/layout/components-badges.html index 2f6f330..da9a1b8 100644 --- a/backend/orury/src/main/resources/templates/layout/components-badges.html +++ b/backend/orury/src/main/resources/templates/layout/components-badges.html @@ -484,7 +484,7 @@
    Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/components-breadcrumbs.html b/backend/orury/src/main/resources/templates/layout/components-breadcrumbs.html index 110ea56..a5cbc90 100644 --- a/backend/orury/src/main/resources/templates/layout/components-breadcrumbs.html +++ b/backend/orury/src/main/resources/templates/layout/components-breadcrumbs.html @@ -484,7 +484,7 @@
    Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/components-buttons.html b/backend/orury/src/main/resources/templates/layout/components-buttons.html index 4f1a7ea..3f92a9d 100644 --- a/backend/orury/src/main/resources/templates/layout/components-buttons.html +++ b/backend/orury/src/main/resources/templates/layout/components-buttons.html @@ -484,7 +484,7 @@
    Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/components-cards.html b/backend/orury/src/main/resources/templates/layout/components-cards.html index d8630e1..b1238c8 100644 --- a/backend/orury/src/main/resources/templates/layout/components-cards.html +++ b/backend/orury/src/main/resources/templates/layout/components-cards.html @@ -484,7 +484,7 @@
    Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/components-carousel.html b/backend/orury/src/main/resources/templates/layout/components-carousel.html index 423c0b7..b5b7a66 100644 --- a/backend/orury/src/main/resources/templates/layout/components-carousel.html +++ b/backend/orury/src/main/resources/templates/layout/components-carousel.html @@ -484,7 +484,7 @@
    Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/components-list-group.html b/backend/orury/src/main/resources/templates/layout/components-list-group.html index 5c9c455..ef564d2 100644 --- a/backend/orury/src/main/resources/templates/layout/components-list-group.html +++ b/backend/orury/src/main/resources/templates/layout/components-list-group.html @@ -484,7 +484,7 @@
    Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/components-modal.html b/backend/orury/src/main/resources/templates/layout/components-modal.html index 01827b3..8140087 100644 --- a/backend/orury/src/main/resources/templates/layout/components-modal.html +++ b/backend/orury/src/main/resources/templates/layout/components-modal.html @@ -484,7 +484,7 @@
    Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/components-pagination.html b/backend/orury/src/main/resources/templates/layout/components-pagination.html index 4fe7eab..4b1c24e 100644 --- a/backend/orury/src/main/resources/templates/layout/components-pagination.html +++ b/backend/orury/src/main/resources/templates/layout/components-pagination.html @@ -484,7 +484,7 @@
    Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/components-progress.html b/backend/orury/src/main/resources/templates/layout/components-progress.html index 2a6c53c..df0178f 100644 --- a/backend/orury/src/main/resources/templates/layout/components-progress.html +++ b/backend/orury/src/main/resources/templates/layout/components-progress.html @@ -484,7 +484,7 @@
    Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/components-spinners.html b/backend/orury/src/main/resources/templates/layout/components-spinners.html index d9b54c2..fc85a6d 100644 --- a/backend/orury/src/main/resources/templates/layout/components-spinners.html +++ b/backend/orury/src/main/resources/templates/layout/components-spinners.html @@ -484,7 +484,7 @@
    Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/components-tabs.html b/backend/orury/src/main/resources/templates/layout/components-tabs.html index 3f5a72d..9ad4330 100644 --- a/backend/orury/src/main/resources/templates/layout/components-tabs.html +++ b/backend/orury/src/main/resources/templates/layout/components-tabs.html @@ -484,7 +484,7 @@
    Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/components-tooltips.html b/backend/orury/src/main/resources/templates/layout/components-tooltips.html index e513b1a..d7a5bae 100644 --- a/backend/orury/src/main/resources/templates/layout/components-tooltips.html +++ b/backend/orury/src/main/resources/templates/layout/components-tooltips.html @@ -484,7 +484,7 @@
    Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/forms-editors.html b/backend/orury/src/main/resources/templates/layout/forms-editors.html index ae6538a..e2bbb06 100644 --- a/backend/orury/src/main/resources/templates/layout/forms-editors.html +++ b/backend/orury/src/main/resources/templates/layout/forms-editors.html @@ -484,7 +484,7 @@
    Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/forms-elements.html b/backend/orury/src/main/resources/templates/layout/forms-elements.html index 2cc942c..4ea7e12 100644 --- a/backend/orury/src/main/resources/templates/layout/forms-elements.html +++ b/backend/orury/src/main/resources/templates/layout/forms-elements.html @@ -484,7 +484,7 @@
    Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/forms-layouts.html b/backend/orury/src/main/resources/templates/layout/forms-layouts.html index 25e8f08..55ec180 100644 --- a/backend/orury/src/main/resources/templates/layout/forms-layouts.html +++ b/backend/orury/src/main/resources/templates/layout/forms-layouts.html @@ -484,7 +484,7 @@
    Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/forms-validation.html b/backend/orury/src/main/resources/templates/layout/forms-validation.html index 5da8912..25f9926 100644 --- a/backend/orury/src/main/resources/templates/layout/forms-validation.html +++ b/backend/orury/src/main/resources/templates/layout/forms-validation.html @@ -484,7 +484,7 @@
    Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/icons-bootstrap.html b/backend/orury/src/main/resources/templates/layout/icons-bootstrap.html index a41ff52..b6687a0 100644 --- a/backend/orury/src/main/resources/templates/layout/icons-bootstrap.html +++ b/backend/orury/src/main/resources/templates/layout/icons-bootstrap.html @@ -484,7 +484,7 @@
    Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/icons-boxicons.html b/backend/orury/src/main/resources/templates/layout/icons-boxicons.html index 5ae3928..245b155 100644 --- a/backend/orury/src/main/resources/templates/layout/icons-boxicons.html +++ b/backend/orury/src/main/resources/templates/layout/icons-boxicons.html @@ -484,7 +484,7 @@
    Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/icons-remix.html b/backend/orury/src/main/resources/templates/layout/icons-remix.html index 70b1873..1e9cf03 100644 --- a/backend/orury/src/main/resources/templates/layout/icons-remix.html +++ b/backend/orury/src/main/resources/templates/layout/icons-remix.html @@ -484,7 +484,7 @@
    Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/pages-blank.html b/backend/orury/src/main/resources/templates/layout/pages-blank.html index ff3e67b..2c625dc 100644 --- a/backend/orury/src/main/resources/templates/layout/pages-blank.html +++ b/backend/orury/src/main/resources/templates/layout/pages-blank.html @@ -484,7 +484,7 @@
    Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/pages-contact.html b/backend/orury/src/main/resources/templates/layout/pages-contact.html index cb724c6..87563ba 100644 --- a/backend/orury/src/main/resources/templates/layout/pages-contact.html +++ b/backend/orury/src/main/resources/templates/layout/pages-contact.html @@ -484,7 +484,7 @@
    Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/pages-faq.html b/backend/orury/src/main/resources/templates/layout/pages-faq.html index 406b7d4..ddc3f24 100644 --- a/backend/orury/src/main/resources/templates/layout/pages-faq.html +++ b/backend/orury/src/main/resources/templates/layout/pages-faq.html @@ -484,7 +484,7 @@
    Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/pages-register.html b/backend/orury/src/main/resources/templates/layout/pages-register.html index df95a9e..27746d7 100644 --- a/backend/orury/src/main/resources/templates/layout/pages-register.html +++ b/backend/orury/src/main/resources/templates/layout/pages-register.html @@ -108,7 +108,7 @@
    Create an Account
    -

    Already have an account? Log +

    Already have an account? Log in

    diff --git a/backend/orury/src/main/resources/templates/layout/tables-general.html b/backend/orury/src/main/resources/templates/layout/tables-general.html index 9431c1b..e10916e 100644 --- a/backend/orury/src/main/resources/templates/layout/tables-general.html +++ b/backend/orury/src/main/resources/templates/layout/tables-general.html @@ -484,7 +484,7 @@
    Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/users-profile.html b/backend/orury/src/main/resources/templates/layout/users-profile.html index 8228a3c..95d896c 100644 --- a/backend/orury/src/main/resources/templates/layout/users-profile.html +++ b/backend/orury/src/main/resources/templates/layout/users-profile.html @@ -484,7 +484,7 @@
    Kevin Anderson
  • - diff --git a/backend/orury/src/main/resources/templates/layout/pages-login.html b/backend/orury/src/main/resources/templates/pages-login.html similarity index 95% rename from backend/orury/src/main/resources/templates/layout/pages-login.html rename to backend/orury/src/main/resources/templates/pages-login.html index 7e0d085..099697b 100644 --- a/backend/orury/src/main/resources/templates/layout/pages-login.html +++ b/backend/orury/src/main/resources/templates/pages-login.html @@ -50,7 +50,7 @@
    - @@ -95,7 +95,7 @@
    Login to Your Account
    -

    Don't have account? Create +

    Don't have account? Create an account

    From 52b48f9c9eafd14527e314d2e3d1a101e0a51044 Mon Sep 17 00:00:00 2001 From: aqrms Date: Wed, 22 Nov 2023 18:40:28 +0900 Subject: [PATCH 03/21] before branch v2 --- .../orury/config/SecurityConfig.java | 63 ++++++++++++------- .../jwt/admin/AdminAuthenticationFilter.java | 14 ++--- .../jwt/admin/AdminAuthorizationFilter.java | 7 ++- .../orury/src/main/resources/application.yml | 3 +- .../main/resources/templates/pages-login.html | 12 ++-- 5 files changed, 58 insertions(+), 41 deletions(-) diff --git a/backend/orury/src/main/java/com/kernel360/orury/config/SecurityConfig.java b/backend/orury/src/main/java/com/kernel360/orury/config/SecurityConfig.java index 5d6f748..826f5f4 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/config/SecurityConfig.java +++ b/backend/orury/src/main/java/com/kernel360/orury/config/SecurityConfig.java @@ -4,6 +4,7 @@ import com.kernel360.orury.config.jwt.admin.AdminAuthenticationFilter; import com.kernel360.orury.config.jwt.admin.AdminAuthorizationFilter; import com.kernel360.orury.domain.user.db.UserRepository; +import com.kernel360.orury.domain.user.service.CustomUserDetailsService; import lombok.RequiredArgsConstructor; @@ -13,6 +14,8 @@ import org.springframework.context.annotation.Configuration; import org.springframework.core.annotation.Order; import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -48,9 +51,11 @@ public class SecurityConfig { private final CorsFilter corsFilter; private final JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint; private final JwtAccessDeniedHandler jwtAccessDeniedHandler; - @Value("${token.cookie.name}") + private final CustomUserDetailsService customUserDetailsService; + + @Value("${jwt.cookie-name}") private String cookieName; - @Value("${token.cookie.refresh-name}") + @Value("${jwt.refresh-cookie-name}") private String cookieRefreshName; @Value("${jwt.access-validity}") private String accessCookieMaxAge; @@ -58,30 +63,43 @@ public class SecurityConfig { private String refreshCookieMaxAge; @Bean - public PasswordEncoder passwordEncoder() { + public BCryptPasswordEncoder passwordEncoder() { return new BCryptPasswordEncoder(); } + @Bean + public AuthenticationManager authenticationManager( + HttpSecurity http, + BCryptPasswordEncoder passwordEncoder + ) throws Exception { + return http.getSharedObject(AuthenticationManagerBuilder.class) + .userDetailsService(customUserDetailsService) + .passwordEncoder(passwordEncoder) + .and() + .build(); + } + @Bean @Order(1) - public SecurityFilterChain adminFilterChain(HttpSecurity http) throws Exception { - AuthenticationManager authenticationManager = (AuthenticationManager)http.getSharedObjects(); + public SecurityFilterChain adminFilterChain(HttpSecurity http, AuthenticationManager authenticationManager) throws + Exception { http .requestMatchers(requestMatchers -> requestMatchers .antMatchers("/admin/**") ) .csrf().disable() - .httpBasic().disable() - - .addFilterBefore(new AdminAuthenticationFilter( - authenticationManager, - tokenProvider, - cookieName, - cookieRefreshName, - accessCookieMaxAge, - refreshCookieMaxAge - ), - UsernamePasswordAuthenticationFilter.class) + .httpBasic().disable(); + // AdminAuthenticationFilter filter = new AdminAuthenticationFilter( + // tokenProvider, + // cookieName, + // cookieRefreshName, + // accessCookieMaxAge, + // refreshCookieMaxAge + // ); + // filter.setAuthenticationManager(authenticationManager); + // filter.setFilterProcessesUrl("/admin/proc-login"); + http + // .addFilterBefore(filter, UsernamePasswordAuthenticationFilter.class) .addFilterBefore( new AdminAuthorizationFilter( userRepository, @@ -97,15 +115,19 @@ public SecurityFilterChain adminFilterChain(HttpSecurity http) throws Exception ) .formLogin() .loginPage("/admin/login") + .permitAll() + .loginProcessingUrl("/admin/proc-login") .usernameParameter("emailAddr") - .passwordParameter("password") - .failureUrl("/admin/login") - .permitAll(); + .passwordParameter("password"); + http .logout() .logoutRequestMatcher(new AntPathRequestMatcher("/logout")) .logoutSuccessUrl("/admin") .invalidateHttpSession(true); + http + .sessionManagement() + .sessionCreationPolicy(SessionCreationPolicy.STATELESS); return http.build(); } @@ -113,9 +135,6 @@ public SecurityFilterChain adminFilterChain(HttpSecurity http) throws Exception @Order(2) public SecurityFilterChain apiFilterChain(HttpSecurity http) throws Exception { http - .requestMatchers(requestMatchers -> requestMatchers - .antMatchers("/api/**") - ) .csrf(csrf -> csrf.disable()) .addFilterBefore(corsFilter, UsernamePasswordAuthenticationFilter.class) diff --git a/backend/orury/src/main/java/com/kernel360/orury/config/jwt/admin/AdminAuthenticationFilter.java b/backend/orury/src/main/java/com/kernel360/orury/config/jwt/admin/AdminAuthenticationFilter.java index 72a208c..21fa462 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/config/jwt/admin/AdminAuthenticationFilter.java +++ b/backend/orury/src/main/java/com/kernel360/orury/config/jwt/admin/AdminAuthenticationFilter.java @@ -10,7 +10,10 @@ import javax.servlet.http.HttpServletResponse; import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.ProviderManager; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.config.annotation.authentication.ProviderManagerBuilder; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; @@ -22,7 +25,6 @@ @RequiredArgsConstructor public class AdminAuthenticationFilter extends UsernamePasswordAuthenticationFilter { - private final AuthenticationManager authenticationManager; private final TokenProvider tokenProvider; private final String cookieName; private final String cookieRefreshName; @@ -39,7 +41,7 @@ public Authentication attemptAuthentication( request.getParameter("password"), new ArrayList<>() ); - return authenticationManager.authenticate(authenticationToken); + return getAuthenticationManager().authenticate(authenticationToken); } @Override @@ -52,12 +54,7 @@ protected void successfulAuthentication(HttpServletRequest request, HttpServletR addAuthenticationCookie(request, response, accessToken, true); addAuthenticationCookie(request, response, refreshToken, false); - String preLoginUrl = request.getParameter("preLoginUrl"); - if (preLoginUrl != null && !preLoginUrl.isBlank()) { - response.sendRedirect(preLoginUrl); - } else { - response.sendRedirect("/admin"); - } + response.sendRedirect("/admin"); } private void addAuthenticationCookie(HttpServletRequest request, HttpServletResponse response, String token, @@ -75,7 +72,6 @@ private void addAuthenticationCookie(HttpServletRequest request, HttpServletResp authCookie.setMaxAge(maxAge); authCookie.setPath("/"); authCookie.setHttpOnly(true); - authCookie.setSecure(request.isSecure()); response.addCookie(authCookie); } diff --git a/backend/orury/src/main/java/com/kernel360/orury/config/jwt/admin/AdminAuthorizationFilter.java b/backend/orury/src/main/java/com/kernel360/orury/config/jwt/admin/AdminAuthorizationFilter.java index 04ec002..b2ddca3 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/config/jwt/admin/AdminAuthorizationFilter.java +++ b/backend/orury/src/main/java/com/kernel360/orury/config/jwt/admin/AdminAuthorizationFilter.java @@ -44,7 +44,7 @@ protected void doFilterInternal( processAccessToken(accessToken.get(), response); } else { refreshToken.ifPresentOrElse( - presentRefreshToken -> processRefreshToken(presentRefreshToken, response), + presentRefreshToken -> processRefreshToken(accessToken.get(), presentRefreshToken, response), () -> clearAuthenticationAndCookie(response) ); } @@ -60,10 +60,11 @@ private void processAccessToken(String accessToken, HttpServletResponse response } } - private void processRefreshToken(String refreshToken, HttpServletResponse response) { + private void processRefreshToken(String accessToken, String refreshToken, HttpServletResponse response) { if (!tokenProvider.isTokenExpired(refreshToken)) { try { - String newAccessToken = tokenProvider.createAccessTokenByRefreshToken(refreshToken); + Authentication authentication = tokenProvider.getAuthentication(accessToken); + String newAccessToken = tokenProvider.createAccessToken(authentication); addAuthenticationCookie(response, newAccessToken); validateAndAuthenticateToken(response, newAccessToken); } catch (Exception e) { diff --git a/backend/orury/src/main/resources/application.yml b/backend/orury/src/main/resources/application.yml index f38f31a..e0af935 100644 --- a/backend/orury/src/main/resources/application.yml +++ b/backend/orury/src/main/resources/application.yml @@ -33,5 +33,6 @@ jwt: # secret: ENC(XNkGVBeK1sJZhLhri+zz7pJOhHCvfif265mvT8OUIbOGeQcOCtHNnG2s3qjsKNe2u+dLoNVQBzbF1bKUfDxi8Po5tL7jQbZMPA33Dg1QMQFQWV46IyrYnLykYXQQvpin/SNPXW04ECDoRLF3TNwcS22D8uWEwe8L2wtcauyHeO1z+J6lUQArPHy76O2pzC7FHlBjOTw3STd23e3dd1WBQtHAYVmOIvNuPreulzSaHXc=) access-validity: 20 refresh-validity: 604800 - + cookie-name: access-token + refresh-cookie-name: refresh-token diff --git a/backend/orury/src/main/resources/templates/pages-login.html b/backend/orury/src/main/resources/templates/pages-login.html index 099697b..7a20e4a 100644 --- a/backend/orury/src/main/resources/templates/pages-login.html +++ b/backend/orury/src/main/resources/templates/pages-login.html @@ -65,21 +65,21 @@
    Login to Your Account

    Enter your username & password to login

    -
    - +
    - +
    @ -
    Please enter your username.
    - - Password +
    Please enter your password!
    From 5363d88810820c9ac1c49734a30d04597f741e74 Mon Sep 17 00:00:00 2001 From: Hyungjoon Cho Date: Wed, 22 Nov 2023 18:55:45 +0900 Subject: [PATCH 04/21] =?UTF-8?q?[Feat]=20#171.=20flyway=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - flyway 적용 - user의 remark1,2,3 을 remark 하나로 통일 --- backend/orury/build.gradle | 3 +++ .../com/kernel360/orury/domain/user/db/UserEntity.java | 4 +--- backend/orury/src/main/resources/application.yml | 9 +++++++++ .../db/migration/V1.0.0__alter_column_in_user.sql | 6 ++++++ 4 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 backend/orury/src/main/resources/db/migration/V1.0.0__alter_column_in_user.sql diff --git a/backend/orury/build.gradle b/backend/orury/build.gradle index 0689877..70fff87 100644 --- a/backend/orury/build.gradle +++ b/backend/orury/build.gradle @@ -47,6 +47,9 @@ dependencies { runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.11.5' implementation group: 'org.springdoc', name: 'springdoc-openapi-ui', version: '1.7.0' + + implementation 'org.flywaydb:flyway-core' + implementation 'org.flywaydb:flyway-mysql' } tasks.named('test') { diff --git a/backend/orury/src/main/java/com/kernel360/orury/domain/user/db/UserEntity.java b/backend/orury/src/main/java/com/kernel360/orury/domain/user/db/UserEntity.java index 78e897a..cd18603 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/domain/user/db/UserEntity.java +++ b/backend/orury/src/main/java/com/kernel360/orury/domain/user/db/UserEntity.java @@ -59,9 +59,7 @@ public class UserEntity extends BaseEntity { private Boolean isWithdrawal; private String withdrawalId; private LocalDateTime withdrawalAt; - private String remark1; - private String remark2; - private String remark3; + private String remark; @ManyToMany @JoinTable( diff --git a/backend/orury/src/main/resources/application.yml b/backend/orury/src/main/resources/application.yml index b5f3b9f..bf3d957 100644 --- a/backend/orury/src/main/resources/application.yml +++ b/backend/orury/src/main/resources/application.yml @@ -12,11 +12,17 @@ spring: generate-ddl: true hibernate: ddl-auto: validate + cache: + use_second_level_cache: false + use_query_cache: false properties: hibernate: format_sql: true use_sql_comments: true show_sql: true + persistence: + sharedCache: + mode:NONE datasource: driver-class-name: com.mysql.cj.jdbc.Driver # url: ${LOCAL_DB_URL} # configuration에서 설정 필요 @@ -25,6 +31,9 @@ spring: username: ENC(2STroDy2TfWobkrTroFwbRcxLke05156ZFMrqwKmVssNcN4foSX4I6ax8YAgdW3R) # password: ${LOCAL_DB_USER_PASSWORD} password: ENC(a8l7l/AYNz2x1HPYyu+urOBwVcBhQkeWgTi6Fvt+lQFq1QyHsL8yyi5+wr7lh26P) + flyway: + enabled: true + baseline-on-migrate: true jwt: header: Authorization #HS512 알고리즘을 사용할 것이기 때문에 512bit, 즉 64byte 이상의 secret key를 사용해야 한다. diff --git a/backend/orury/src/main/resources/db/migration/V1.0.0__alter_column_in_user.sql b/backend/orury/src/main/resources/db/migration/V1.0.0__alter_column_in_user.sql new file mode 100644 index 0000000..5dcd2df --- /dev/null +++ b/backend/orury/src/main/resources/db/migration/V1.0.0__alter_column_in_user.sql @@ -0,0 +1,6 @@ +-- 기존 remark2, 3 삭제 +alter table user drop column remark2; +alter table user drop column remark3; + +-- remark1 -> remark 변경 +alter table user change remark1 remark varchar(255); From faaf4252a5b097d945af97534d9b491b8d98eafe Mon Sep 17 00:00:00 2001 From: aqrms Date: Wed, 22 Nov 2023 22:39:35 +0900 Subject: [PATCH 05/21] Add AdminJwtFilter --- .../orury/config/SecurityConfig.java | 68 +++------ .../orury/config/jwt/AdminJwtFilter.java | 138 ++++++++++++++++++ .../AdminJwtAuthenticationEntryPoint.java | 21 +++ .../admin/controller/AdminAuthController.java | 97 ++++++++++++ .../controller/AdminBoardController.java | 10 -- 5 files changed, 278 insertions(+), 56 deletions(-) create mode 100644 backend/orury/src/main/java/com/kernel360/orury/config/jwt/AdminJwtFilter.java create mode 100644 backend/orury/src/main/java/com/kernel360/orury/config/jwt/admin/AdminJwtAuthenticationEntryPoint.java create mode 100644 backend/orury/src/main/java/com/kernel360/orury/domain/admin/controller/AdminAuthController.java diff --git a/backend/orury/src/main/java/com/kernel360/orury/config/SecurityConfig.java b/backend/orury/src/main/java/com/kernel360/orury/config/SecurityConfig.java index 826f5f4..bd2bcfe 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/config/SecurityConfig.java +++ b/backend/orury/src/main/java/com/kernel360/orury/config/SecurityConfig.java @@ -3,6 +3,7 @@ import com.kernel360.orury.config.jwt.*; import com.kernel360.orury.config.jwt.admin.AdminAuthenticationFilter; import com.kernel360.orury.config.jwt.admin.AdminAuthorizationFilter; +import com.kernel360.orury.config.jwt.admin.AdminJwtAuthenticationEntryPoint; import com.kernel360.orury.domain.user.db.UserRepository; import com.kernel360.orury.domain.user.service.CustomUserDetailsService; @@ -50,18 +51,10 @@ public class SecurityConfig { private final UserRepository userRepository; private final CorsFilter corsFilter; private final JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint; + private final AdminJwtAuthenticationEntryPoint adminJwtAuthenticationEntryPoint; private final JwtAccessDeniedHandler jwtAccessDeniedHandler; private final CustomUserDetailsService customUserDetailsService; - @Value("${jwt.cookie-name}") - private String cookieName; - @Value("${jwt.refresh-cookie-name}") - private String cookieRefreshName; - @Value("${jwt.access-validity}") - private String accessCookieMaxAge; - @Value("${jwt.refresh-validity}") - private String refreshCookieMaxAge; - @Bean public BCryptPasswordEncoder passwordEncoder() { return new BCryptPasswordEncoder(); @@ -85,49 +78,29 @@ public SecurityFilterChain adminFilterChain(HttpSecurity http, AuthenticationMan Exception { http .requestMatchers(requestMatchers -> requestMatchers - .antMatchers("/admin/**") + .antMatchers("/admin/**") // /api로 시작하는 요청을 처리 ) - .csrf().disable() - .httpBasic().disable(); - // AdminAuthenticationFilter filter = new AdminAuthenticationFilter( - // tokenProvider, - // cookieName, - // cookieRefreshName, - // accessCookieMaxAge, - // refreshCookieMaxAge - // ); - // filter.setAuthenticationManager(authenticationManager); - // filter.setFilterProcessesUrl("/admin/proc-login"); - http - // .addFilterBefore(filter, UsernamePasswordAuthenticationFilter.class) - .addFilterBefore( - new AdminAuthorizationFilter( - userRepository, - tokenProvider, - cookieName, - cookieRefreshName, - accessCookieMaxAge), - BasicAuthenticationFilter.class + .csrf(csrf -> csrf.disable()) + + .addFilterBefore(corsFilter, UsernamePasswordAuthenticationFilter.class) + .exceptionHandling(exceptionHandling -> exceptionHandling + .accessDeniedHandler(jwtAccessDeniedHandler) + .authenticationEntryPoint(adminJwtAuthenticationEntryPoint) ) + .authorizeHttpRequests(authorizeHttpRequests -> authorizeHttpRequests - .antMatchers("/assets/**").permitAll() + .mvcMatchers(SWAGGER.toArray(new String[0])).permitAll() + .antMatchers("/admin/login").permitAll() .anyRequest().authenticated() ) - .formLogin() - .loginPage("/admin/login") - .permitAll() - .loginProcessingUrl("/admin/proc-login") - .usernameParameter("emailAddr") - .passwordParameter("password"); - http - .logout() - .logoutRequestMatcher(new AntPathRequestMatcher("/logout")) - .logoutSuccessUrl("/admin") - .invalidateHttpSession(true); - http - .sessionManagement() - .sessionCreationPolicy(SessionCreationPolicy.STATELESS); + // 세션을 사용하지 않기 때문에 STATELESS로 설정 + .sessionManagement(sessionManagement -> + sessionManagement.sessionCreationPolicy(SessionCreationPolicy.STATELESS) + ) + // JWT필터 적용 + .apply(new JwtSecurityConfig(tokenProvider)) + ; return http.build(); } @@ -135,6 +108,9 @@ public SecurityFilterChain adminFilterChain(HttpSecurity http, AuthenticationMan @Order(2) public SecurityFilterChain apiFilterChain(HttpSecurity http) throws Exception { http + .requestMatchers(requestMatchers -> requestMatchers + .antMatchers("/api/**") // /api로 시작하는 요청을 처리 + ) .csrf(csrf -> csrf.disable()) .addFilterBefore(corsFilter, UsernamePasswordAuthenticationFilter.class) diff --git a/backend/orury/src/main/java/com/kernel360/orury/config/jwt/AdminJwtFilter.java b/backend/orury/src/main/java/com/kernel360/orury/config/jwt/AdminJwtFilter.java new file mode 100644 index 0000000..6c781d7 --- /dev/null +++ b/backend/orury/src/main/java/com/kernel360/orury/config/jwt/AdminJwtFilter.java @@ -0,0 +1,138 @@ +package com.kernel360.orury.config.jwt; + +import java.io.IOException; + +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.hibernate.validator.internal.metadata.aggregated.rule.OverridingMethodMustNotAlterParameterConstraints; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpStatus; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.util.StringUtils; +import org.springframework.web.filter.OncePerRequestFilter; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.kernel360.orury.global.constants.Constant; +import com.kernel360.orury.global.message.errors.ErrorMessages; + +import io.jsonwebtoken.ExpiredJwtException; + +public class AdminJwtFilter extends OncePerRequestFilter { + + private static final Logger logger = LoggerFactory.getLogger(AdminJwtFilter.class); + private final TokenProvider tokenProvider; + @Value("${jwt.cookie-name}") + private String cookieName; + @Value("${jwt.refresh-cookie-name}") + private String cookieRefreshName; + @Value("${jwt.access-validity}") + private String accessCookieMaxAge; + @Value("${jwt.refresh-validity}") + private String refreshCookieMaxAge; + + public AdminJwtFilter(TokenProvider tokenProvider) { + this.tokenProvider = tokenProvider; + } + + //토큰의 인증정보를 SecurityContext에 저장 + @Override + public void doFilterInternal(HttpServletRequest request, HttpServletResponse response, + FilterChain filterChain) throws + IOException, + ServletException { + try{ + String accessToken = resolveToken(request, cookieName); + tokenProvider.validateToken(accessToken); + Authentication authentication = tokenProvider.getAuthentication(accessToken); + SecurityContextHolder.getContext().setAuthentication(authentication); + } catch (ExpiredJwtException e) { + String refreshToken = resolveToken(request, cookieRefreshName); + + } + } + + + + } + + + + + // String refreshToken = ""; + // if (StringUtils.hasText(refreshHeader)) { + // refreshToken = resolveToken(refreshHeader); + // } + // + // String accessToken = resolveToken(authorizationHeader); + // + // if (StringUtils.hasText(refreshToken)) { + // try { + // tokenProvider.validateToken(refreshToken); + // } catch (ExpiredJwtException e) { + // // Create an ObjectMapper + // ObjectMapper objectMapper = new ObjectMapper(); + // // Create a JSON object + // JsonNode errorJson = objectMapper.createObjectNode() + // .put("error", ErrorMessages.EXPIRED_REFRESH_JWT.getMessage()) + // .put("errorCode", 402); + // // Convert JSON object to string + // tempResponse(objectMapper, errorJson, servletResponse); + // return; + // } + // } else { + // try { + // tokenProvider.validateToken(accessToken); + // } catch (ExpiredJwtException e) { + // // Create an ObjectMapper + // ObjectMapper objectMapper = new ObjectMapper(); + // // Create a JSON object + // JsonNode errorJson = objectMapper.createObjectNode() + // .put("error", ErrorMessages.EXPIRED_JWT.getMessage()) + // .put("errorCode", 401); + // // Convert JSON object to string + // tempResponse(objectMapper, errorJson, servletResponse); + // return; + // } + // } + // + // assert accessToken != null; + // Authentication authentication = tokenProvider.getAuthentication(accessToken); + // SecurityContextHolder.getContext().setAuthentication(authentication); + // logger.debug("Security Context에 '{}' 인증 정보를 저장했습니다, uri: {}", authentication.getName(), + // servletRequest.getRequestURI()); + // + // filterChain.doFilter(servletRequest, servletResponse); + } + + private static void tempResponse(ObjectMapper objectMapper, JsonNode errorJson, + HttpServletResponse httpServletResponse) throws IOException { + String jsonString = objectMapper.writeValueAsString(errorJson); + // Set status code and headers + httpServletResponse.setStatus(HttpStatus.UNAUTHORIZED.value()); + httpServletResponse.setContentType("application/json; charset=UTF-8"); + httpServletResponse.setCharacterEncoding("UTF-8"); + // Write JSON string to the response body + httpServletResponse.getWriter().write(jsonString); + httpServletResponse.getWriter().flush(); + } + + //리퀘스트 헤더에서 토큰 정보를 꺼내온다 + private String resolveToken(HttpServletRequest request, String cookieName) { + Cookie[] cookies = request.getCookies(); + if (cookies != null) { + for (Cookie cookie : cookies) { + if (cookieName.equals(cookie.getName())){ // 쿠키 이름에 따라서 변경 + return cookie.getValue(); + } + } + return null; + +} diff --git a/backend/orury/src/main/java/com/kernel360/orury/config/jwt/admin/AdminJwtAuthenticationEntryPoint.java b/backend/orury/src/main/java/com/kernel360/orury/config/jwt/admin/AdminJwtAuthenticationEntryPoint.java new file mode 100644 index 0000000..6ebb636 --- /dev/null +++ b/backend/orury/src/main/java/com/kernel360/orury/config/jwt/admin/AdminJwtAuthenticationEntryPoint.java @@ -0,0 +1,21 @@ +package com.kernel360.orury.config.jwt.admin; + +import java.io.IOException; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.stereotype.Component; + +@Component +public class AdminJwtAuthenticationEntryPoint implements AuthenticationEntryPoint { + @Override + public void commence(HttpServletRequest request, + HttpServletResponse response, + AuthenticationException authException) throws IOException { + // 유효한 자격증명을 제공하지 않고 접근하려 할때 redirect + response.sendRedirect("/admin/login"); + } +} diff --git a/backend/orury/src/main/java/com/kernel360/orury/domain/admin/controller/AdminAuthController.java b/backend/orury/src/main/java/com/kernel360/orury/domain/admin/controller/AdminAuthController.java new file mode 100644 index 0000000..f6e8b2f --- /dev/null +++ b/backend/orury/src/main/java/com/kernel360/orury/domain/admin/controller/AdminAuthController.java @@ -0,0 +1,97 @@ +package com.kernel360.orury.domain.admin.controller; + +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import com.kernel360.orury.config.jwt.TokenProvider; +import com.kernel360.orury.domain.user.model.TokenDto; + +@Controller +@RequestMapping("/admin") +public class AdminAuthController { + private final TokenProvider tokenProvider; + private final AuthenticationManagerBuilder authenticationManagerBuilder; + @Value("${jwt.cookie-name}") + private String cookieName; + @Value("${jwt.refresh-cookie-name}") + private String cookieRefreshName; + @Value("${jwt.access-validity}") + private String accessCookieMaxAge; + @Value("${jwt.refresh-validity}") + private String refreshCookieMaxAge; + + public AdminAuthController(TokenProvider tokenProvider, AuthenticationManagerBuilder authenticationManagerBuilder) { + this.tokenProvider = tokenProvider; + this.authenticationManagerBuilder = authenticationManagerBuilder; + } + + @GetMapping("/login") + public String login() { + return "pages-login"; + } + + @PostMapping("/login") + public String authenticate(@Valid @RequestParam String emailAddr, String password, + HttpServletResponse response) { + + UsernamePasswordAuthenticationToken authenticationToken = + new UsernamePasswordAuthenticationToken(emailAddr, password); + + Authentication authentication = authenticationManagerBuilder.getObject().authenticate(authenticationToken); + SecurityContextHolder.getContext().setAuthentication(authentication); + + String accessToken = tokenProvider.createAccessToken(authentication); + String refreshToken = tokenProvider.createRefreshToken(authentication); + tokenProvider.storeToken(refreshToken); + + Cookie accessTokenCookie = new Cookie(cookieName, accessToken); + Cookie refreshTokenCookie = new Cookie(cookieRefreshName, refreshToken); + + accessTokenCookie.setHttpOnly(true); + accessTokenCookie.setMaxAge(Integer.parseInt(accessCookieMaxAge)); + accessTokenCookie.setPath("/"); + refreshTokenCookie.setHttpOnly(true); + refreshTokenCookie.setMaxAge(Integer.parseInt(refreshCookieMaxAge)); + refreshTokenCookie.setPath("/"); + + response.addCookie(accessTokenCookie); + response.addCookie(refreshTokenCookie); + + return "redirect:/admin/board"; + } + + @PostMapping("/refreshToken") + public ResponseEntity refreshAccessToken( + @RequestHeader("Refresh-Token") String refreshTokenHeader + ) { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + //서버 측에서 리프레시 토큰 검증 + String refreshToken = refreshTokenHeader.replace("Bearer ", ""); + if (tokenProvider.validateRefreshToken(refreshToken)) { + String newAccessToken = tokenProvider.createAccessToken(authentication); + var tokenDto = TokenDto.builder() + .accessToken(newAccessToken) + .refreshToken(refreshToken) + .build(); + return ResponseEntity.ok(tokenDto); + } else { + return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(null); + } + } +} + diff --git a/backend/orury/src/main/java/com/kernel360/orury/domain/admin/controller/AdminBoardController.java b/backend/orury/src/main/java/com/kernel360/orury/domain/admin/controller/AdminBoardController.java index 1560518..c35a5a5 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/domain/admin/controller/AdminBoardController.java +++ b/backend/orury/src/main/java/com/kernel360/orury/domain/admin/controller/AdminBoardController.java @@ -25,16 +25,6 @@ public class AdminBoardController { private final BoardService boardService; - @GetMapping("/login") - public String login() { - return "pages-login"; - } - - @GetMapping - public String index() { - return "index"; - } - @GetMapping("/board") public String board(Model model) { List boardList = boardService.getBoardList(); From 6f8725f37e98de6d69cc57de5787766849d97b8b Mon Sep 17 00:00:00 2001 From: mooncw Date: Wed, 22 Nov 2023 23:28:01 +0900 Subject: [PATCH 06/21] =?UTF-8?q?[Refactor]=20#172.=20Error=20Exceoption?= =?UTF-8?q?=20=EA=B5=AC=EC=A1=B0=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - global 폴더의 error 폴더에 error와 관련된 파일들을 관리 - 현재 각 에러 코드마다 status, code, message를 관리 - GlobalExceptionHandler에서 커스텀으로 만든 handlerBusinessException 외에는 다 500에러로 가게 하는데, 이게 맞는지 생각해볼 것 - 그에 맞춰서 백엔드의 service 등 에러 부분 수정 - 그에 맞춰서 프론트엔드의 code 받는 부분 수정 --- .../CustomAuthenticationFailureHandler.java | 4 +- .../kernel360/orury/config/jwt/JwtFilter.java | 14 +++-- .../orury/config/jwt/TokenProvider.java | 24 +++++---- .../admin/service/AdminCommentService.java | 19 +++---- .../admin/service/AdminPostService.java | 23 ++++----- .../admin/service/AdminUserService.java | 1 - .../domain/board/service/BoardService.java | 10 ++-- .../comment/controller/CommentController.java | 8 ++- .../comment/service/CommentConverter.java | 18 +++---- .../comment/service/CommentService.java | 21 ++++---- .../post/controller/PostController.java | 13 +---- .../domain/post/service/PostConverter.java | 12 ++--- .../domain/post/service/PostService.java | 23 +++++---- .../service/CustomUserDetailsService.java | 17 +++---- .../domain/user/service/UserService.java | 25 ++++----- .../global/error/GlobalExceptionHandler.java | 24 +++++++++ .../error/code/AuthorizationErrorCode.java | 25 +++++++++ .../global/error/code/BoardErrorCode.java | 26 ++++++++++ .../error/code/CertificationErrorCode.java | 30 +++++++++++ .../global/error/code/CommentErrorCode.java | 25 +++++++++ .../orury/global/error/code/ErrorCode.java | 7 +++ .../global/error/code/PostErrorCode.java | 25 +++++++++ .../global/error/code/ServerErrorCode.java | 25 +++++++++ .../global/error/code/UserErrorCode.java | 27 ++++++++++ .../orury/global/error/dto/ErrorResponse.java | 29 +++++++++++ .../error/exception/BusinessException.java | 14 +++++ .../exception/DuplicateMemberException.java | 21 -------- .../exception/GlobalExceptionHandler.java | 51 ------------------- .../exception/NotFoundMemberException.java | 19 ------- .../exception/RefreshExpiredJwtException.java | 7 --- .../exception/TokenExpiredException.java | 7 --- .../exception/TokenNotFoundException.java | 7 --- .../global/message/errors/ErrorMessages.java | 36 ------------- .../board/service/BoardServiceTest.java | 2 +- frontend/lib/global/http/http_request.dart | 4 +- 35 files changed, 365 insertions(+), 278 deletions(-) create mode 100644 backend/orury/src/main/java/com/kernel360/orury/global/error/GlobalExceptionHandler.java create mode 100644 backend/orury/src/main/java/com/kernel360/orury/global/error/code/AuthorizationErrorCode.java create mode 100644 backend/orury/src/main/java/com/kernel360/orury/global/error/code/BoardErrorCode.java create mode 100644 backend/orury/src/main/java/com/kernel360/orury/global/error/code/CertificationErrorCode.java create mode 100644 backend/orury/src/main/java/com/kernel360/orury/global/error/code/CommentErrorCode.java create mode 100644 backend/orury/src/main/java/com/kernel360/orury/global/error/code/ErrorCode.java create mode 100644 backend/orury/src/main/java/com/kernel360/orury/global/error/code/PostErrorCode.java create mode 100644 backend/orury/src/main/java/com/kernel360/orury/global/error/code/ServerErrorCode.java create mode 100644 backend/orury/src/main/java/com/kernel360/orury/global/error/code/UserErrorCode.java create mode 100644 backend/orury/src/main/java/com/kernel360/orury/global/error/dto/ErrorResponse.java create mode 100644 backend/orury/src/main/java/com/kernel360/orury/global/error/exception/BusinessException.java delete mode 100644 backend/orury/src/main/java/com/kernel360/orury/global/exception/DuplicateMemberException.java delete mode 100644 backend/orury/src/main/java/com/kernel360/orury/global/exception/GlobalExceptionHandler.java delete mode 100644 backend/orury/src/main/java/com/kernel360/orury/global/exception/NotFoundMemberException.java delete mode 100644 backend/orury/src/main/java/com/kernel360/orury/global/exception/RefreshExpiredJwtException.java delete mode 100644 backend/orury/src/main/java/com/kernel360/orury/global/exception/TokenExpiredException.java delete mode 100644 backend/orury/src/main/java/com/kernel360/orury/global/exception/TokenNotFoundException.java delete mode 100644 backend/orury/src/main/java/com/kernel360/orury/global/message/errors/ErrorMessages.java diff --git a/backend/orury/src/main/java/com/kernel360/orury/config/jwt/CustomAuthenticationFailureHandler.java b/backend/orury/src/main/java/com/kernel360/orury/config/jwt/CustomAuthenticationFailureHandler.java index 45213fe..3d6342f 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/config/jwt/CustomAuthenticationFailureHandler.java +++ b/backend/orury/src/main/java/com/kernel360/orury/config/jwt/CustomAuthenticationFailureHandler.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.kernel360.orury.global.common.ApiResponse; -import com.kernel360.orury.global.message.errors.ErrorMessages; +import com.kernel360.orury.global.error.code.CertificationErrorCode; import org.springframework.http.HttpStatus; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler; @@ -20,7 +20,7 @@ public void onAuthenticationFailure(HttpServletRequest request, HttpServletRespo // 여기에 원하는 JSON 응답을 작성합니다. // 예시로는 ApiResponse를 사용했습니다. - ApiResponse apiResponse = ApiResponse.error(HttpStatus.UNAUTHORIZED, 401, ErrorMessages.EXPIRED_JWT.getMessage()); + ApiResponse apiResponse = ApiResponse.error(HttpStatus.UNAUTHORIZED, 401, CertificationErrorCode.EXPIRED_ACCESS_JWT.getMessage()); new ObjectMapper().writeValue(response.getWriter(), apiResponse); } } \ No newline at end of file diff --git a/backend/orury/src/main/java/com/kernel360/orury/config/jwt/JwtFilter.java b/backend/orury/src/main/java/com/kernel360/orury/config/jwt/JwtFilter.java index 8b1d21e..31dad54 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/config/jwt/JwtFilter.java +++ b/backend/orury/src/main/java/com/kernel360/orury/config/jwt/JwtFilter.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.kernel360.orury.global.constants.Constant; -import com.kernel360.orury.global.exception.RefreshExpiredJwtException; -import com.kernel360.orury.global.message.errors.ErrorMessages; +import com.kernel360.orury.global.error.code.CertificationErrorCode; +import com.kernel360.orury.global.error.exception.BusinessException; import io.jsonwebtoken.ExpiredJwtException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -12,17 +12,12 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.util.StringUtils; -import org.springframework.web.filter.GenericFilterBean; import org.springframework.web.filter.OncePerRequestFilter; import javax.servlet.FilterChain; - import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import java.io.IOException; public class JwtFilter extends OncePerRequestFilter { @@ -64,7 +59,7 @@ public void doFilterInternal(HttpServletRequest servletRequest, HttpServletRespo SecurityContextHolder.getContext().setAuthentication(authentication); logger.debug("Security Context에 '{}' 인증 정보를 저장했습니다, uri: {}", authentication.getName(), servletRequest.getRequestURI()); }catch(ExpiredJwtException e){ - RefreshExpiredJwtException refreshExpiredJwtException = new RefreshExpiredJwtException("Refresh Expired Jwt Exception"); + BusinessException refreshExpiredJwtException = new BusinessException(CertificationErrorCode.EXPIRED_REFRESH_JWT); servletRequest.setAttribute("exception", refreshExpiredJwtException); }catch(Exception e){ servletRequest.setAttribute("exception", e); @@ -86,6 +81,9 @@ public void doFilterInternal(HttpServletRequest servletRequest, HttpServletRespo Authentication authentication = tokenProvider.getAuthentication(accessToken); SecurityContextHolder.getContext().setAuthentication(authentication); logger.debug("Security Context에 '{}' 인증 정보를 저장했습니다, uri: {}", authentication.getName(), servletRequest.getRequestURI()); + }catch(ExpiredJwtException e){ + BusinessException accessExpiredJwtException = new BusinessException(CertificationErrorCode.EXPIRED_ACCESS_JWT); + servletRequest.setAttribute("exception", accessExpiredJwtException); }catch(Exception e){ servletRequest.setAttribute("exception", e); } diff --git a/backend/orury/src/main/java/com/kernel360/orury/config/jwt/TokenProvider.java b/backend/orury/src/main/java/com/kernel360/orury/config/jwt/TokenProvider.java index d89b847..fa216e9 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/config/jwt/TokenProvider.java +++ b/backend/orury/src/main/java/com/kernel360/orury/config/jwt/TokenProvider.java @@ -8,13 +8,15 @@ import com.kernel360.orury.domain.user.db.UserEntity; import com.kernel360.orury.domain.user.db.UserRepository; import com.kernel360.orury.global.constants.Constant; -import com.kernel360.orury.global.exception.TokenExpiredException; -import com.kernel360.orury.global.exception.TokenNotFoundException; -import com.kernel360.orury.global.message.errors.ErrorMessages; -import io.jsonwebtoken.*; +import com.kernel360.orury.global.error.code.CertificationErrorCode; +import com.kernel360.orury.global.error.code.UserErrorCode; +import com.kernel360.orury.global.error.exception.BusinessException; +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.ExpiredJwtException; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.SignatureAlgorithm; import io.jsonwebtoken.io.Decoders; import io.jsonwebtoken.security.Keys; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; @@ -79,7 +81,7 @@ public String createAccessToken(Authentication authentication){ long now = (new Date()).getTime(); Date validity = new Date(now + accessValidityMs); UserEntity user = userRepository.findByEmailAddr(authentication.getName()).orElseThrow( - ()-> new RuntimeException(ErrorMessages.THERE_IS_NO_USER.getMessage()) + ()-> new RuntimeException(UserErrorCode.THERE_IS_NO_USER.getMessage()) ); return Jwts.builder() @@ -96,8 +98,8 @@ public String createRefreshToken(Authentication authentication){ // var userId = userRepository.findByEmailAddr(authentication.getName()).orElseThrow( - ()-> new RuntimeException(ErrorMessages.THERE_IS_NO_USER.getMessage()) - ).getId(); + ()-> new BusinessException(UserErrorCode.THERE_IS_NO_USER) + ).getId(); return Jwts.builder() .claim( Constant.USERID.getMessage(), userId) @@ -154,7 +156,7 @@ public void storeToken(String token){ var userId = Long.parseLong(claims.get("userId").toString()); var user = userRepository.findById(userId).orElseThrow( - () -> new RuntimeException(ErrorMessages.THERE_IS_NO_USER.getMessage()) + () -> new BusinessException(UserErrorCode.THERE_IS_NO_USER) ); RefreshTokenEntity existingToken = refreshTokenRepository.findByUserId(userId).orElse(null); @@ -173,12 +175,12 @@ public void storeToken(String token){ public boolean validateRefreshToken(String refreshToken) { var refreshTokenEntity = refreshTokenRepository.findByTokenValue(refreshToken).orElseThrow( - () -> new TokenNotFoundException(ErrorMessages.ILLEGAL_REFRESH_JWT.getMessage()) + () -> new BusinessException(CertificationErrorCode.ILLEGAL_REFRESH_JWT) ); var expireDate = refreshTokenEntity.getExpirationDate(); if (LocalDateTime.now().isAfter(expireDate)) { - throw new TokenExpiredException(ErrorMessages.EXPIRED_REFRESH_JWT.getMessage()); + throw new BusinessException(CertificationErrorCode.EXPIRED_REFRESH_JWT); } return validateToken(refreshToken); diff --git a/backend/orury/src/main/java/com/kernel360/orury/domain/admin/service/AdminCommentService.java b/backend/orury/src/main/java/com/kernel360/orury/domain/admin/service/AdminCommentService.java index eb3abb6..7afdcf5 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/domain/admin/service/AdminCommentService.java +++ b/backend/orury/src/main/java/com/kernel360/orury/domain/admin/service/AdminCommentService.java @@ -1,13 +1,5 @@ package com.kernel360.orury.domain.admin.service; -import java.time.LocalDateTime; -import java.util.List; -import java.util.stream.Collectors; - -import javax.servlet.http.PushBuilder; - -import org.springframework.stereotype.Service; - import com.kernel360.orury.domain.comment.db.CommentEntity; import com.kernel360.orury.domain.comment.db.CommentRepository; import com.kernel360.orury.domain.comment.model.CommentDto; @@ -17,9 +9,13 @@ import com.kernel360.orury.domain.post.db.PostRepository; import com.kernel360.orury.domain.user.db.UserRepository; import com.kernel360.orury.global.constants.Constant; -import com.kernel360.orury.global.message.errors.ErrorMessages; - +import com.kernel360.orury.global.error.code.PostErrorCode; +import com.kernel360.orury.global.error.exception.BusinessException; import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.List; @Service @RequiredArgsConstructor @@ -32,7 +28,8 @@ public class AdminCommentService { public CommentDto createComment(CommentRequest commentRequest) { PostEntity postEntity = postRepository.findById(commentRequest.getPostId()) .orElseThrow( - () -> new RuntimeException(ErrorMessages.THERE_IS_NO_POST.getMessage() + commentRequest.getPostId())); + () -> new BusinessException(PostErrorCode.THERE_IS_NO_POST) + ); CommentEntity commentEntity = CommentEntity.builder() .userId(commentRequest.getUserId()) diff --git a/backend/orury/src/main/java/com/kernel360/orury/domain/admin/service/AdminPostService.java b/backend/orury/src/main/java/com/kernel360/orury/domain/admin/service/AdminPostService.java index 95bd13d..88a368e 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/domain/admin/service/AdminPostService.java +++ b/backend/orury/src/main/java/com/kernel360/orury/domain/admin/service/AdminPostService.java @@ -1,12 +1,5 @@ package com.kernel360.orury.domain.admin.service; -import java.time.LocalDateTime; -import java.util.List; -import java.util.NoSuchElementException; -import java.util.Optional; - -import org.springframework.stereotype.Service; - import com.kernel360.orury.domain.board.db.BoardRepository; import com.kernel360.orury.domain.post.db.PostEntity; import com.kernel360.orury.domain.post.db.PostRepository; @@ -15,9 +8,15 @@ import com.kernel360.orury.domain.post.service.PostConverter; import com.kernel360.orury.domain.user.db.UserRepository; import com.kernel360.orury.global.constants.Constant; -import com.kernel360.orury.global.message.errors.ErrorMessages; - +import com.kernel360.orury.global.error.code.BoardErrorCode; +import com.kernel360.orury.global.error.code.PostErrorCode; +import com.kernel360.orury.global.error.exception.BusinessException; import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Optional; @RequiredArgsConstructor @Service @@ -32,7 +31,7 @@ public PostDto createPost( PostRequest postRequest ) { var boardEntity = boardRepository.findById(postRequest.getBoardId()) - .orElseThrow(() -> new RuntimeException(ErrorMessages.THERE_IS_NO_BOARD.getMessage())); + .orElseThrow(() -> new BusinessException(BoardErrorCode.THERE_IS_NO_BOARD)); var entity = PostEntity.builder() .postTitle(postRequest.getPostTitle()) @@ -54,7 +53,7 @@ public PostDto createPost( public PostDto getPost(Long id) { Optional postEntityOptional = postRepository.findById(id); PostEntity post = postEntityOptional.orElseThrow( - () -> new RuntimeException(ErrorMessages.THERE_IS_NO_POST.getMessage() + id)); + () -> new BusinessException(PostErrorCode.THERE_IS_NO_POST)); return postConverter.toDto(post); } @@ -64,7 +63,7 @@ public PostDto updatePost( Long postId = postRequest.getId(); var postEntityOptional = postRepository.findById(postId); var entity = postEntityOptional.orElseThrow( - () -> new RuntimeException(ErrorMessages.THERE_IS_NO_POST.getMessage() + postId)); + () -> new BusinessException(PostErrorCode.THERE_IS_NO_POST)); var dto = postConverter.toDto(entity); dto.setPostTitle(postRequest.getPostTitle()); dto.setPostContent(postRequest.getPostContent()); diff --git a/backend/orury/src/main/java/com/kernel360/orury/domain/admin/service/AdminUserService.java b/backend/orury/src/main/java/com/kernel360/orury/domain/admin/service/AdminUserService.java index 27191a3..46cb06f 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/domain/admin/service/AdminUserService.java +++ b/backend/orury/src/main/java/com/kernel360/orury/domain/admin/service/AdminUserService.java @@ -11,7 +11,6 @@ import com.kernel360.orury.domain.user.db.UserEntity; import com.kernel360.orury.domain.user.db.UserRepository; import com.kernel360.orury.domain.user.model.UserDto; -import com.kernel360.orury.global.exception.NotFoundMemberException; import lombok.RequiredArgsConstructor; diff --git a/backend/orury/src/main/java/com/kernel360/orury/domain/board/service/BoardService.java b/backend/orury/src/main/java/com/kernel360/orury/domain/board/service/BoardService.java index 8c025a5..5920c44 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/domain/board/service/BoardService.java +++ b/backend/orury/src/main/java/com/kernel360/orury/domain/board/service/BoardService.java @@ -4,12 +4,12 @@ import com.kernel360.orury.domain.board.db.BoardRepository; import com.kernel360.orury.domain.board.model.BoardDto; import com.kernel360.orury.domain.board.model.BoardRequest; -import com.kernel360.orury.domain.post.db.PostEntity; import com.kernel360.orury.domain.post.db.PostRepository; import com.kernel360.orury.domain.post.model.PostDto; import com.kernel360.orury.domain.post.service.PostConverter; import com.kernel360.orury.global.constants.Constant; -import com.kernel360.orury.global.message.errors.ErrorMessages; +import com.kernel360.orury.global.error.code.BoardErrorCode; +import com.kernel360.orury.global.error.exception.BusinessException; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -54,7 +54,7 @@ public BoardDto updateBoard( BoardRequest boardRequest ) { BoardEntity entity = boardRepository.findById(boardRequest.getId()) - .orElseThrow(() -> new RuntimeException(ErrorMessages.THERE_IS_NO_BOARD.getMessage() + boardRequest.getId())); + .orElseThrow(() -> new BusinessException(BoardErrorCode.THERE_IS_NO_BOARD)); BoardDto updatedDto = boardConverter.toDto(entity); updatedDto.setBoardTitle(boardRequest.getBoardTitle()); @@ -72,7 +72,7 @@ public void deleteBoard(Long id) { public BoardDto getBoard(Long id) { var entity = boardRepository.findById(id) - .orElseThrow(() -> new RuntimeException(ErrorMessages.THERE_IS_NO_BOARD.getMessage() + id)); + .orElseThrow(() -> new BusinessException(BoardErrorCode.THERE_IS_NO_BOARD)); return boardConverter.toDto(entity); } @@ -80,7 +80,7 @@ public BoardDto getBoard(Long id) { public List getNoticeBoard(Long id) { var noticeList = postRepository.findAllByBoardId(id); if(noticeList.isEmpty()) { - new RuntimeException(ErrorMessages.THERE_IS_NO_BOARD.getMessage() + id); + throw new BusinessException(BoardErrorCode.THERE_IS_NO_BOARD); } return noticeList.stream() diff --git a/backend/orury/src/main/java/com/kernel360/orury/domain/comment/controller/CommentController.java b/backend/orury/src/main/java/com/kernel360/orury/domain/comment/controller/CommentController.java index 8fd046f..f519ae4 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/domain/comment/controller/CommentController.java +++ b/backend/orury/src/main/java/com/kernel360/orury/domain/comment/controller/CommentController.java @@ -5,10 +5,8 @@ import com.kernel360.orury.domain.comment.model.CommentLikeRequest; import com.kernel360.orury.domain.comment.model.CommentRequest; import com.kernel360.orury.domain.comment.service.CommentService; -import com.kernel360.orury.domain.post.model.PostLikeRequest; -import com.kernel360.orury.global.common.ApiResponse; import com.kernel360.orury.global.constants.Constant; -import com.kernel360.orury.global.message.errors.ErrorMessages; +import com.kernel360.orury.global.error.code.AuthorizationErrorCode; import com.kernel360.orury.global.message.info.InfoMessages; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; @@ -54,7 +52,7 @@ public ResponseEntity updateComment( commentService.updateComment(commentRequest); return ResponseEntity.ok(InfoMessages.COMMENT_UPDATED.getMessage()); } else - return ResponseEntity.status(HttpStatus.FORBIDDEN).body(ErrorMessages.THERE_IS_NO_AUTHORITY.getMessage()); + return ResponseEntity.status(HttpStatus.FORBIDDEN).body(AuthorizationErrorCode.THERE_IS_NO_AUTHORITY.getMessage()); } // 댓글 삭제 @@ -74,7 +72,7 @@ public ResponseEntity deleteComment( return ResponseEntity.ok(InfoMessages.COMMENT_DELETED.getMessage()); }else{ return ResponseEntity.status(HttpStatus.FORBIDDEN).body( - "댓글 삭제" + ErrorMessages.THERE_IS_NO_AUTHORITY.getMessage()); + "댓글 삭제" + AuthorizationErrorCode.THERE_IS_NO_AUTHORITY.getMessage()); } } diff --git a/backend/orury/src/main/java/com/kernel360/orury/domain/comment/service/CommentConverter.java b/backend/orury/src/main/java/com/kernel360/orury/domain/comment/service/CommentConverter.java index 3fc16c0..2cf9693 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/domain/comment/service/CommentConverter.java +++ b/backend/orury/src/main/java/com/kernel360/orury/domain/comment/service/CommentConverter.java @@ -9,17 +9,14 @@ import com.kernel360.orury.domain.post.db.PostRepository; import com.kernel360.orury.domain.user.db.UserEntity; import com.kernel360.orury.domain.user.db.UserRepository; -import com.kernel360.orury.global.message.errors.ErrorMessages; +import com.kernel360.orury.global.error.code.PostErrorCode; +import com.kernel360.orury.global.error.code.UserErrorCode; +import com.kernel360.orury.global.error.exception.BusinessException; import lombok.RequiredArgsConstructor; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; -import java.util.Map; -import java.util.NoSuchElementException; - @Service @RequiredArgsConstructor public class CommentConverter { @@ -33,7 +30,7 @@ public CommentDto toDto(CommentEntity commentEntity) { try { // 유저 닉네임 할당 UserEntity userEntity = userRepository.findById(commentEntity.getUserId()) - .orElseThrow(() -> new RuntimeException(ErrorMessages.THERE_IS_NO_USER.getMessage() + commentEntity.getUserId())); + .orElseThrow(() -> new BusinessException(UserErrorCode.THERE_IS_NO_USER)); // 로그인 유저 좋아요 여부 판단 long loginId = getLoginId(); @@ -57,8 +54,7 @@ public CommentDto toDto(CommentEntity commentEntity) { .build(); } catch (Exception e) { // 예외가 발생한 경우 JSON 형식의 응답을 생성 - String errorMessage = ErrorMessages.THERE_IS_NO_USER.getMessage(); - throw new RuntimeException(errorMessage); + throw new BusinessException(UserErrorCode.THERE_IS_NO_USER); } } @@ -66,7 +62,7 @@ public CommentDto toDto(CommentEntity commentEntity) { public CommentEntity toEntity(CommentDto commentdto) { PostEntity postEntity = postRepository.findById(commentdto.getPostId()) .orElseThrow( - () -> new RuntimeException(ErrorMessages.THERE_IS_NO_POST.getMessage() + commentdto.getPostId()) + () -> new BusinessException(PostErrorCode.THERE_IS_NO_POST) ); return CommentEntity.builder() .id(commentdto.getId()) @@ -100,7 +96,7 @@ private long getLoginId() { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); String loginEmail = authentication.getName(); UserEntity loginUser = userRepository.findByEmailAddr(loginEmail) - .orElseThrow(() -> new NoSuchElementException(ErrorMessages.THERE_IS_NO_USER.getMessage() + loginEmail)); + .orElseThrow(() -> new BusinessException(UserErrorCode.THERE_IS_NO_USER)); return loginUser.getId(); } } diff --git a/backend/orury/src/main/java/com/kernel360/orury/domain/comment/service/CommentService.java b/backend/orury/src/main/java/com/kernel360/orury/domain/comment/service/CommentService.java index a2b880a..f5ffc55 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/domain/comment/service/CommentService.java +++ b/backend/orury/src/main/java/com/kernel360/orury/domain/comment/service/CommentService.java @@ -7,16 +7,15 @@ import com.kernel360.orury.domain.comment.model.CommentRequest; import com.kernel360.orury.domain.notification.service.NotifyService; import com.kernel360.orury.domain.post.db.PostEntity; -import com.kernel360.orury.domain.post.db.PostLikeEntity; -import com.kernel360.orury.domain.post.db.PostLikePK; import com.kernel360.orury.domain.post.db.PostRepository; -import com.kernel360.orury.domain.post.model.PostLikeRequest; import com.kernel360.orury.domain.user.db.UserRepository; import com.kernel360.orury.global.constants.Constant; -import com.kernel360.orury.global.message.errors.ErrorMessages; +import com.kernel360.orury.global.error.code.CommentErrorCode; +import com.kernel360.orury.global.error.code.PostErrorCode; +import com.kernel360.orury.global.error.code.UserErrorCode; +import com.kernel360.orury.global.error.exception.BusinessException; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; import java.time.LocalDateTime; import java.util.List; @@ -40,9 +39,9 @@ public class CommentService { public CommentDto createComment(CommentRequest commentRequest, String userEmail) { PostEntity postEntity = postRepository.findById(commentRequest.getPostId()) - .orElseThrow(() -> new RuntimeException(ErrorMessages.THERE_IS_NO_POST.getMessage() + commentRequest.getPostId())); + .orElseThrow(() -> new BusinessException(PostErrorCode.THERE_IS_NO_POST)); var user = userRepository.findByEmailAddr(userEmail) - .orElseThrow(() -> new RuntimeException(ErrorMessages.THERE_IS_NO_USER.getMessage() + userEmail)); + .orElseThrow(() -> new BusinessException(UserErrorCode.THERE_IS_NO_USER)); Long userId = user.getId(); CommentEntity commentEntity = CommentEntity.builder() @@ -63,7 +62,7 @@ public CommentDto createComment(CommentRequest commentRequest, String userEmail) Long notifyUserId = null; if( commentEntity.getPId() != null ) { notifyUserId = commentRepository.findById(commentEntity.getPId()).orElseThrow( - () -> new RuntimeException(ErrorMessages.THERE_IS_NO_COMMENT.getMessage() + commentEntity.getPId()) + () -> new BusinessException(CommentErrorCode.THERE_IS_NO_COMMENT) ).getUserId(); if (!Objects.equals(notifyUserId, saveEntity.getUserId())) { sendNotificationToPostAuthor(notifyUserId, postEntity.getPostTitle() + "의 댓글 답변 달림"); @@ -90,7 +89,7 @@ public CommentDto updateComment( ){ Long id = commentRequest.getId(); Optional entity = commentRepository.findById(id); - CommentEntity updateEntity = entity.orElseThrow(() -> new RuntimeException(ErrorMessages.THERE_IS_NO_COMMENT.getMessage() + id)); + CommentEntity updateEntity = entity.orElseThrow(() -> new BusinessException(CommentErrorCode.THERE_IS_NO_COMMENT)); CommentDto updateDto = commentConverter.toDto(updateEntity); updateDto.setCommentContent(commentRequest.getCommentContent()); updateDto.setUpdatedBy(Constant.ADMIN.getMessage()); @@ -114,10 +113,10 @@ public List findAllByPostId(Long postId) { public boolean isWriter(String userEmail, Long id) { var comment = commentRepository.findById(id).orElseThrow( - () -> new RuntimeException(ErrorMessages.THERE_IS_NO_COMMENT.getMessage() + id) + () -> new BusinessException(CommentErrorCode.THERE_IS_NO_COMMENT) ); var user = userRepository.findByEmailAddr(userEmail).orElseThrow( - () -> new RuntimeException(ErrorMessages.THERE_IS_NO_USER.getMessage() + userEmail) + () -> new BusinessException(UserErrorCode.THERE_IS_NO_USER) ); return Objects.equals(user.getId(), comment.getUserId()); } diff --git a/backend/orury/src/main/java/com/kernel360/orury/domain/post/controller/PostController.java b/backend/orury/src/main/java/com/kernel360/orury/domain/post/controller/PostController.java index bcd6b16..d8cfc72 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/domain/post/controller/PostController.java +++ b/backend/orury/src/main/java/com/kernel360/orury/domain/post/controller/PostController.java @@ -1,21 +1,14 @@ package com.kernel360.orury.domain.post.controller; -import com.kernel360.orury.config.jwt.TokenProvider; import com.kernel360.orury.domain.post.model.PostDto; import com.kernel360.orury.domain.post.model.PostLikeDto; import com.kernel360.orury.domain.post.model.PostLikeRequest; import com.kernel360.orury.domain.post.model.PostRequest; import com.kernel360.orury.domain.post.service.PostService; - import com.kernel360.orury.global.common.Api; - -import com.kernel360.orury.global.message.errors.ErrorMessages; +import com.kernel360.orury.global.error.code.AuthorizationErrorCode; import com.kernel360.orury.global.message.info.InfoMessages; -import io.jsonwebtoken.Claims; -import io.jsonwebtoken.Jwts; import lombok.RequiredArgsConstructor; - -import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.web.PageableDefault; @@ -27,8 +20,6 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; - -import java.security.Key; import java.util.Collection; import java.util.List; @@ -98,7 +89,7 @@ public ResponseEntity deletePost(@PathVariable Long postId) { postService.deletePost(postId); return ResponseEntity.ok(InfoMessages.POST_DELETED.getMessage() + postId); }else{ - return ResponseEntity.status(HttpStatus.FORBIDDEN).body("삭제 "+ ErrorMessages.THERE_IS_NO_AUTHORITY.getMessage()); + return ResponseEntity.status(HttpStatus.FORBIDDEN).body("삭제 "+ AuthorizationErrorCode.THERE_IS_NO_AUTHORITY.getMessage()); } } diff --git a/backend/orury/src/main/java/com/kernel360/orury/domain/post/service/PostConverter.java b/backend/orury/src/main/java/com/kernel360/orury/domain/post/service/PostConverter.java index bad64c8..0be29c9 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/domain/post/service/PostConverter.java +++ b/backend/orury/src/main/java/com/kernel360/orury/domain/post/service/PostConverter.java @@ -2,9 +2,7 @@ import com.kernel360.orury.domain.board.db.BoardEntity; import com.kernel360.orury.domain.board.db.BoardRepository; -import com.kernel360.orury.domain.board.model.BoardDto; import com.kernel360.orury.domain.comment.model.CommentDto; -import com.kernel360.orury.domain.comment.model.CommentLikeDto; import com.kernel360.orury.domain.comment.service.CommentConverter; import com.kernel360.orury.domain.post.db.PostEntity; import com.kernel360.orury.domain.post.db.PostLikeEntity; @@ -13,7 +11,9 @@ import com.kernel360.orury.domain.post.model.PostLikeDto; import com.kernel360.orury.domain.user.db.UserEntity; import com.kernel360.orury.domain.user.db.UserRepository; -import com.kernel360.orury.global.message.errors.ErrorMessages; +import com.kernel360.orury.global.error.code.BoardErrorCode; +import com.kernel360.orury.global.error.code.UserErrorCode; +import com.kernel360.orury.global.error.exception.BusinessException; import lombok.RequiredArgsConstructor; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; @@ -54,7 +54,7 @@ public PostDto toDto(PostEntity postEntity) { // 게시글 작성자 userNickname 설정을 위한 entity UserEntity userEntity = userRepository.findById(postEntity.getUserId()) - .orElseThrow(() -> new RuntimeException(ErrorMessages.THERE_IS_NO_USER.getMessage() + postEntity.getUserId())); + .orElseThrow(() -> new BusinessException(UserErrorCode.THERE_IS_NO_USER)); // 좋아요 수 및 유저 좋아요 세팅 long loginId = getLoginId(); @@ -88,7 +88,7 @@ public PostDto toDto(PostEntity postEntity) { public PostEntity toEntity(PostDto postDto) { BoardEntity boardEntity = boardRepository.findById(postDto.getBoardId()) .orElseThrow( - () -> new RuntimeException(ErrorMessages.THERE_IS_NO_BOARD.getMessage() + postDto.getBoardId()) + () -> new BusinessException(BoardErrorCode.THERE_IS_NO_BOARD) ); return PostEntity.builder() @@ -129,7 +129,7 @@ private long getLoginId() { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); String loginEmail = authentication.getName(); UserEntity loginUser = userRepository.findByEmailAddr(loginEmail) - .orElseThrow(() -> new NoSuchElementException(ErrorMessages.THERE_IS_NO_USER.getMessage() + loginEmail)); + .orElseThrow(() -> new BusinessException(UserErrorCode.THERE_IS_NO_USER)); return loginUser.getId(); } diff --git a/backend/orury/src/main/java/com/kernel360/orury/domain/post/service/PostService.java b/backend/orury/src/main/java/com/kernel360/orury/domain/post/service/PostService.java index fdcaf5b..7a0a991 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/domain/post/service/PostService.java +++ b/backend/orury/src/main/java/com/kernel360/orury/domain/post/service/PostService.java @@ -11,15 +11,18 @@ import com.kernel360.orury.global.common.Api; import com.kernel360.orury.global.common.Pagination; import com.kernel360.orury.global.constants.Constant; -import com.kernel360.orury.global.message.errors.ErrorMessages; - +import com.kernel360.orury.global.error.code.BoardErrorCode; +import com.kernel360.orury.global.error.code.PostErrorCode; +import com.kernel360.orury.global.error.code.UserErrorCode; +import com.kernel360.orury.global.error.exception.BusinessException; import lombok.RequiredArgsConstructor; - import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import java.time.LocalDateTime; -import java.util.*; +import java.util.List; +import java.util.Objects; +import java.util.Optional; @RequiredArgsConstructor @Service @@ -35,10 +38,10 @@ public PostDto createPost( String userEmail ) { var user = userRepository.findByEmailAddr(userEmail) - .orElseThrow(() -> new NoSuchElementException(ErrorMessages.THERE_IS_NO_USER.getMessage() + userEmail)); + .orElseThrow(() -> new BusinessException(UserErrorCode.THERE_IS_NO_USER)); var boardEntity = boardRepository.findById(postRequest.getBoardId()) - .orElseThrow(() -> new RuntimeException(ErrorMessages.THERE_IS_NO_BOARD.getMessage())); + .orElseThrow(() -> new BusinessException(BoardErrorCode.THERE_IS_NO_BOARD)); var entity = PostEntity.builder() .postTitle(postRequest.getPostTitle()) @@ -60,7 +63,7 @@ public PostDto createPost( public PostDto getPost(Long id) { Optional postEntityOptional = postRepository.findById(id); PostEntity post = postEntityOptional.orElseThrow( - () -> new RuntimeException(ErrorMessages.THERE_IS_NO_POST.getMessage() + id)); + () -> new BusinessException(PostErrorCode.THERE_IS_NO_POST)); return postConverter.toDto(post); } @@ -70,7 +73,7 @@ public PostDto updatePost( Long postId = postRequest.getId(); var postEntityOptional = postRepository.findById(postId); var entity = postEntityOptional.orElseThrow( - () -> new RuntimeException(ErrorMessages.THERE_IS_NO_POST.getMessage() + postId)); + () -> new BusinessException(PostErrorCode.THERE_IS_NO_POST)); var dto = postConverter.toDto(entity); dto.setPostTitle(postRequest.getPostTitle()); dto.setPostContent(postRequest.getPostContent()); @@ -112,11 +115,11 @@ public Api> getPostList(Pageable pageable) { public boolean isWriter(String userEmail, Long postId) { PostEntity post = postRepository.findById(postId).orElseThrow( - () -> new RuntimeException(ErrorMessages.THERE_IS_NO_POST.getMessage() + postId) + () -> new BusinessException(PostErrorCode.THERE_IS_NO_POST) ); UserEntity user = userRepository.findByEmailAddr(userEmail).orElseThrow( - () -> new RuntimeException(ErrorMessages.THERE_IS_NO_USER.getMessage() + userEmail) + () -> new BusinessException(UserErrorCode.THERE_IS_NO_USER) ); return Objects.equals(user.getId(), post.getUserId()); diff --git a/backend/orury/src/main/java/com/kernel360/orury/domain/user/service/CustomUserDetailsService.java b/backend/orury/src/main/java/com/kernel360/orury/domain/user/service/CustomUserDetailsService.java index 4425660..117e74b 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/domain/user/service/CustomUserDetailsService.java +++ b/backend/orury/src/main/java/com/kernel360/orury/domain/user/service/CustomUserDetailsService.java @@ -1,19 +1,18 @@ package com.kernel360.orury.domain.user.service; -import java.util.List; -import java.util.stream.Collectors; - -import com.kernel360.orury.global.message.errors.ErrorMessages; +import com.kernel360.orury.domain.user.db.UserEntity; +import com.kernel360.orury.domain.user.db.UserRepository; +import com.kernel360.orury.global.error.code.UserErrorCode; +import com.kernel360.orury.global.error.exception.BusinessException; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import com.kernel360.orury.domain.user.db.UserEntity; -import com.kernel360.orury.domain.user.db.UserRepository; +import java.util.List; +import java.util.stream.Collectors; @Component("userDetailsService") public class CustomUserDetailsService implements UserDetailsService { @@ -28,12 +27,12 @@ public CustomUserDetailsService(UserRepository userRepository) { public UserDetails loadUserByUsername(final String emailAddr) { return userRepository.findOneWithAuthoritiesByEmailAddr(emailAddr) .map(user -> createUser(emailAddr, user)) - .orElseThrow(() -> new UsernameNotFoundException(emailAddr + ErrorMessages.NOT_EXIST_USER_EMAIL)); + .orElseThrow(() -> new BusinessException(UserErrorCode.THERE_IS_NO_USER)); } private org.springframework.security.core.userdetails.User createUser(String emailAddr, UserEntity user) { if (!user.isActivated()) { - throw new RuntimeException(emailAddr + ErrorMessages.NOT_ACTIVATED); + throw new BusinessException(UserErrorCode.NOT_ACTIVATED); } List grantedAuthorities = user.getAuthorities().stream() diff --git a/backend/orury/src/main/java/com/kernel360/orury/domain/user/service/UserService.java b/backend/orury/src/main/java/com/kernel360/orury/domain/user/service/UserService.java index d91342f..d0178f7 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/domain/user/service/UserService.java +++ b/backend/orury/src/main/java/com/kernel360/orury/domain/user/service/UserService.java @@ -1,22 +1,19 @@ package com.kernel360.orury.domain.user.service; -import java.time.LocalDateTime; -import java.util.Collections; - import com.kernel360.orury.domain.user.db.AuthorityEntity; +import com.kernel360.orury.domain.user.db.UserEntity; +import com.kernel360.orury.domain.user.db.UserRepository; +import com.kernel360.orury.domain.user.model.UserDto; +import com.kernel360.orury.global.common.SecurityUtil; import com.kernel360.orury.global.constants.Constant; -import com.kernel360.orury.global.message.errors.ErrorMessages; -import org.springframework.security.core.userdetails.UsernameNotFoundException; +import com.kernel360.orury.global.error.code.UserErrorCode; +import com.kernel360.orury.global.error.exception.BusinessException; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.kernel360.orury.domain.user.db.UserEntity; -import com.kernel360.orury.domain.user.db.UserRepository; -import com.kernel360.orury.global.exception.DuplicateMemberException; -import com.kernel360.orury.global.exception.NotFoundMemberException; -import com.kernel360.orury.domain.user.model.UserDto; -import com.kernel360.orury.global.common.SecurityUtil; +import java.time.LocalDateTime; +import java.util.Collections; @Service public class UserService { @@ -31,7 +28,7 @@ public UserService(UserRepository userRepository, PasswordEncoder passwordEncode @Transactional public UserDto signup(UserDto userDto) { if (userRepository.findOneWithAuthoritiesByEmailAddr(userDto.getEmailAddr()).orElse(null) != null) { - throw new DuplicateMemberException("이미 가입되어 있는 유저입니다."); + throw new BusinessException(UserErrorCode.ALREADY_EXISTING_USER); } AuthorityEntity authority = AuthorityEntity.builder() @@ -63,14 +60,14 @@ public UserDto getMyUserWithAuthorities() { return UserDto.from( SecurityUtil.getCurrentUsername() .flatMap(userRepository::findOneWithAuthoritiesByEmailAddr) - .orElseThrow(() -> new NotFoundMemberException("Member not found")) + .orElseThrow(() -> new BusinessException(UserErrorCode.THERE_IS_NO_USER)) ); } @Transactional(readOnly = true) public Long getUserIdByEmail(String email){ return userRepository.findByEmailAddr(email).orElseThrow( - () -> new UsernameNotFoundException(ErrorMessages.THERE_IS_NO_USER.getMessage()) + () -> new BusinessException(UserErrorCode.THERE_IS_NO_USER) ).getId(); } diff --git a/backend/orury/src/main/java/com/kernel360/orury/global/error/GlobalExceptionHandler.java b/backend/orury/src/main/java/com/kernel360/orury/global/error/GlobalExceptionHandler.java new file mode 100644 index 0000000..f44ee58 --- /dev/null +++ b/backend/orury/src/main/java/com/kernel360/orury/global/error/GlobalExceptionHandler.java @@ -0,0 +1,24 @@ +package com.kernel360.orury.global.error; + +import com.kernel360.orury.global.common.ApiResponse; +import com.kernel360.orury.global.error.code.ServerErrorCode; +import com.kernel360.orury.global.error.dto.ErrorResponse; +import com.kernel360.orury.global.error.exception.BusinessException; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +@RestControllerAdvice +public class GlobalExceptionHandler { + @ExceptionHandler(BusinessException.class) + public ResponseEntity handleBusinessException(BusinessException e) { + return ResponseEntity.status(e.getErrorCode().getStatus()).body(ErrorResponse.of(e.getErrorCode())); + } + + @ExceptionHandler(Exception.class) + public ResponseEntity handleException(Exception e){ + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(ApiResponse.error(HttpStatus.INTERNAL_SERVER_ERROR, 500, ServerErrorCode.INTERNAL_SERVER_ERROR.getMessage())); + } + +} diff --git a/backend/orury/src/main/java/com/kernel360/orury/global/error/code/AuthorizationErrorCode.java b/backend/orury/src/main/java/com/kernel360/orury/global/error/code/AuthorizationErrorCode.java new file mode 100644 index 0000000..90dd832 --- /dev/null +++ b/backend/orury/src/main/java/com/kernel360/orury/global/error/code/AuthorizationErrorCode.java @@ -0,0 +1,25 @@ +package com.kernel360.orury.global.error.code; + +import lombok.AllArgsConstructor; + +@AllArgsConstructor +public enum AuthorizationErrorCode implements ErrorCode { + THERE_IS_NO_AUTHORITY(403, 403, "권한이 없습니다"); + + private final int status; + private final int code; + private final String message; + + @Override + public int getStatus() { return status; } + + @Override + public int getCode() { + return code; + } + + @Override + public String getMessage() { + return message; + } +} diff --git a/backend/orury/src/main/java/com/kernel360/orury/global/error/code/BoardErrorCode.java b/backend/orury/src/main/java/com/kernel360/orury/global/error/code/BoardErrorCode.java new file mode 100644 index 0000000..850b796 --- /dev/null +++ b/backend/orury/src/main/java/com/kernel360/orury/global/error/code/BoardErrorCode.java @@ -0,0 +1,26 @@ +package com.kernel360.orury.global.error.code; + +import lombok.AllArgsConstructor; + +@AllArgsConstructor +public enum BoardErrorCode implements ErrorCode { + THERE_IS_NO_BOARD(400, 410, "해당 게시판이 존재하지 않습니다."); + + private final int status; + private final int code; + private final String message; + + @Override + public int getStatus() { return status; } + + @Override + public int getCode() { + return code; + } + + @Override + public String getMessage() { + return message; + } +} + diff --git a/backend/orury/src/main/java/com/kernel360/orury/global/error/code/CertificationErrorCode.java b/backend/orury/src/main/java/com/kernel360/orury/global/error/code/CertificationErrorCode.java new file mode 100644 index 0000000..858c473 --- /dev/null +++ b/backend/orury/src/main/java/com/kernel360/orury/global/error/code/CertificationErrorCode.java @@ -0,0 +1,30 @@ +package com.kernel360.orury.global.error.code; + +import lombok.AllArgsConstructor; + +@AllArgsConstructor +public enum CertificationErrorCode implements ErrorCode { + MALFORMED_JWT(401, 401, "잘못된 JWT 서명입니다."), + EXPIRED_ACCESS_JWT(401, 411, "만료된 Access Token 입니다."), + UNSUPPORTED_JWT(401, 401, "지원되지 않는 JWT 토큰입니다."), + EXPIRED_REFRESH_JWT(401, 412, "만료된 Refresh Token 입니다."), + ILLEGAL_ARGUMENT_JWT(401, 401, "JWT 토큰이 잘못되었습니다."), + ILLEGAL_REFRESH_JWT(401, 401, "유효하지 않은 Refresh Token 입니다."); + + private final int status; + private final int code; + private final String message; + + @Override + public int getStatus() { return status; } + + @Override + public int getCode() { + return code; + } + + @Override + public String getMessage() { + return message; + } +} diff --git a/backend/orury/src/main/java/com/kernel360/orury/global/error/code/CommentErrorCode.java b/backend/orury/src/main/java/com/kernel360/orury/global/error/code/CommentErrorCode.java new file mode 100644 index 0000000..f784d28 --- /dev/null +++ b/backend/orury/src/main/java/com/kernel360/orury/global/error/code/CommentErrorCode.java @@ -0,0 +1,25 @@ +package com.kernel360.orury.global.error.code; + +import lombok.AllArgsConstructor; + +@AllArgsConstructor +public enum CommentErrorCode implements ErrorCode{ + THERE_IS_NO_COMMENT(400, 430, "해당 댓글이 존재하지 않습니다."); + + private final int status; + private final int code; + private final String message; + + @Override + public int getStatus() { return status; } + + @Override + public int getCode() { + return code; + } + + @Override + public String getMessage() { + return message; + } +} diff --git a/backend/orury/src/main/java/com/kernel360/orury/global/error/code/ErrorCode.java b/backend/orury/src/main/java/com/kernel360/orury/global/error/code/ErrorCode.java new file mode 100644 index 0000000..2b9a474 --- /dev/null +++ b/backend/orury/src/main/java/com/kernel360/orury/global/error/code/ErrorCode.java @@ -0,0 +1,7 @@ +package com.kernel360.orury.global.error.code; + +public interface ErrorCode { + int getStatus(); + int getCode(); + String getMessage(); +} diff --git a/backend/orury/src/main/java/com/kernel360/orury/global/error/code/PostErrorCode.java b/backend/orury/src/main/java/com/kernel360/orury/global/error/code/PostErrorCode.java new file mode 100644 index 0000000..98c6e25 --- /dev/null +++ b/backend/orury/src/main/java/com/kernel360/orury/global/error/code/PostErrorCode.java @@ -0,0 +1,25 @@ +package com.kernel360.orury.global.error.code; + +import lombok.AllArgsConstructor; + +@AllArgsConstructor +public enum PostErrorCode implements ErrorCode { + THERE_IS_NO_POST(400, 420, "해당 게시글이 존재하지 않습니다."); + + private final int status; + private final int code; + private final String message; + + @Override + public int getStatus() { return status; } + + @Override + public int getCode() { + return code; + } + + @Override + public String getMessage() { + return message; + } +} diff --git a/backend/orury/src/main/java/com/kernel360/orury/global/error/code/ServerErrorCode.java b/backend/orury/src/main/java/com/kernel360/orury/global/error/code/ServerErrorCode.java new file mode 100644 index 0000000..460407c --- /dev/null +++ b/backend/orury/src/main/java/com/kernel360/orury/global/error/code/ServerErrorCode.java @@ -0,0 +1,25 @@ +package com.kernel360.orury.global.error.code; + +import lombok.AllArgsConstructor; + +@AllArgsConstructor +public enum ServerErrorCode implements ErrorCode { + INTERNAL_SERVER_ERROR(500, 500, "서버 에러가 발생했습니다."); + + private final int status; + private final int code; + private final String message; + + @Override + public int getStatus() { return status; } + + @Override + public int getCode() { + return code; + } + + @Override + public String getMessage() { + return message; + } +} diff --git a/backend/orury/src/main/java/com/kernel360/orury/global/error/code/UserErrorCode.java b/backend/orury/src/main/java/com/kernel360/orury/global/error/code/UserErrorCode.java new file mode 100644 index 0000000..b25ca94 --- /dev/null +++ b/backend/orury/src/main/java/com/kernel360/orury/global/error/code/UserErrorCode.java @@ -0,0 +1,27 @@ +package com.kernel360.orury.global.error.code; + +import lombok.AllArgsConstructor; + +@AllArgsConstructor +public enum UserErrorCode implements ErrorCode { + THERE_IS_NO_USER(400, 400,"해당 유저가 존재하지 않습니다."), + ALREADY_EXISTING_USER(400, 401, "이미 존재하는 유저입니다."), + NOT_ACTIVATED(400, 402, "휴면 처리된 회원입니다."); + + private final int status; + private final int code; + private final String message; + + @Override + public int getStatus() { return status; } + + @Override + public int getCode() { + return code; + } + + @Override + public String getMessage() { + return message; + } +} diff --git a/backend/orury/src/main/java/com/kernel360/orury/global/error/dto/ErrorResponse.java b/backend/orury/src/main/java/com/kernel360/orury/global/error/dto/ErrorResponse.java new file mode 100644 index 0000000..628376d --- /dev/null +++ b/backend/orury/src/main/java/com/kernel360/orury/global/error/dto/ErrorResponse.java @@ -0,0 +1,29 @@ +package com.kernel360.orury.global.error.dto; + +import com.kernel360.orury.global.error.code.ErrorCode; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@NoArgsConstructor +public class ErrorResponse { +// private int status; + private int code; + private String message; + + @Builder + public ErrorResponse(String message, int code, int status) { +// this.status = status; + this.code = code; + this.message = message; + } + + public static ErrorResponse of(ErrorCode errorCode) { + return ErrorResponse.builder() +// .status(errorCode.getStatus()) + .code(errorCode.getCode()) + .message(errorCode.getMessage()) + .build(); + } +} diff --git a/backend/orury/src/main/java/com/kernel360/orury/global/error/exception/BusinessException.java b/backend/orury/src/main/java/com/kernel360/orury/global/error/exception/BusinessException.java new file mode 100644 index 0000000..e72286d --- /dev/null +++ b/backend/orury/src/main/java/com/kernel360/orury/global/error/exception/BusinessException.java @@ -0,0 +1,14 @@ +package com.kernel360.orury.global.error.exception; + +import com.kernel360.orury.global.error.code.ErrorCode; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +public class BusinessException extends RuntimeException { + private final ErrorCode errorCode; + + public BusinessException(ErrorCode errorCode) { + this.errorCode = errorCode; + } +} \ No newline at end of file diff --git a/backend/orury/src/main/java/com/kernel360/orury/global/exception/DuplicateMemberException.java b/backend/orury/src/main/java/com/kernel360/orury/global/exception/DuplicateMemberException.java deleted file mode 100644 index a323b52..0000000 --- a/backend/orury/src/main/java/com/kernel360/orury/global/exception/DuplicateMemberException.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.kernel360.orury.global.exception; - -public class DuplicateMemberException extends RuntimeException { - - public DuplicateMemberException() { - super(); - } - - public DuplicateMemberException(String message, Throwable cause) { - super(message, cause); - } - - public DuplicateMemberException(String message) { - super(message); - } - - public DuplicateMemberException(Throwable cause) { - super(cause); - } - -} diff --git a/backend/orury/src/main/java/com/kernel360/orury/global/exception/GlobalExceptionHandler.java b/backend/orury/src/main/java/com/kernel360/orury/global/exception/GlobalExceptionHandler.java deleted file mode 100644 index a55a59d..0000000 --- a/backend/orury/src/main/java/com/kernel360/orury/global/exception/GlobalExceptionHandler.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.kernel360.orury.global.exception; - -import com.kernel360.orury.global.common.ApiResponse; -import com.kernel360.orury.global.message.errors.ErrorMessages; -import io.jsonwebtoken.ExpiredJwtException; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.ControllerAdvice; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.bind.annotation.RestControllerAdvice; - -import java.util.NoSuchElementException; - -@RestControllerAdvice -public class GlobalExceptionHandler { - - @ExceptionHandler(TokenExpiredException.class) - public ResponseEntity handleTokenExpiredException(TokenExpiredException ex){ - return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(ApiResponse.error(HttpStatus.UNAUTHORIZED, 401, ErrorMessages.EXPIRED_JWT.getMessage())); - } - - @ExceptionHandler(Exception.class) - public ResponseEntity handleException(Exception ex){ - return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(ApiResponse.error(HttpStatus.INTERNAL_SERVER_ERROR, 500, ErrorMessages.INTERNAL_SERVER_ERROR.getMessage())); - } - - @ExceptionHandler(ExpiredJwtException.class) - public ResponseEntity handleTokenExpiredException(ExpiredJwtException ex){ - return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(ApiResponse.error(HttpStatus.UNAUTHORIZED, 401, ErrorMessages.EXPIRED_JWT.getMessage())); - } - @ExceptionHandler(TokenNotFoundException.class) - public ResponseEntity handleTokenNotFoundException(TokenNotFoundException ex){ - return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(ApiResponse.error(HttpStatus.UNAUTHORIZED, 402, ErrorMessages.ILLEGAL_REFRESH_JWT.getMessage())); - } - - @ExceptionHandler({IllegalArgumentException.class, NoSuchElementException.class}) - public ResponseEntity userNotFoundException(NoSuchElementException ex){ - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(ApiResponse.error(HttpStatus.BAD_REQUEST, 400, ErrorMessages.THERE_IS_NO_USER.getMessage())); - } - - @ExceptionHandler(RuntimeException.class) - public ResponseEntity boardNotFoundException(RuntimeException ex){ - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(ApiResponse.error(HttpStatus.BAD_REQUEST, 400, ex.getMessage())); - } - - @ExceptionHandler(RefreshExpiredJwtException.class) - public ResponseEntity handleRefreshTokenExpiredException(RefreshExpiredJwtException ex){ - return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(ApiResponse.error(HttpStatus.UNAUTHORIZED, 402, ErrorMessages.EXPIRED_REFRESH_JWT.getMessage())); - } -} diff --git a/backend/orury/src/main/java/com/kernel360/orury/global/exception/NotFoundMemberException.java b/backend/orury/src/main/java/com/kernel360/orury/global/exception/NotFoundMemberException.java deleted file mode 100644 index fde361d..0000000 --- a/backend/orury/src/main/java/com/kernel360/orury/global/exception/NotFoundMemberException.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.kernel360.orury.global.exception; - -public class NotFoundMemberException extends RuntimeException { - public NotFoundMemberException() { - super(); - } - - public NotFoundMemberException(String message, Throwable cause) { - super(message, cause); - } - - public NotFoundMemberException(String message) { - super(message); - } - - public NotFoundMemberException(Throwable cause) { - super(cause); - } -} diff --git a/backend/orury/src/main/java/com/kernel360/orury/global/exception/RefreshExpiredJwtException.java b/backend/orury/src/main/java/com/kernel360/orury/global/exception/RefreshExpiredJwtException.java deleted file mode 100644 index 849f15f..0000000 --- a/backend/orury/src/main/java/com/kernel360/orury/global/exception/RefreshExpiredJwtException.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.kernel360.orury.global.exception; - -public class RefreshExpiredJwtException extends RuntimeException{ - public RefreshExpiredJwtException(String message){ - super(message); - } -} diff --git a/backend/orury/src/main/java/com/kernel360/orury/global/exception/TokenExpiredException.java b/backend/orury/src/main/java/com/kernel360/orury/global/exception/TokenExpiredException.java deleted file mode 100644 index 70ad667..0000000 --- a/backend/orury/src/main/java/com/kernel360/orury/global/exception/TokenExpiredException.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.kernel360.orury.global.exception; - -public class TokenExpiredException extends RuntimeException{ - public TokenExpiredException(String message) { - super(message); - } -} diff --git a/backend/orury/src/main/java/com/kernel360/orury/global/exception/TokenNotFoundException.java b/backend/orury/src/main/java/com/kernel360/orury/global/exception/TokenNotFoundException.java deleted file mode 100644 index a0e7df7..0000000 --- a/backend/orury/src/main/java/com/kernel360/orury/global/exception/TokenNotFoundException.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.kernel360.orury.global.exception; - -public class TokenNotFoundException extends RuntimeException{ - public TokenNotFoundException(String message) { - super(message); - } -} diff --git a/backend/orury/src/main/java/com/kernel360/orury/global/message/errors/ErrorMessages.java b/backend/orury/src/main/java/com/kernel360/orury/global/message/errors/ErrorMessages.java deleted file mode 100644 index 8121fd0..0000000 --- a/backend/orury/src/main/java/com/kernel360/orury/global/message/errors/ErrorMessages.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.kernel360.orury.global.message.errors; - -import lombok.Getter; - -@Getter -public enum ErrorMessages { - // 게시판 - THERE_IS_NO_BOARD("게시판이 존재하지 않습니다."), - THERE_IS_NO_POST("게시글이 존재하지 않습니다."), - THERE_IS_NO_COMMENT("댓글이 존재하지 않습니다."), - THERE_IS_NO_USER("유저가 존재하지 않습니다."), - THERE_IS_NO_AUTHORITY("권한이 없습니다"), - - // 회원 - NOT_EXIST_USER_EMAIL("존재하지 않는 회원입니다. (email 계정 없음)"), - NOT_ACTIVATED("휴면 처리된 회원입니다."), - - // 인증 - MALFORMED_JWT("잘못된 JWT 서명입니다."), - EXPIRED_JWT("만료된 JWT 서명입니다."), - UNSUPPORTED_JWT("지원되지 않는 JWT 토큰입니다."), - EXPIRED_REFRESH_JWT("만료된 REFRESH JWT 서명입니다."), - ILLEGAL_ARGUMENT_JWT("JWT 토큰이 잘못되었습니다."), - ILLEGAL_REFRESH_JWT("유효하지 않은 JWT리프레시 토큰입니다."), - - // 서버 - INTERNAL_SERVER_ERROR("서버 에러가 발생했습니다.") - ; - - private final String message; - - ErrorMessages(String message) { - this.message = message; - } - -} diff --git a/backend/orury/src/test/java/com/kernel360/orury/domain/board/service/BoardServiceTest.java b/backend/orury/src/test/java/com/kernel360/orury/domain/board/service/BoardServiceTest.java index cddb9df..0024c32 100644 --- a/backend/orury/src/test/java/com/kernel360/orury/domain/board/service/BoardServiceTest.java +++ b/backend/orury/src/test/java/com/kernel360/orury/domain/board/service/BoardServiceTest.java @@ -250,6 +250,6 @@ void deleteBoard() { ResponseEntity response = ResponseEntity.noContent().build(); // then - assertThat(response.getStatusCodeValue()).isEqualTo(204); + assertThat(response.getCodeCodeValue()).isEqualTo(204); } } \ No newline at end of file diff --git a/frontend/lib/global/http/http_request.dart b/frontend/lib/global/http/http_request.dart index 7c7e55e..f3f556c 100644 --- a/frontend/lib/global/http/http_request.dart +++ b/frontend/lib/global/http/http_request.dart @@ -37,7 +37,7 @@ Future sendHttpRequest(String method, Uri uri, {String? body, Map if (response.statusCode == 200) { // 응답의 상태 코드가 200인 경우 return response; // 응답을 그대로 반환 } else if (response.statusCode == 401) { // 응답의 상태 코드가 401인 경우 - if (jsonDecode(response.body)['code'] == 401) { // 응답 바디의 errorCode가 401인 경우 + if (jsonDecode(response.body)['code'] == 411) { // 응답 바디의 errorCode가 401인 경우 final refreshToken = prefs.getString('refreshToken'); final tokenResponse = await http.post( // Uri.http(dotenv.env['API_URL']!, '/api/auth/refreshToken'), @@ -57,7 +57,7 @@ Future sendHttpRequest(String method, Uri uri, {String? body, Map // 재귀 호출하여 새로운 토큰으로 다시 HTTP 요청을 보냅니다. return sendHttpRequest(method, uri, body: body, headers: headers); - } else if (jsonDecode(tokenResponse.body)['code'] == 402) { // 응답 바디의 errorCode가 402인 경우 + } else if (jsonDecode(tokenResponse.body)['code'] == 412) { // 응답 바디의 errorCode가 402인 경우 Set keys = prefs.getKeys(); for (String key in keys) { From 777b69d855cb617edc16a3b25dfedae9dbb4fe42 Mon Sep 17 00:00:00 2001 From: ShineCorine Date: Thu, 23 Nov 2023 11:38:01 +0900 Subject: [PATCH 07/21] =?UTF-8?q?[feat]=20#152=20jwt=20=ED=86=A0=ED=81=B0?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EC=98=88=EC=99=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jwt/JwtAuthenticationEntryPoint.java | 10 +++- .../kernel360/orury/config/jwt/JwtFilter.java | 50 ++++++------------- 2 files changed, 24 insertions(+), 36 deletions(-) diff --git a/backend/orury/src/main/java/com/kernel360/orury/config/jwt/JwtAuthenticationEntryPoint.java b/backend/orury/src/main/java/com/kernel360/orury/config/jwt/JwtAuthenticationEntryPoint.java index 5c43cb4..e0baa9b 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/config/jwt/JwtAuthenticationEntryPoint.java +++ b/backend/orury/src/main/java/com/kernel360/orury/config/jwt/JwtAuthenticationEntryPoint.java @@ -24,7 +24,15 @@ public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException ) { - resolver.resolveException(request, response, null, (Exception) request.getAttribute("exception")); + // JwtFilter에서 처리한 밣생한 예외를 받는 부분 + if(request.getAttribute("exception") != null) { + resolver.resolveException(request, response, null, (Exception) request.getAttribute("exception")); + } + + // jwt token에서 정의한 에러 외 filter에서 발생한 예외를 global handler로 보냄 + else { + resolver.resolveException(request, response, null, authException); + } // 유효한 자격증명을 제공하지 않고 접근하려 할때 401 // response.sendError(HttpServletResponse.SC_UNAUTHORIZED); } diff --git a/backend/orury/src/main/java/com/kernel360/orury/config/jwt/JwtFilter.java b/backend/orury/src/main/java/com/kernel360/orury/config/jwt/JwtFilter.java index 31dad54..3dc9e4b 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/config/jwt/JwtFilter.java +++ b/backend/orury/src/main/java/com/kernel360/orury/config/jwt/JwtFilter.java @@ -6,6 +6,8 @@ import com.kernel360.orury.global.error.code.CertificationErrorCode; import com.kernel360.orury.global.error.exception.BusinessException; import io.jsonwebtoken.ExpiredJwtException; +import io.jsonwebtoken.MalformedJwtException; +import io.jsonwebtoken.security.SignatureException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; @@ -61,59 +63,37 @@ public void doFilterInternal(HttpServletRequest servletRequest, HttpServletRespo }catch(ExpiredJwtException e){ BusinessException refreshExpiredJwtException = new BusinessException(CertificationErrorCode.EXPIRED_REFRESH_JWT); servletRequest.setAttribute("exception", refreshExpiredJwtException); + }catch(SignatureException e) { + BusinessException signatureException = new BusinessException(CertificationErrorCode.ILLEGAL_ARGUMENT_JWT); + servletRequest.setAttribute("exception", signatureException); + }catch (MalformedJwtException e){ + BusinessException newException = new BusinessException(CertificationErrorCode.MALFORMED_JWT); + servletRequest.setAttribute("exception", newException); }catch(Exception e){ servletRequest.setAttribute("exception", e); } -// } catch (ExpiredJwtException e) { -// // Create an ObjectMapper -// ObjectMapper objectMapper = new ObjectMapper(); -// // Create a JSON object -// JsonNode errorJson = objectMapper.createObjectNode() -// .put("error", ErrorMessages.EXPIRED_REFRESH_JWT.getMessage()) -// .put("errorCode", 402); -// // Convert JSON object to string -// tempResponse(objectMapper, errorJson, servletResponse); -// return; -// } }else { try { tokenProvider.validateToken(accessToken); Authentication authentication = tokenProvider.getAuthentication(accessToken); SecurityContextHolder.getContext().setAuthentication(authentication); logger.debug("Security Context에 '{}' 인증 정보를 저장했습니다, uri: {}", authentication.getName(), servletRequest.getRequestURI()); - }catch(ExpiredJwtException e){ + }catch(ExpiredJwtException e) { BusinessException accessExpiredJwtException = new BusinessException(CertificationErrorCode.EXPIRED_ACCESS_JWT); servletRequest.setAttribute("exception", accessExpiredJwtException); + }catch(SignatureException e) { + BusinessException signatureException = new BusinessException(CertificationErrorCode.ILLEGAL_ARGUMENT_JWT); + servletRequest.setAttribute("exception", signatureException); + }catch (MalformedJwtException e){ + BusinessException newException = new BusinessException(CertificationErrorCode.MALFORMED_JWT); + servletRequest.setAttribute("exception", newException); }catch(Exception e){ servletRequest.setAttribute("exception", e); } -// } catch (Exception e) { -// // Create an ObjectMapper -// ObjectMapper objectMapper = new ObjectMapper(); -// // Create a JSON object -// JsonNode errorJson = objectMapper.createObjectNode() -// .put("error", ErrorMessages.EXPIRED_JWT.getMessage()) -// .put("errorCode", 401); -// // Convert JSON object to string -// tempResponse(objectMapper, errorJson, servletResponse); -// return; -// } } - filterChain.doFilter(servletRequest, servletResponse); } - private static void tempResponse(ObjectMapper objectMapper, JsonNode errorJson, HttpServletResponse httpServletResponse) throws IOException { - String jsonString = objectMapper.writeValueAsString(errorJson); - // Set status code and headers - httpServletResponse.setStatus(HttpStatus.UNAUTHORIZED.value()); - httpServletResponse.setContentType("application/json; charset=UTF-8"); - httpServletResponse.setCharacterEncoding("UTF-8"); - // Write JSON string to the response body - httpServletResponse.getWriter().write(jsonString); - httpServletResponse.getWriter().flush(); - } - //리퀘스트 헤더에서 토큰 정보를 꺼내온다 private String resolveToken(String authorizationHeader) { if(StringUtils.hasText(authorizationHeader)) { From 21080020fac5ded65e237528210bcb9e1815032b Mon Sep 17 00:00:00 2001 From: ShineCorine Date: Thu, 23 Nov 2023 12:23:33 +0900 Subject: [PATCH 08/21] =?UTF-8?q?[feat]=20postDto=EC=97=90=20commentCnt=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=EB=A5=BC=20=EC=9C=84=ED=95=9C=20=ED=95=84?= =?UTF-8?q?=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/kernel360/orury/domain/post/model/PostDto.java | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/orury/src/main/java/com/kernel360/orury/domain/post/model/PostDto.java b/backend/orury/src/main/java/com/kernel360/orury/domain/post/model/PostDto.java index 5d931f8..a2d78d1 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/domain/post/model/PostDto.java +++ b/backend/orury/src/main/java/com/kernel360/orury/domain/post/model/PostDto.java @@ -33,6 +33,7 @@ public class PostDto { private LocalDateTime updatedAt; private String thumbnailUrl; private List imageList = List.of(); + private Long commentCnt; private List commentList = List.of(); private Map> commentMap = Map.of(); @JsonProperty("is_like") From 3c64c18e6e1bcb7f042fc9f0ccbe1b9d4b389b37 Mon Sep 17 00:00:00 2001 From: ShineCorine Date: Thu, 23 Nov 2023 12:24:25 +0900 Subject: [PATCH 09/21] =?UTF-8?q?[feat]=20postDto=EC=97=90=20commentCnt=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kernel360/orury/domain/post/service/PostConverter.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/backend/orury/src/main/java/com/kernel360/orury/domain/post/service/PostConverter.java b/backend/orury/src/main/java/com/kernel360/orury/domain/post/service/PostConverter.java index 0be29c9..af8313b 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/domain/post/service/PostConverter.java +++ b/backend/orury/src/main/java/com/kernel360/orury/domain/post/service/PostConverter.java @@ -40,6 +40,8 @@ public PostDto toDto(PostEntity postEntity) { .map(commentConverter::toDto) .toList(); + long commentCnt = commentList.size(); + // map으로 변환 Map> commentMap = new HashMap<>(); for (CommentDto comment : commentList) { @@ -73,7 +75,9 @@ public PostDto toDto(PostEntity postEntity) { .thumbnailUrl(postEntity.getThumbnailUrl()) .imageList(postEntity.getImages() == null ? List.of() : Arrays.stream(postEntity.getImages().split(",")) .map(image -> getenv().get("IMGUR_URL") + image) - .collect(Collectors.toList())) + .collect(Collectors.toList()) + ) + .commentCnt(commentCnt) .commentList(commentList) .commentMap(commentMap) .isLike(isLike) From fe7fde4f68936029493806b219233e1cff9a4d3b Mon Sep 17 00:00:00 2001 From: aqrms Date: Thu, 23 Nov 2023 15:56:38 +0900 Subject: [PATCH 10/21] Apply AdminJwtFilter --- .../orury/config/SecurityConfig.java | 12 +- .../orury/config/jwt/AdminJwtFilter.java | 140 ++++++------------ .../admin/controller/AdminAuthController.java | 2 +- 3 files changed, 57 insertions(+), 97 deletions(-) diff --git a/backend/orury/src/main/java/com/kernel360/orury/config/SecurityConfig.java b/backend/orury/src/main/java/com/kernel360/orury/config/SecurityConfig.java index bd2bcfe..776fdb2 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/config/SecurityConfig.java +++ b/backend/orury/src/main/java/com/kernel360/orury/config/SecurityConfig.java @@ -54,6 +54,14 @@ public class SecurityConfig { private final AdminJwtAuthenticationEntryPoint adminJwtAuthenticationEntryPoint; private final JwtAccessDeniedHandler jwtAccessDeniedHandler; private final CustomUserDetailsService customUserDetailsService; + @Value("${jwt.cookie-name}") + private String cookieName; + @Value("${jwt.refresh-cookie-name}") + private String cookieRefreshName; + @Value("${jwt.access-validity}") + private String accessCookieMaxAge; + @Value("${jwt.refresh-validity}") + private String refreshCookieMaxAge; @Bean public BCryptPasswordEncoder passwordEncoder() { @@ -99,8 +107,8 @@ public SecurityFilterChain adminFilterChain(HttpSecurity http, AuthenticationMan sessionManagement.sessionCreationPolicy(SessionCreationPolicy.STATELESS) ) // JWT필터 적용 - .apply(new JwtSecurityConfig(tokenProvider)) - ; + .addFilterBefore(new AdminJwtFilter(tokenProvider, cookieName, cookieRefreshName, accessCookieMaxAge, + refreshCookieMaxAge), UsernamePasswordAuthenticationFilter.class); return http.build(); } diff --git a/backend/orury/src/main/java/com/kernel360/orury/config/jwt/AdminJwtFilter.java b/backend/orury/src/main/java/com/kernel360/orury/config/jwt/AdminJwtFilter.java index 6c781d7..249182e 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/config/jwt/AdminJwtFilter.java +++ b/backend/orury/src/main/java/com/kernel360/orury/config/jwt/AdminJwtFilter.java @@ -8,39 +8,21 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.hibernate.validator.internal.metadata.aggregated.rule.OverridingMethodMustNotAlterParameterConstraints; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.HttpStatus; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.util.StringUtils; import org.springframework.web.filter.OncePerRequestFilter; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.kernel360.orury.global.constants.Constant; -import com.kernel360.orury.global.message.errors.ErrorMessages; - import io.jsonwebtoken.ExpiredJwtException; +import lombok.RequiredArgsConstructor; +@RequiredArgsConstructor public class AdminJwtFilter extends OncePerRequestFilter { - private static final Logger logger = LoggerFactory.getLogger(AdminJwtFilter.class); private final TokenProvider tokenProvider; - @Value("${jwt.cookie-name}") - private String cookieName; - @Value("${jwt.refresh-cookie-name}") - private String cookieRefreshName; - @Value("${jwt.access-validity}") - private String accessCookieMaxAge; - @Value("${jwt.refresh-validity}") - private String refreshCookieMaxAge; - - public AdminJwtFilter(TokenProvider tokenProvider) { - this.tokenProvider = tokenProvider; - } + private final String cookieName; + private final String cookieRefreshName; + private final String accessCookieMaxAge; + private final String refreshCookieMaxAge; //토큰의 인증정보를 SecurityContext에 저장 @Override @@ -48,80 +30,34 @@ public void doFilterInternal(HttpServletRequest request, HttpServletResponse res FilterChain filterChain) throws IOException, ServletException { - try{ + try { String accessToken = resolveToken(request, cookieName); tokenProvider.validateToken(accessToken); Authentication authentication = tokenProvider.getAuthentication(accessToken); SecurityContextHolder.getContext().setAuthentication(authentication); - } catch (ExpiredJwtException e) { - String refreshToken = resolveToken(request, cookieRefreshName); - + } catch (ExpiredJwtException e) { + try { + String accessToken = resolveToken(request, cookieName); + String refreshToken = resolveToken(request, cookieRefreshName); + tokenProvider.validateToken(refreshToken); + Authentication authentication = tokenProvider.getAuthentication(accessToken); + String newAccessToken = tokenProvider.createAccessToken(authentication); + Cookie accessTokenCookie = new Cookie(cookieName, newAccessToken); + + accessTokenCookie.setHttpOnly(true); + accessTokenCookie.setMaxAge(60 * 60 * 24); + accessTokenCookie.setPath("/"); + + response.addCookie(accessTokenCookie); + + Authentication newAuthentication = tokenProvider.getAuthentication(newAccessToken); + SecurityContextHolder.getContext().setAuthentication(newAuthentication); + } catch (ExpiredJwtException ex) { + clearAuthenticationAndCookie(response); } + } catch (IllegalArgumentException ignored) { } - - - - } - - - - - // String refreshToken = ""; - // if (StringUtils.hasText(refreshHeader)) { - // refreshToken = resolveToken(refreshHeader); - // } - // - // String accessToken = resolveToken(authorizationHeader); - // - // if (StringUtils.hasText(refreshToken)) { - // try { - // tokenProvider.validateToken(refreshToken); - // } catch (ExpiredJwtException e) { - // // Create an ObjectMapper - // ObjectMapper objectMapper = new ObjectMapper(); - // // Create a JSON object - // JsonNode errorJson = objectMapper.createObjectNode() - // .put("error", ErrorMessages.EXPIRED_REFRESH_JWT.getMessage()) - // .put("errorCode", 402); - // // Convert JSON object to string - // tempResponse(objectMapper, errorJson, servletResponse); - // return; - // } - // } else { - // try { - // tokenProvider.validateToken(accessToken); - // } catch (ExpiredJwtException e) { - // // Create an ObjectMapper - // ObjectMapper objectMapper = new ObjectMapper(); - // // Create a JSON object - // JsonNode errorJson = objectMapper.createObjectNode() - // .put("error", ErrorMessages.EXPIRED_JWT.getMessage()) - // .put("errorCode", 401); - // // Convert JSON object to string - // tempResponse(objectMapper, errorJson, servletResponse); - // return; - // } - // } - // - // assert accessToken != null; - // Authentication authentication = tokenProvider.getAuthentication(accessToken); - // SecurityContextHolder.getContext().setAuthentication(authentication); - // logger.debug("Security Context에 '{}' 인증 정보를 저장했습니다, uri: {}", authentication.getName(), - // servletRequest.getRequestURI()); - // - // filterChain.doFilter(servletRequest, servletResponse); - } - - private static void tempResponse(ObjectMapper objectMapper, JsonNode errorJson, - HttpServletResponse httpServletResponse) throws IOException { - String jsonString = objectMapper.writeValueAsString(errorJson); - // Set status code and headers - httpServletResponse.setStatus(HttpStatus.UNAUTHORIZED.value()); - httpServletResponse.setContentType("application/json; charset=UTF-8"); - httpServletResponse.setCharacterEncoding("UTF-8"); - // Write JSON string to the response body - httpServletResponse.getWriter().write(jsonString); - httpServletResponse.getWriter().flush(); + filterChain.doFilter(request, response); } //리퀘스트 헤더에서 토큰 정보를 꺼내온다 @@ -129,10 +65,26 @@ private String resolveToken(HttpServletRequest request, String cookieName) { Cookie[] cookies = request.getCookies(); if (cookies != null) { for (Cookie cookie : cookies) { - if (cookieName.equals(cookie.getName())){ // 쿠키 이름에 따라서 변경 - return cookie.getValue(); + if (cookieName.equals(cookie.getName())) { // 쿠키 이름에 따라서 변경 + return cookie.getValue(); + } } } return null; + } + private void clearAuthenticationAndCookie(HttpServletResponse response) { + SecurityContextHolder.clearContext(); + Cookie accessCookie = new Cookie(cookieName, null); + accessCookie.setPath("/"); + accessCookie.setHttpOnly(true); + accessCookie.setMaxAge(0); + response.addCookie(accessCookie); + Cookie refreshCookie = new Cookie(cookieRefreshName, null); + refreshCookie.setPath("/"); + refreshCookie.setHttpOnly(true); + refreshCookie.setMaxAge(0); + response.addCookie(refreshCookie); + } } + diff --git a/backend/orury/src/main/java/com/kernel360/orury/domain/admin/controller/AdminAuthController.java b/backend/orury/src/main/java/com/kernel360/orury/domain/admin/controller/AdminAuthController.java index f6e8b2f..aaa9cd6 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/domain/admin/controller/AdminAuthController.java +++ b/backend/orury/src/main/java/com/kernel360/orury/domain/admin/controller/AdminAuthController.java @@ -63,7 +63,7 @@ public String authenticate(@Valid @RequestParam String emailAddr, String passwor Cookie refreshTokenCookie = new Cookie(cookieRefreshName, refreshToken); accessTokenCookie.setHttpOnly(true); - accessTokenCookie.setMaxAge(Integer.parseInt(accessCookieMaxAge)); + accessTokenCookie.setMaxAge(Integer.parseInt(accessCookieMaxAge) * 1000); accessTokenCookie.setPath("/"); refreshTokenCookie.setHttpOnly(true); refreshTokenCookie.setMaxAge(Integer.parseInt(refreshCookieMaxAge)); From 00c94878392ecbfcc049c30787b4e830be27fddc Mon Sep 17 00:00:00 2001 From: aqrms Date: Thu, 23 Nov 2023 16:02:20 +0900 Subject: [PATCH 11/21] Remove unused imports in SecurityConfig --- .../java/com/kernel360/orury/config/SecurityConfig.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/backend/orury/src/main/java/com/kernel360/orury/config/SecurityConfig.java b/backend/orury/src/main/java/com/kernel360/orury/config/SecurityConfig.java index 776fdb2..472d746 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/config/SecurityConfig.java +++ b/backend/orury/src/main/java/com/kernel360/orury/config/SecurityConfig.java @@ -1,31 +1,24 @@ package com.kernel360.orury.config; import com.kernel360.orury.config.jwt.*; -import com.kernel360.orury.config.jwt.admin.AdminAuthenticationFilter; -import com.kernel360.orury.config.jwt.admin.AdminAuthorizationFilter; import com.kernel360.orury.config.jwt.admin.AdminJwtAuthenticationEntryPoint; import com.kernel360.orury.domain.user.db.UserRepository; import com.kernel360.orury.domain.user.service.CustomUserDetailsService; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.annotation.Order; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; -import org.springframework.security.web.authentication.www.BasicAuthenticationFilter; -import org.springframework.security.web.util.matcher.AntPathRequestMatcher; import org.springframework.web.filter.CorsFilter; import java.util.List; From ec22b55a803e63aeb07652d39ee8546518f4fb1e Mon Sep 17 00:00:00 2001 From: mooncw Date: Thu, 23 Nov 2023 16:11:51 +0900 Subject: [PATCH 12/21] =?UTF-8?q?[Debug]=20#176.=20=EB=8C=93=EA=B8=80?= =?UTF-8?q?=EC=A7=91=EA=B3=84,=20#179.=20=EC=A2=8B=EC=95=84=EC=9A=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - #168 댓글 집계 시, 대댓글은 포함 안 되는 현황 디버깅 - #169 댓글 좋아요 표시 및 동작 이슈 디버깅 --- .../kernel360/orury/domain/post/model/PostDto.java | 2 ++ .../orury/domain/post/service/PostConverter.java | 1 + frontend/lib/presentation/Board/post.dart | 13 +++---------- frontend/lib/presentation/Board/post_detail.dart | 14 ++++++++------ frontend/lib/presentation/main/main_screen.dart | 5 +---- 5 files changed, 15 insertions(+), 20 deletions(-) diff --git a/backend/orury/src/main/java/com/kernel360/orury/domain/post/model/PostDto.java b/backend/orury/src/main/java/com/kernel360/orury/domain/post/model/PostDto.java index 5d931f8..ef6e688 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/domain/post/model/PostDto.java +++ b/backend/orury/src/main/java/com/kernel360/orury/domain/post/model/PostDto.java @@ -37,4 +37,6 @@ public class PostDto { private Map> commentMap = Map.of(); @JsonProperty("is_like") private boolean isLike; + + private Long commentCnt; } diff --git a/backend/orury/src/main/java/com/kernel360/orury/domain/post/service/PostConverter.java b/backend/orury/src/main/java/com/kernel360/orury/domain/post/service/PostConverter.java index 0be29c9..5bce652 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/domain/post/service/PostConverter.java +++ b/backend/orury/src/main/java/com/kernel360/orury/domain/post/service/PostConverter.java @@ -78,6 +78,7 @@ public PostDto toDto(PostEntity postEntity) { .commentMap(commentMap) .isLike(isLike) .likeCnt(likeCnt.intValue()) + .commentCnt((long) commentList.size()) .createdBy(postEntity.getCreatedBy()) .createdAt(postEntity.getCreatedAt()) .updatedBy(postEntity.getUpdatedBy()) diff --git a/frontend/lib/presentation/Board/post.dart b/frontend/lib/presentation/Board/post.dart index 1472c91..4676087 100644 --- a/frontend/lib/presentation/Board/post.dart +++ b/frontend/lib/presentation/Board/post.dart @@ -13,16 +13,11 @@ class Post { final List imageList; final int viewCnt; final int likeCnt; + final int commentCnt; final int userId; - final List commentList; final Map> commentMap; - bool isLike; // 좋아요 상태를 나타내는 변수 - - // Post(this.id, this.boardId, this.postTitle, this.postContent, - // this.userNickname, this.viewCnt, this.likeCnt, this.userId); - Post({ required this.id, required this.boardId, @@ -34,15 +29,13 @@ class Post { required this.viewCnt, required this.likeCnt, required this.userId, - required this.commentList, + required this.commentCnt, required this.commentMap, required this.isLike }); // factory Post.fromJson(Map json) { - var commentList = json['comment_list'] as List; - List commentObjects = commentList.map((comment) => Comment.fromJson(comment)).toList(); final Map> commentMap2 = {}; var commentMapJson = json['comment_map'] as Map; @@ -64,8 +57,8 @@ class Post { imageList: json['image_list'], viewCnt: json['view_cnt'], likeCnt: json['like_cnt'], + commentCnt: json['comment_cnt'], userId: json['user_id'], - commentList: commentObjects, commentMap: commentMap2, isLike: json['is_like'] ); diff --git a/frontend/lib/presentation/Board/post_detail.dart b/frontend/lib/presentation/Board/post_detail.dart index a9f2152..48b27f2 100644 --- a/frontend/lib/presentation/Board/post_detail.dart +++ b/frontend/lib/presentation/Board/post_detail.dart @@ -49,8 +49,6 @@ class _PostDetailState extends State { final jsonData = jsonDecode(utf8.decode(response.bodyBytes)); final post = Post.fromJson(jsonData); - isCommentLikedList = List.generate( - post.commentList.length, (index) => post.commentList[index].isLike); return post; } @@ -248,6 +246,13 @@ class _PostDetailState extends State { (commentMap[mainComment.id.toString()]?.length ?? 0); }); + mainComments.forEach((mainComment) { + isCommentLikedList.add(mainComment.isLike); + post.commentMap[mainComment.id.toString()]?.forEach((reply) { + isCommentLikedList.add(reply.isLike); + }); + }); + return Scaffold( appBar: AppBar( title: Text('게시물 상세보기'), @@ -349,10 +354,7 @@ class _PostDetailState extends State { Comment? comment; int commentIndex = index - 1; for (var mainComment in mainComments) { - if (commentIndex < - 1 + - (commentMap[mainComment.id.toString()]?.length ?? - 0)) { + if (commentIndex < 1 + (commentMap[mainComment.id.toString()]?.length ?? 0)) { if (commentIndex == 0) { comment = mainComment; // 본 댓글 출력 } else { diff --git a/frontend/lib/presentation/main/main_screen.dart b/frontend/lib/presentation/main/main_screen.dart index 50df9bd..49e95df 100644 --- a/frontend/lib/presentation/main/main_screen.dart +++ b/frontend/lib/presentation/main/main_screen.dart @@ -256,10 +256,7 @@ class _MainScreenState extends State { size: 15, ), // 댓글 아이콘 - Text((post.commentMap['0'] - ?.length ?? - 0) - .toString()), + Text(post.commentCnt.toString()), ], ) : null, From 447f2668fe943bd6666d02bcd686d13edecf28a2 Mon Sep 17 00:00:00 2001 From: aqrms Date: Thu, 23 Nov 2023 16:43:34 +0900 Subject: [PATCH 13/21] Delete unused html files --- .../admin/controller/AdminAuthController.java | 32 +- .../src/main/resources/templates/index.html | 38 +- .../templates/layout/charts-apexcharts.html | 1371 --- .../templates/layout/charts-chartjs.html | 974 -- .../templates/layout/charts-echarts.html | 1141 -- .../layout/components-accordion.html | 707 -- .../templates/layout/components-alerts.html | 849 -- .../templates/layout/components-badges.html | 673 -- .../layout/components-breadcrumbs.html | 692 -- .../templates/layout/components-buttons.html | 686 -- .../templates/layout/components-cards.html | 688 -- .../templates/layout/components-carousel.html | 758 -- .../layout/components-list-group.html | 820 -- .../templates/layout/components-modal.html | 912 -- .../layout/components-pagination.html | 730 -- .../templates/layout/components-progress.html | 742 -- .../templates/layout/components-spinners.html | 752 -- .../templates/layout/components-tabs.html | 862 -- .../templates/layout/components-tooltips.html | 595 - .../templates/layout/forms-editors.html | 627 -- .../templates/layout/forms-elements.html | 857 -- .../templates/layout/forms-layouts.html | 833 -- .../templates/layout/forms-validation.html | 773 -- .../templates/layout/icons-bootstrap.html | 6050 ----------- .../templates/layout/icons-boxicons.html | 6672 ------------ .../templates/layout/icons-remix.html | 9657 ----------------- .../templates/layout/pages-blank.html | 586 - .../templates/layout/pages-contact.html | 637 -- .../templates/layout/pages-error-404.html | 82 - .../resources/templates/layout/pages-faq.html | 879 -- .../templates/layout/pages-register.html | 154 - .../templates/layout/tables-data.html | 37 +- .../templates/layout/tables-general.html | 1157 -- .../templates/layout/users-profile.html | 877 -- 34 files changed, 39 insertions(+), 43861 deletions(-) delete mode 100644 backend/orury/src/main/resources/templates/layout/charts-apexcharts.html delete mode 100644 backend/orury/src/main/resources/templates/layout/charts-chartjs.html delete mode 100644 backend/orury/src/main/resources/templates/layout/charts-echarts.html delete mode 100644 backend/orury/src/main/resources/templates/layout/components-accordion.html delete mode 100644 backend/orury/src/main/resources/templates/layout/components-alerts.html delete mode 100644 backend/orury/src/main/resources/templates/layout/components-badges.html delete mode 100644 backend/orury/src/main/resources/templates/layout/components-breadcrumbs.html delete mode 100644 backend/orury/src/main/resources/templates/layout/components-buttons.html delete mode 100644 backend/orury/src/main/resources/templates/layout/components-cards.html delete mode 100644 backend/orury/src/main/resources/templates/layout/components-carousel.html delete mode 100644 backend/orury/src/main/resources/templates/layout/components-list-group.html delete mode 100644 backend/orury/src/main/resources/templates/layout/components-modal.html delete mode 100644 backend/orury/src/main/resources/templates/layout/components-pagination.html delete mode 100644 backend/orury/src/main/resources/templates/layout/components-progress.html delete mode 100644 backend/orury/src/main/resources/templates/layout/components-spinners.html delete mode 100644 backend/orury/src/main/resources/templates/layout/components-tabs.html delete mode 100644 backend/orury/src/main/resources/templates/layout/components-tooltips.html delete mode 100644 backend/orury/src/main/resources/templates/layout/forms-editors.html delete mode 100644 backend/orury/src/main/resources/templates/layout/forms-elements.html delete mode 100644 backend/orury/src/main/resources/templates/layout/forms-layouts.html delete mode 100644 backend/orury/src/main/resources/templates/layout/forms-validation.html delete mode 100644 backend/orury/src/main/resources/templates/layout/icons-bootstrap.html delete mode 100644 backend/orury/src/main/resources/templates/layout/icons-boxicons.html delete mode 100644 backend/orury/src/main/resources/templates/layout/icons-remix.html delete mode 100644 backend/orury/src/main/resources/templates/layout/pages-blank.html delete mode 100644 backend/orury/src/main/resources/templates/layout/pages-contact.html delete mode 100644 backend/orury/src/main/resources/templates/layout/pages-error-404.html delete mode 100644 backend/orury/src/main/resources/templates/layout/pages-faq.html delete mode 100644 backend/orury/src/main/resources/templates/layout/pages-register.html delete mode 100644 backend/orury/src/main/resources/templates/layout/tables-general.html delete mode 100644 backend/orury/src/main/resources/templates/layout/users-profile.html diff --git a/backend/orury/src/main/java/com/kernel360/orury/domain/admin/controller/AdminAuthController.java b/backend/orury/src/main/java/com/kernel360/orury/domain/admin/controller/AdminAuthController.java index aaa9cd6..15de3b3 100644 --- a/backend/orury/src/main/java/com/kernel360/orury/domain/admin/controller/AdminAuthController.java +++ b/backend/orury/src/main/java/com/kernel360/orury/domain/admin/controller/AdminAuthController.java @@ -75,23 +75,21 @@ public String authenticate(@Valid @RequestParam String emailAddr, String passwor return "redirect:/admin/board"; } - @PostMapping("/refreshToken") - public ResponseEntity refreshAccessToken( - @RequestHeader("Refresh-Token") String refreshTokenHeader - ) { - Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - //서버 측에서 리프레시 토큰 검증 - String refreshToken = refreshTokenHeader.replace("Bearer ", ""); - if (tokenProvider.validateRefreshToken(refreshToken)) { - String newAccessToken = tokenProvider.createAccessToken(authentication); - var tokenDto = TokenDto.builder() - .accessToken(newAccessToken) - .refreshToken(refreshToken) - .build(); - return ResponseEntity.ok(tokenDto); - } else { - return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(null); - } + @PostMapping("/logout") + public String logout(HttpServletResponse response) { + SecurityContextHolder.clearContext(); + Cookie accessCookie = new Cookie(cookieName, null); + accessCookie.setPath("/"); + accessCookie.setHttpOnly(true); + accessCookie.setMaxAge(0); + response.addCookie(accessCookie); + Cookie refreshCookie = new Cookie(cookieRefreshName, null); + refreshCookie.setPath("/"); + refreshCookie.setHttpOnly(true); + refreshCookie.setMaxAge(0); + response.addCookie(refreshCookie); + + return "redirect:/admin/login"; } } diff --git a/backend/orury/src/main/resources/templates/index.html b/backend/orury/src/main/resources/templates/index.html index 6d2ddff..490b6a9 100644 --- a/backend/orury/src/main/resources/templates/index.html +++ b/backend/orury/src/main/resources/templates/index.html @@ -40,7 +40,6 @@ - !-- ======= Header ======= -->