From 16a8f61f794b7826af4b56c46d42c0eaab4ca47a Mon Sep 17 00:00:00 2001
From: mharindu <milanharindu.ucsc@gmail.com>
Date: Tue, 17 May 2016 08:48:55 +0530
Subject: [PATCH] Refactored jwt authenticator

---
 .../framework/authenticator/JWTAuthenticator.java              | 3 +--
 .../src/main/resources/conf/webapp-publisher-config.xml        | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/JWTAuthenticator.java b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/JWTAuthenticator.java
index 98ab57a61bd..99280837cee 100644
--- a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/JWTAuthenticator.java
+++ b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/JWTAuthenticator.java
@@ -84,8 +84,7 @@ public class JWTAuthenticator implements WebappAuthenticator {
         try {
             keyStoreManager.getDefaultPrimaryCertificate();
             String authorizationHeader = request.getHeader(JWT_ASSERTION_HEADER);
-            JWSVerifier verifier =
-                    new RSASSAVerifier((RSAPublicKey) keyStoreManager.getDefaultPublicKey());
+            JWSVerifier verifier = new RSASSAVerifier((RSAPublicKey) keyStoreManager.getDefaultPublicKey());
             SignedJWT jwsObject = SignedJWT.parse(authorizationHeader);
             if (jwsObject.verify(verifier)) {
                 String username = jwsObject.getJWTClaimsSet().getStringClaim(SIGNED_JWT_AUTH_USERNAME);
diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/src/main/resources/conf/webapp-publisher-config.xml b/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/src/main/resources/conf/webapp-publisher-config.xml
index 74c12a775e3..6b3624613bf 100644
--- a/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/src/main/resources/conf/webapp-publisher-config.xml
+++ b/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/src/main/resources/conf/webapp-publisher-config.xml
@@ -24,7 +24,7 @@
 <WebappPublisherConfigs>
 
     <!-- This host is used to define the host address which is used to publish APIs -->
-    <Host>https://${carbon.local.ip}:$(carbon.http.port)</Host>
+    <Host>https://localhost:${carbon.http.port}</Host>
 
     <!-- If it is true, the APIs of this instance will be published to the defined host -->
     <PublishAPI>true</PublishAPI>