|
@@ -23,10 +23,10 @@ public class AccessTokenServiceImpl implements AccessTokenService {
|
|
|
private final Logger logger = LoggerFactory.getLogger(AccessTokenServiceImpl.class);
|
|
|
|
|
|
|
|
|
- private final String ERROR_CODE_INTERNAL = "InternalServerError";
|
|
|
- private final String ERROR_UNLINK_SERVICE = "UnlinkService";
|
|
|
- private final String ERROR_TOKEN_NONE_EXIST = "TokenNoneExistent";
|
|
|
- private final String ERROR_ALREADY_CREATED_TOKEN = "AlreadyCreatedToken";
|
|
|
+// private final String ERROR_CODE_INTERNAL = "InternalServerError";
|
|
|
+// private final String ERROR_UNLINK_SERVICE = "UnlinkService";
|
|
|
+// private final String ERROR_TOKEN_NONE_EXIST = "TokenNoneExistent";
|
|
|
+// private final String ERROR_ALREADY_CREATED_TOKEN = "AlreadyCreatedToken";
|
|
|
|
|
|
@Autowired
|
|
|
DonghoInfoRepository donghoRepo;
|
|
@@ -82,7 +82,9 @@ public class AccessTokenServiceImpl implements AccessTokenService {
|
|
|
|
|
|
if(uList.size() > 0) {
|
|
|
Map<String, Object> errMap = new HashMap<String, Object>();
|
|
|
- errMap.put("message", ERROR_ALREADY_CREATED_TOKEN);
|
|
|
+ errMap.put("code", KAKAO_RESULT.CODE.FAIL_INVALID_TOKEN.getResultCode());
|
|
|
+ errMap.put("message", KAKAO_RESULT.CODE.FAIL_INVALID_TOKEN.getMessage());
|
|
|
+// errMap.put("message", ERROR_ALREADY_CREATED_TOKEN);
|
|
|
|
|
|
retMap.put("error", errMap);
|
|
|
logger.error("[AccessTokenService]-[CREATE] - [ERROR] - ALREADY CREATED TOKEN");
|
|
@@ -101,7 +103,8 @@ public class AccessTokenServiceImpl implements AccessTokenService {
|
|
|
|
|
|
}catch(Exception e) {
|
|
|
Map<String, Object> errMap = new HashMap<String, Object>();
|
|
|
- errMap.put("message", ERROR_CODE_INTERNAL);
|
|
|
+ errMap.put("code", KAKAO_RESULT.CODE.FAIL_INTERNAL.getResultCode());
|
|
|
+ errMap.put("message", KAKAO_RESULT.CODE.FAIL_INTERNAL.getMessage());
|
|
|
|
|
|
retMap.put("error", errMap);
|
|
|
logger.error("[AccessTokenService]-[CREATE] - [ERROR] - " + e.getMessage());
|
|
@@ -132,8 +135,9 @@ public class AccessTokenServiceImpl implements AccessTokenService {
|
|
|
// 1.1 DonghoInfo가 없으면 ERROR Return
|
|
|
if(userInfoList.size() == 0) {
|
|
|
Map<String, Object> errMap = new HashMap<String, Object>();
|
|
|
-
|
|
|
- errMap.put("message", ERROR_TOKEN_NONE_EXIST);
|
|
|
+ errMap.put("code", KAKAO_RESULT.CODE.FAIL_INVALID_TOKEN.getResultCode());
|
|
|
+ errMap.put("message", KAKAO_RESULT.CODE.FAIL_INVALID_TOKEN.getMessage());
|
|
|
+// errMap.put("message", ERROR_TOKEN_NONE_EXIST);
|
|
|
|
|
|
retMap.put("error", errMap);
|
|
|
logger.error("[AccessTokenService]-[REFRESH] - [ERROR] - TOKEN NONE EXIST1");
|
|
@@ -145,8 +149,9 @@ public class AccessTokenServiceImpl implements AccessTokenService {
|
|
|
logger.debug("prev dongho = " + userInfo.getDonghoInfo().getDonghoId() + "_ NEW dongho = " + dong_ho);
|
|
|
if(!userInfo.getDonghoInfo().getDonghoId().equals(dong_ho)) {
|
|
|
Map<String, Object> errMap = new HashMap<String, Object>();
|
|
|
-
|
|
|
- errMap.put("message", ERROR_TOKEN_NONE_EXIST);
|
|
|
+ errMap.put("code", KAKAO_RESULT.CODE.FAIL_INVALID_TOKEN.getResultCode());
|
|
|
+ errMap.put("message", KAKAO_RESULT.CODE.FAIL_INVALID_TOKEN.getMessage());
|
|
|
+// errMap.put("message", ERROR_TOKEN_NONE_EXIST);
|
|
|
|
|
|
retMap.put("error", errMap);
|
|
|
logger.error("[AccessTokenService]-[REFRESH] - [ERROR] - TOKEN NONE EXIST2");
|
|
@@ -155,8 +160,9 @@ public class AccessTokenServiceImpl implements AccessTokenService {
|
|
|
|
|
|
if(userInfo.getDeleteFlag().equals("Y")) {
|
|
|
Map<String, Object> errMap = new HashMap<String, Object>();
|
|
|
-
|
|
|
- errMap.put("message", ERROR_UNLINK_SERVICE);
|
|
|
+ errMap.put("code", KAKAO_RESULT.CODE.FAIL_UNLINKEXTENSION_SERVICE.getResultCode());
|
|
|
+ errMap.put("message", KAKAO_RESULT.CODE.FAIL_UNLINKEXTENSION_SERVICE.getMessage());
|
|
|
+// errMap.put("message", ERROR_UNLINK_SERVICE);
|
|
|
|
|
|
retMap.put("error", errMap);
|
|
|
logger.error("[AccessTokenService]-[REFRESH] - [ERROR] - UNLINK TOKEN - " + userInfo.getDeleteType());
|
|
@@ -170,8 +176,9 @@ public class AccessTokenServiceImpl implements AccessTokenService {
|
|
|
userInfoRepo.save(userInfo);
|
|
|
}catch(Exception e) {
|
|
|
Map<String, Object> errMap = new HashMap<String, Object>();
|
|
|
-
|
|
|
- errMap.put("message", ERROR_CODE_INTERNAL);
|
|
|
+ errMap.put("code", KAKAO_RESULT.CODE.FAIL_INTERNAL.getResultCode());
|
|
|
+ errMap.put("message", KAKAO_RESULT.CODE.FAIL_INTERNAL.getMessage());
|
|
|
+// errMap.put("message", ERROR_CODE_INTERNAL);
|
|
|
logger.error("[AccessTokenService] - [REFRESH] - [ERROR] - " + e.getMessage());
|
|
|
retMap.put("error", errMap);
|
|
|
e.printStackTrace();
|
|
@@ -199,8 +206,9 @@ public class AccessTokenServiceImpl implements AccessTokenService {
|
|
|
// 1.1 DonghoInfo가 없으면 ERROR Return
|
|
|
if(userList.size() == 0) {
|
|
|
Map<String, Object> errMap = new HashMap<String, Object>();
|
|
|
-
|
|
|
- errMap.put("message", ERROR_TOKEN_NONE_EXIST);
|
|
|
+ errMap.put("code", KAKAO_RESULT.CODE.FAIL_INVALID_TOKEN.getResultCode());
|
|
|
+ errMap.put("message", KAKAO_RESULT.CODE.FAIL_INVALID_TOKEN.getMessage());
|
|
|
+// errMap.put("message", ERROR_TOKEN_NONE_EXIST);
|
|
|
|
|
|
retMap.put("error", errMap);
|
|
|
logger.error("[AccessTokenService]-[REFRESH] - [ERROR] - TOKEN NONE EXIST");
|
|
@@ -212,8 +220,9 @@ public class AccessTokenServiceImpl implements AccessTokenService {
|
|
|
// 호옥시이나아 같은 동호가 아닐 수도 있으니깐
|
|
|
if(!userInfo.getDonghoInfo().getDonghoId().equals(dong_ho)) {
|
|
|
Map<String, Object> errMap = new HashMap<String, Object>();
|
|
|
-
|
|
|
- errMap.put("message", ERROR_TOKEN_NONE_EXIST);
|
|
|
+ errMap.put("code", KAKAO_RESULT.CODE.FAIL_INVALID_TOKEN.getResultCode());
|
|
|
+ errMap.put("message", KAKAO_RESULT.CODE.FAIL_INVALID_TOKEN.getMessage());
|
|
|
+// errMap.put("message", ERROR_TOKEN_NONE_EXIST);
|
|
|
|
|
|
retMap.put("error", errMap);
|
|
|
logger.error("[AccessTokenService]-[REFRESH] - [ERROR] - TOKEN NONE EXIST");
|
|
@@ -222,8 +231,9 @@ public class AccessTokenServiceImpl implements AccessTokenService {
|
|
|
|
|
|
if(userInfo.getDeleteFlag().equals("Y")) {
|
|
|
Map<String, Object> errMap = new HashMap<String, Object>();
|
|
|
-
|
|
|
- errMap.put("message", ERROR_UNLINK_SERVICE);
|
|
|
+ errMap.put("code", KAKAO_RESULT.CODE.FAIL_UNLINKEXTENSION_SERVICE.getResultCode());
|
|
|
+ errMap.put("message", KAKAO_RESULT.CODE.FAIL_UNLINKEXTENSION_SERVICE.getMessage());
|
|
|
+// errMap.put("message", ERROR_UNLINK_SERVICE);
|
|
|
|
|
|
retMap.put("error", errMap);
|
|
|
logger.error("[AccessTokenService]-[REFRESH] - [ERROR] - UNLINK TOKEN - " + userInfo.getDeleteType());
|
|
@@ -238,8 +248,9 @@ public class AccessTokenServiceImpl implements AccessTokenService {
|
|
|
}
|
|
|
}catch(Exception e) {
|
|
|
Map<String, Object> errMap = new HashMap<String, Object>();
|
|
|
-
|
|
|
- errMap.put("message", ERROR_TOKEN_NONE_EXIST);
|
|
|
+ errMap.put("code", KAKAO_RESULT.CODE.FAIL_INVALID_TOKEN.getResultCode());
|
|
|
+ errMap.put("message", KAKAO_RESULT.CODE.FAIL_INVALID_TOKEN.getMessage());
|
|
|
+// errMap.put("message", ERROR_TOKEN_NONE_EXIST);
|
|
|
|
|
|
retMap.put("error", errMap);
|
|
|
}finally {
|