From 5fb1952ae91f1a739803247266e87dbd15ea1f27 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 01 12월 2021 13:23:09 +0900
Subject: [PATCH] 충돌 수정
---
src/main/java/kr/wisestone/owl/service/impl/ApiTokenServiceImpl.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/ApiTokenServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/ApiTokenServiceImpl.java
index d7d4039..a1a0bf9 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/ApiTokenServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/ApiTokenServiceImpl.java
@@ -4,8 +4,10 @@
import io.jsonwebtoken.Jws;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
+import kr.wisestone.owl.constant.MsgConstants;
import kr.wisestone.owl.domain.ApiToken;
import kr.wisestone.owl.domain.User;
+import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.repository.ApiTokenRepository;
import kr.wisestone.owl.service.ApiTokenService;
import kr.wisestone.owl.util.ConvertUtil;
@@ -84,8 +86,19 @@
}
//JWT 蹂듯샇�솕
- public UserVo getUser(String jwt) {
+ private UserVo getUserVo(String jwt) {
+ //寃곌낵媛� = Claims
+ Jws<Claims> claims = decryption(jwt);
+ if (claims == null)
+ return null;
+
+ ObjectMapper objectMapper = new ObjectMapper();
+ //諛섑솚 ���엯�� LinkedHashMap �씠�떎. �씠瑜� User ���엯�쑝濡� 蹂��솚�븯湲� �쐞�빐 ObjectMapper �궗�슜
+ return objectMapper.convertValue(claims.getBody().get(DATA_KEY), UserVo.class);
+ }
+
+ private Jws<Claims> decryption(String jwt) {
//寃곌낵媛� = Claims
Jws<Claims> claims = null;
@@ -98,11 +111,9 @@
} catch (Exception e) {
log.debug(e.getMessage(), e);
}
-
- ObjectMapper objectMapper = new ObjectMapper();
- //諛섑솚 ���엯�� LinkedHashMap �씠�떎. �씠瑜� User ���엯�쑝濡� 蹂��솚�븯湲� �쐞�빐 ObjectMapper �궗�슜
- return objectMapper.convertValue(claims.getBody().get(DATA_KEY), UserVo.class);
+ return claims;
}
+
// �넗�겙 議고쉶
@Override
@@ -115,6 +126,18 @@
return null;
}
+ // �넗�겙 �궗�슜�옄 �씤利�
+ @Override
+ public UserVo certification(String token) {
+ UserVo userVo = this.getUserVo(token);
+ if (userVo != null){
+ return userVo;
+ } else {
+ throw new OwlRuntimeException(
+ this.messageAccessor.getMessage(MsgConstants.ERROR_TOKEN));
+ }
+ }
+
// �넗�겙 �궘�젣
@Override
public void remove(ApiTokenForm apiTokenForm) {
--
Gitblit v1.8.0