Compare commits

..

No commits in common. "139ab45831dcc2e5caa33cdbbbc6d812bac4aadb" and "e40a1d90180204a781a7a8709098d532f2af5b57" have entirely different histories.

3 changed files with 21 additions and 34 deletions

View File

@ -124,22 +124,18 @@ const RootRoutes = () => {
console.group("jwtAuthentication");
console.log("[Start] jwtAuthentication ------------------------------");
const jwtAuthURL = "/auth/token-check";
const jwtAuthURL = "/uat/esm/jwtAuthAPI.do";
let requestOptions = {
method: "POST",
};
EgovNet.requestFetch(
jwtAuthURL,
requestOptions,
(resp) => {
if (resp === false) {
setMounted(false);
} else {
setMounted(true); // true .
}
}
);
EgovNet.requestFetch(jwtAuthURL, requestOptions, (resp) => {
if (resp === false) {
setMounted(false);
} else {
setMounted(true); // true .
}
});
console.log("------------------------------jwtAuthentication [End]");
console.groupEnd("jwtAuthentication");

View File

@ -8,9 +8,6 @@ import com.dbnt.kcscbackend.config.common.ResponseCode;
import com.dbnt.kcscbackend.config.common.ResultVO;
import com.dbnt.kcscbackend.config.egov.EgovMessageSource;
import com.dbnt.kcscbackend.config.jwt.EgovJwtTokenUtil;
import com.dbnt.kcscbackend.config.jwt.redis.RefreshToken;
import com.dbnt.kcscbackend.config.jwt.redis.RefreshTokenRepository;
import io.jsonwebtoken.Claims;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
@ -63,7 +60,15 @@ public class EgovLoginApiController extends BaseController {
private EgovLoginService loginService;
private final EgovJwtTokenUtil egovJwtTokenUtil;
private final RefreshTokenRepository refreshTokenRepository;
/** EgovMessageSource */
@Resource(name = "egovMessageSource")
EgovMessageSource egovMessageSource;
/** JWT */
@Autowired
private EgovJwtTokenUtil jwtTokenUtil;
@Operation(
summary = "회원가입",
@ -172,17 +177,8 @@ public class EgovLoginApiController extends BaseController {
return resultMap;
}
@PostMapping("/token-check")
public boolean tokenCheck(HttpServletRequest request, HttpServletResponse response, @AuthenticationPrincipal UserInfo loginVO){
String clientToken = request.getHeader("Authorization");
RefreshToken refreshToken = refreshTokenRepository.findById(egovJwtTokenUtil.getUserSeqFromToken(clientToken)).orElse(null);
if (refreshToken != null){
String serverToken = refreshToken.getRefreshToken();
if(egovJwtTokenUtil.getUserSeFromToken(clientToken).equals(egovJwtTokenUtil.getUserSeFromToken(serverToken))){
return true;
}
}
return false;
@RequestMapping("/loginSuccess")
public HashMap<String, Object> loginSuccess(HttpServletRequest request, HttpServletResponse response){
return new HashMap<>();
}
}

View File

@ -58,10 +58,6 @@ public class EgovJwtTokenUtil implements Serializable{
//retrieve username from jwt token
public String getUserSeqFromToken(String token) {
Claims claims = getClaimFromToken(token);
return claims.get("userSeq").toString();
}
public String getUserIdFromToken(String token) {
Claims claims = getClaimFromToken(token);
return claims.get("id").toString();
@ -93,8 +89,7 @@ public class EgovJwtTokenUtil implements Serializable{
// compaction of the JWT to a URL-safe string
public String generateToken(UserInfo loginVO, String remoteAddr, Long sec) {
Map<String, Object> claims = new HashMap<>();
claims.put("userSeq", loginVO.getUserSeq());
claims.put("id", loginVO.getUserId());
claims.put("id", loginVO.getUserId() );
claims.put("remoteAddr", remoteAddr);
claims.put("userSe", loginVO.getUserSe() );
claims.put("type", "Authorization");