From f1e75d937569e311181c641a58078b08be689f69 Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Wed, 18 Jan 2017 01:48:43 +0530
Subject: [PATCH] apim seperation

---
 .../authorization/client/OAuthRequestInterceptor.java         | 4 ++--
 .../mqtt/authorization/client/OAuthRequestInterceptor.java    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/authorization/client/OAuthRequestInterceptor.java b/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/authorization/client/OAuthRequestInterceptor.java
index ffae0b797..7688040d9 100755
--- a/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/authorization/client/OAuthRequestInterceptor.java
+++ b/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/authorization/client/OAuthRequestInterceptor.java
@@ -73,7 +73,7 @@ public class OAuthRequestInterceptor implements RequestInterceptor {
         this.globalProperties = globalProperties;
         try {
             deviceMgtServerUrl = getDeviceMgtServerUrl(globalProperties);
-            refreshTimeOffset = getRefreshTimeOffset(globalProperties);
+            refreshTimeOffset = getRefreshTimeOffset(globalProperties) * 1000;
             username = getUsername(globalProperties);
             password = getPassword(globalProperties);
             tokenEndpoint = getTokenEndpoint(globalProperties);
@@ -105,7 +105,7 @@ public class OAuthRequestInterceptor implements RequestInterceptor {
                     .contract(new JAXRSContract()).encoder(new GsonEncoder()).decoder(new GsonDecoder())
                     .target(TokenIssuerService.class, tokenEndpoint);
             tokenInfo = tokenIssuerService.getToken(PASSWORD_GRANT_TYPE, username, password, REQUIRED_SCOPE);
-            tokenInfo.setExpires_in(System.currentTimeMillis() + tokenInfo.getExpires_in());
+            tokenInfo.setExpires_in(System.currentTimeMillis() + (tokenInfo.getExpires_in() * 1000));
         }
         synchronized(this) {
             if (System.currentTimeMillis() + refreshTimeOffset > tokenInfo.getExpires_in()) {
diff --git a/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/client/OAuthRequestInterceptor.java b/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/client/OAuthRequestInterceptor.java
index f6cbd1c30..630fda079 100755
--- a/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/client/OAuthRequestInterceptor.java
+++ b/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/client/OAuthRequestInterceptor.java
@@ -50,7 +50,7 @@ public class OAuthRequestInterceptor implements RequestInterceptor {
      * Creates an interceptor that authenticates all requests.
      */
     public OAuthRequestInterceptor() {
-        refreshTimeOffset = AuthorizationConfigurationManager.getInstance().getTokenRefreshTimeOffset();
+        refreshTimeOffset = AuthorizationConfigurationManager.getInstance().getTokenRefreshTimeOffset() * 1000;
         String username = AuthorizationConfigurationManager.getInstance().getUsername();
         String password = AuthorizationConfigurationManager.getInstance().getPassword();
         apiApplicationRegistrationService = Feign.builder().requestInterceptor(
@@ -81,7 +81,7 @@ public class OAuthRequestInterceptor implements RequestInterceptor {
                     .target(TokenIssuerService.class,
                             AuthorizationConfigurationManager.getInstance().getTokenEndpoint());
             tokenInfo = tokenIssuerService.getToken(PASSWORD_GRANT_TYPE, username, password, REQUIRED_SCOPE);
-            tokenInfo.setExpires_in(System.currentTimeMillis() + tokenInfo.getExpires_in());
+            tokenInfo.setExpires_in(System.currentTimeMillis() + (tokenInfo.getExpires_in() * 1000));
         }
         synchronized (this) {
             if (System.currentTimeMillis() + refreshTimeOffset > tokenInfo.getExpires_in()) {