From 261950c3d8e20fb94141c03b37a2872f75477831 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 14 1월 2022 21:07:15 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.28:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/service/impl/ApiTokenServiceImpl.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 e7165ed..78221fc 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/ApiTokenServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/ApiTokenServiceImpl.java
@@ -7,9 +7,11 @@
import kr.wisestone.owl.constant.MsgConstants;
import kr.wisestone.owl.domain.ApiToken;
import kr.wisestone.owl.domain.User;
+import kr.wisestone.owl.exception.ApiAuthException;
import kr.wisestone.owl.exception.OwlRuntimeException;
import kr.wisestone.owl.repository.ApiTokenRepository;
import kr.wisestone.owl.service.ApiTokenService;
+import kr.wisestone.owl.service.UserService;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.util.DateUtil;
import kr.wisestone.owl.util.WebAppUtil;
@@ -37,7 +39,6 @@
@Autowired
private ApiTokenRepository apiTokenRepository;
-
@Autowired
protected WebAppUtil webAppUtil;
@@ -137,18 +138,28 @@
return null;
}
- // �넗�겙 �궗�슜�옄 �씤利�
+ // �넗�겙 �궗�슜�옄 �씤利�, �씤利앺썑 �궗�슜�옄 媛��졇�삤湲�
@Override
public UserVo certification(String token) {
UserVo userVo = this.getUserVo(token);
- if (userVo != null && containsToken(userVo, token)){
+ if (userVo != null && containsToken(userVo, token))
+ {
return userVo;
} else {
- throw new OwlRuntimeException(
+ throw new ApiAuthException(
this.messageAccessor.getMessage(MsgConstants.ERROR_TOKEN));
}
}
+ // �넗�겙�쑝濡� 李얘린
+ private ApiToken find(String token) {
+ List<ApiToken> apiTokens = this.apiTokenRepository.findByToken(token);
+ if (apiTokens != null && apiTokens.size() > 0) {
+ return apiTokens.get(0);
+ }
+ return null;
+ }
+
// �넗�겙 媛믪씠 db�뿉 議댁옱�븯�뒗吏� �솗�씤
private boolean containsToken(UserVo userVo, String token) {
List<ApiToken> apiTokens = this.apiTokenRepository.findByUserId(userVo.getId());
--
Gitblit v1.8.0