diff --git a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/config/security/CustomUrlAuthenticationSuccessHandler.java b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/config/security/CustomUrlAuthenticationSuccessHandler.java index f2a3f7d..04d3650 100644 --- a/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/config/security/CustomUrlAuthenticationSuccessHandler.java +++ b/kcsc-back-end/src/main/java/com/dbnt/kcscbackend/config/security/CustomUrlAuthenticationSuccessHandler.java @@ -57,7 +57,8 @@ public class CustomUrlAuthenticationSuccessHandler extends SimpleUrlAuthenticati MappingJackson2HttpMessageConverter jsonConverter = new MappingJackson2HttpMessageConverter(); MediaType jsonMimeType = MediaType.APPLICATION_JSON; HashMap resultMap = new HashMap<>(); - if(securityUser.getUserId().equals("admin") && !adminIpList.contains(ClientUtils.getRemoteIP(request))){ + + /*if(securityUser.getUserId().equals("admin") && !adminIpList.contains(ClientUtils.getRemoteIP(request))){ resultMap.put("resultCode", ResponseCode.FAILED.getCode()); resultMap.put("resultMessage", "관리자 계정은 지정된 아이피에서만 접속할 수 있습니다.\n필요한 경우 관리자에게 요청하십시오.\n접속자 아이피: "+ClientUtils.getRemoteIP(request)); }else{ @@ -69,7 +70,13 @@ public class CustomUrlAuthenticationSuccessHandler extends SimpleUrlAuthenticati // response.addHeader("Authorization", "BEARER "+accessToken); // Cookie refreshTokenCookie = new Cookie("refreshToken", refreshToken); // response.addCookie(refreshTokenCookie); - } + }*/ + + String accessToken = jwtTokenUtil.generateAccessToken(securityUser, request.getRemoteAddr()); + String refreshToken = jwtTokenUtil.generateRefreshTokenToken(securityUser, request.getRemoteAddr()); + resultMap.put("resultCode", ResponseCode.SUCCESS.getCode()); + resultMap.put("accessToken", accessToken); + resultMap.put("refreshToken", refreshToken); if (jsonConverter.canWrite(resultMap.getClass(), jsonMimeType)) { jsonConverter.write(resultMap, jsonMimeType, new ServletServerHttpResponse(response));