Compare commits
No commits in common. "139ab45831dcc2e5caa33cdbbbc6d812bac4aadb" and "e40a1d90180204a781a7a8709098d532f2af5b57" have entirely different histories.
139ab45831
...
e40a1d9018
|
|
@ -124,22 +124,18 @@ const RootRoutes = () => {
|
||||||
console.group("jwtAuthentication");
|
console.group("jwtAuthentication");
|
||||||
console.log("[Start] jwtAuthentication ------------------------------");
|
console.log("[Start] jwtAuthentication ------------------------------");
|
||||||
|
|
||||||
const jwtAuthURL = "/auth/token-check";
|
const jwtAuthURL = "/uat/esm/jwtAuthAPI.do";
|
||||||
let requestOptions = {
|
let requestOptions = {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
};
|
};
|
||||||
|
|
||||||
EgovNet.requestFetch(
|
EgovNet.requestFetch(jwtAuthURL, requestOptions, (resp) => {
|
||||||
jwtAuthURL,
|
|
||||||
requestOptions,
|
|
||||||
(resp) => {
|
|
||||||
if (resp === false) {
|
if (resp === false) {
|
||||||
setMounted(false);
|
setMounted(false);
|
||||||
} else {
|
} else {
|
||||||
setMounted(true); // 이 값으로 true 일 때만 페이지를 렌더링이 되는 변수 사용.
|
setMounted(true); // 이 값으로 true 일 때만 페이지를 렌더링이 되는 변수 사용.
|
||||||
}
|
}
|
||||||
}
|
});
|
||||||
);
|
|
||||||
|
|
||||||
console.log("------------------------------jwtAuthentication [End]");
|
console.log("------------------------------jwtAuthentication [End]");
|
||||||
console.groupEnd("jwtAuthentication");
|
console.groupEnd("jwtAuthentication");
|
||||||
|
|
|
||||||
|
|
@ -8,9 +8,6 @@ import com.dbnt.kcscbackend.config.common.ResponseCode;
|
||||||
import com.dbnt.kcscbackend.config.common.ResultVO;
|
import com.dbnt.kcscbackend.config.common.ResultVO;
|
||||||
import com.dbnt.kcscbackend.config.egov.EgovMessageSource;
|
import com.dbnt.kcscbackend.config.egov.EgovMessageSource;
|
||||||
import com.dbnt.kcscbackend.config.jwt.EgovJwtTokenUtil;
|
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.Operation;
|
||||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||||
import io.swagger.v3.oas.annotations.responses.ApiResponses;
|
import io.swagger.v3.oas.annotations.responses.ApiResponses;
|
||||||
|
|
@ -63,7 +60,15 @@ public class EgovLoginApiController extends BaseController {
|
||||||
private EgovLoginService loginService;
|
private EgovLoginService loginService;
|
||||||
|
|
||||||
private final EgovJwtTokenUtil egovJwtTokenUtil;
|
private final EgovJwtTokenUtil egovJwtTokenUtil;
|
||||||
private final RefreshTokenRepository refreshTokenRepository;
|
|
||||||
|
/** EgovMessageSource */
|
||||||
|
@Resource(name = "egovMessageSource")
|
||||||
|
EgovMessageSource egovMessageSource;
|
||||||
|
|
||||||
|
/** JWT */
|
||||||
|
@Autowired
|
||||||
|
private EgovJwtTokenUtil jwtTokenUtil;
|
||||||
|
|
||||||
|
|
||||||
@Operation(
|
@Operation(
|
||||||
summary = "회원가입",
|
summary = "회원가입",
|
||||||
|
|
@ -172,17 +177,8 @@ public class EgovLoginApiController extends BaseController {
|
||||||
return resultMap;
|
return resultMap;
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping("/token-check")
|
@RequestMapping("/loginSuccess")
|
||||||
public boolean tokenCheck(HttpServletRequest request, HttpServletResponse response, @AuthenticationPrincipal UserInfo loginVO){
|
public HashMap<String, Object> loginSuccess(HttpServletRequest request, HttpServletResponse response){
|
||||||
String clientToken = request.getHeader("Authorization");
|
return new HashMap<>();
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -58,10 +58,6 @@ public class EgovJwtTokenUtil implements Serializable{
|
||||||
|
|
||||||
|
|
||||||
//retrieve username from jwt token
|
//retrieve username from jwt token
|
||||||
public String getUserSeqFromToken(String token) {
|
|
||||||
Claims claims = getClaimFromToken(token);
|
|
||||||
return claims.get("userSeq").toString();
|
|
||||||
}
|
|
||||||
public String getUserIdFromToken(String token) {
|
public String getUserIdFromToken(String token) {
|
||||||
Claims claims = getClaimFromToken(token);
|
Claims claims = getClaimFromToken(token);
|
||||||
return claims.get("id").toString();
|
return claims.get("id").toString();
|
||||||
|
|
@ -93,7 +89,6 @@ public class EgovJwtTokenUtil implements Serializable{
|
||||||
// compaction of the JWT to a URL-safe string
|
// compaction of the JWT to a URL-safe string
|
||||||
public String generateToken(UserInfo loginVO, String remoteAddr, Long sec) {
|
public String generateToken(UserInfo loginVO, String remoteAddr, Long sec) {
|
||||||
Map<String, Object> claims = new HashMap<>();
|
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("remoteAddr", remoteAddr);
|
||||||
claims.put("userSe", loginVO.getUserSe() );
|
claims.put("userSe", loginVO.getUserSe() );
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue