From d13278c374e3a65ab9aee5079bae1773c2020184 Mon Sep 17 00:00:00 2001 From: curry772 Date: Tue, 21 Jul 2026 15:01:54 +0900 Subject: [PATCH] =?UTF-8?q?OAuth2=20=ED=86=A0=ED=81=B0=20=ED=83=80?= =?UTF-8?q?=EC=9E=85=EC=9D=B4=20=EC=97=86=EC=9D=84=20=EB=95=8C=20Authoriza?= =?UTF-8?q?tion=20=ED=97=A4=EB=8D=94=EC=97=90=20Bearer=20=EC=A0=91?= =?UTF-8?q?=EB=91=90=EC=96=B4=20=EB=AF=B8=EB=B6=80=EC=B0=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit accessToken.getTokenType()이 비어있으면 Bearer 접두어 없이 토큰 값만 헤더에 설정하도록 setAuthHeaders를 수정하고, OAuth2AccessTokenVO의 tokenType은 BEARER_TYPE과 대소문자 무관하게 일치할 때만 상수로 정규화한다. --- .../impl/HttpClient5AdapterServiceRest.java | 32 +++++++++---------- .../eai/common/token/OAuth2AccessTokenVO.java | 5 ++- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java b/src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java index 7940de0..8376f9a 100644 --- a/src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java +++ b/src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java @@ -862,26 +862,24 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp } } - protected void setAuthHeaders(HttpUriRequestBase method, String authorization) throws Exception { - method.setHeader("Authorization", - String.format("%s", authorization)); - } - - protected void setAuthHeaders(HttpUriRequestBase method, String authorization, String authorizationHeaderName) throws Exception { - if(StringUtils.isEmpty(authorizationHeaderName)) + protected void setAuthHeaders(HttpUriRequestBase method, String authorization, String authorizationHeaderName) + throws Exception { + if (StringUtils.isEmpty(authorizationHeaderName)) authorizationHeaderName = "Authorization"; - method.setHeader(authorizationHeaderName, - String.format("%s", authorization)); + + method.setHeader(authorizationHeaderName, String.format("%s", authorization)); } - protected void setAuthHeaders(HttpUriRequestBase method, OAuth2AccessTokenVO accessToken) throws Exception { - method.setHeader("Authorization", - String.format("%s %s", AccessTokenVO.BEARER_TYPE, accessToken.getAccessToken())); - } - - protected void setAuthHeaders(HttpUriRequestBase method, OAuth2AccessTokenVO accessToken, String authorizationHeaderName) throws Exception { - method.setHeader(authorizationHeaderName, - String.format("%s %s", AccessTokenVO.BEARER_TYPE, accessToken.getAccessToken())); + protected void setAuthHeaders(HttpUriRequestBase method, OAuth2AccessTokenVO accessToken, + String authorizationHeaderName) throws Exception { + if (StringUtils.isEmpty(authorizationHeaderName)) + authorizationHeaderName = "Authorization"; + + if (StringUtils.isEmpty(accessToken.getTokenType())) + method.setHeader(authorizationHeaderName, String.format("%s", accessToken.getAccessToken())); + else + method.setHeader(authorizationHeaderName, + String.format("%s %s", AccessTokenVO.BEARER_TYPE, accessToken.getAccessToken())); } private boolean checkTokenRetry(byte[] responseMessage, String tokenErrorCodeKey, String tokenErrorCodeValues, diff --git a/src/main/java/com/openbanking/eai/common/token/OAuth2AccessTokenVO.java b/src/main/java/com/openbanking/eai/common/token/OAuth2AccessTokenVO.java index 920121c..8acf344 100644 --- a/src/main/java/com/openbanking/eai/common/token/OAuth2AccessTokenVO.java +++ b/src/main/java/com/openbanking/eai/common/token/OAuth2AccessTokenVO.java @@ -56,7 +56,10 @@ public class OAuth2AccessTokenVO implements AccessTokenVO, Serializable } public void setTokenType(String tokenType) { - this.tokenType = tokenType; + if(tokenType.equalsIgnoreCase(BEARER_TYPE)) + this.tokenType = BEARER_TYPE; + else + this.tokenType = tokenType; } public long getExpiresIn() {