From a7b00c7a08fb3e272425bd4313d33ac4cadb62be Mon Sep 17 00:00:00 2001 From: milanperera Date: Fri, 20 Dec 2019 19:49:18 +0530 Subject: [PATCH] Fix ios-agent authentication issue --- .../integration/client/OAuthRequestInterceptor.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/OAuthRequestInterceptor.java b/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/OAuthRequestInterceptor.java index 0d6d305bc7b..d1a77817f2e 100755 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/OAuthRequestInterceptor.java +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/OAuthRequestInterceptor.java @@ -59,13 +59,15 @@ public class OAuthRequestInterceptor implements RequestInterceptor { private OAuthApplication oAuthApplication; private static Map tenantUserTokenMap = new ConcurrentHashMap<>(); private static final Log log = LogFactory.getLog(OAuthRequestInterceptor.class); + private String username; + private String password; /** * Creates an interceptor that authenticates all requests. */ public OAuthRequestInterceptor() { - String username = APIMConfigReader.getInstance().getConfig().getUsername(); - String password = APIMConfigReader.getInstance().getConfig().getPassword(); + username = APIMConfigReader.getInstance().getConfig().getUsername(); + password = APIMConfigReader.getInstance().getConfig().getPassword(); dcrClient = Feign.builder().client(new OkHttpClient(Utils.getSSLClient())).logger(new Slf4jLogger()) .logLevel(Logger.Level.FULL).requestInterceptor(new BasicAuthRequestInterceptor(username, password)) .contract(new JAXRSContract()).encoder(new GsonEncoder()).decoder(new GsonDecoder()) @@ -74,6 +76,8 @@ public class OAuthRequestInterceptor implements RequestInterceptor { } public OAuthRequestInterceptor(String username, String password) { + this.username = username; + this.password = password; dcrClient = Feign.builder().client(new OkHttpClient(Utils.getSSLClient())).logger(new Slf4jLogger()) .logLevel(Logger.Level.FULL).requestInterceptor(new BasicAuthRequestInterceptor(username, password)) .contract(new JAXRSContract()).encoder(new GsonEncoder()).decoder(new GsonDecoder()) @@ -89,10 +93,6 @@ public class OAuthRequestInterceptor implements RequestInterceptor { clientProfile.setClientName(APPLICATION_NAME); clientProfile.setCallbackUrl(""); clientProfile.setGrantType(GRANT_TYPES); - String username = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername(); - if (username == null || username.isEmpty()) { - username = APIMConfigReader.getInstance().getConfig().getUsername(); - } clientProfile.setOwner(username); clientProfile.setSaasApp(true); oAuthApplication = dcrClient.register(clientProfile);