Merge pull request #640 from ayyoob/devicetype-3.1.0

added token recovery option when token refresh failed

components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.restconnector/src/main/java/org/wso2/carbon/appmgt/mdm/restconnector/authorization/client/OAuthRequestInterceptor.java

@@ -19,6 +19,7 @@ package org.wso2.carbon.appmgt.mdm.restconnector.authorization.client;
 
 import feign.Client;
 import feign.Feign;
+import feign.FeignException;
 import feign.Logger;
 import feign.Request;
 import feign.RequestInterceptor;
@@ -64,7 +65,7 @@ public class OAuthRequestInterceptor implements RequestInterceptor {
     private ApiApplicationRegistrationService apiApplicationRegistrationService;
     private TokenIssuerService tokenIssuerService;
     private static Log log = LogFactory.getLog(OAuthRequestInterceptor.class);
-
+    private ApiApplicationKey apiApplicationKey;
 
     /**
      * Creates an interceptor that authenticates all requests.
@@ -91,27 +92,39 @@ public class OAuthRequestInterceptor implements RequestInterceptor {
     @Override
     public void apply(RequestTemplate template) {
         if (tokenInfo == null) {
+            if (apiApplicationKey == null) {
                 ApiRegistrationProfile apiRegistrationProfile = new ApiRegistrationProfile();
                 apiRegistrationProfile.setApplicationName(APPLICATION_NAME);
                 apiRegistrationProfile.setIsAllowedToAllDomains(false);
                 apiRegistrationProfile.setIsMappingAnExistingOAuthApp(false);
                 apiRegistrationProfile.setTags(DEVICE_MANAGEMENT_SERVICE_TAG);
-            ApiApplicationKey apiApplicationKey = apiApplicationRegistrationService.register(apiRegistrationProfile);
+                apiApplicationKey = apiApplicationRegistrationService.register(apiRegistrationProfile);
+            }
             String consumerKey = apiApplicationKey.getConsumerKey();
             String consumerSecret = apiApplicationKey.getConsumerSecret();
             String username = AuthorizationConfigurationManager.getInstance().getUserName();
             String password = AuthorizationConfigurationManager.getInstance().getPassword();
-            tokenIssuerService = Feign.builder().client(getSSLClient()).logger(new Slf4jLogger()).logLevel(Logger.Level.FULL)
+            if (tokenIssuerService == null) {
+                tokenIssuerService = Feign.builder().client(getSSLClient()).logger(new Slf4jLogger()).logLevel(
+                        Logger.Level.FULL)
                         .requestInterceptor(new BasicAuthRequestInterceptor(consumerKey, consumerSecret))
                         .contract(new JAXRSContract()).encoder(new GsonEncoder()).decoder(new GsonDecoder())
-                    .target(TokenIssuerService.class, AuthorizationConfigurationManager.getInstance().getTokenApiURL());
+                        .target(TokenIssuerService.class,
+                                AuthorizationConfigurationManager.getInstance().getTokenApiURL());
+            }
             tokenInfo = tokenIssuerService.getToken(PASSWORD_GRANT_TYPE, username, password);
             tokenInfo.setExpires_in(System.currentTimeMillis() + tokenInfo.getExpires_in());
-        }
+        } else {
             synchronized (this) {
                 if (System.currentTimeMillis() + Long.parseLong(refreshTimeOffset) > tokenInfo.getExpires_in()) {
+                    try {
                         tokenInfo = tokenIssuerService.getToken(REFRESH_GRANT_TYPE, tokenInfo.getRefresh_token());
                         tokenInfo.setExpires_in(System.currentTimeMillis() + tokenInfo.getExpires_in());
+                    } catch (FeignException e) {
+                        tokenInfo = null;
+                        apply(template);
+                    }
+                }
             }
         }
         String headerValue = Constants.RestConstants.BEARER + tokenInfo.getAccess_token();

components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.http/src/main/java/org/wso2/carbon/device/mgt/input/adapter/http/authorization/client/OAuthRequestInterceptor.java

@@ -16,6 +16,7 @@ package org.wso2.carbon.device.mgt.input.adapter.http.authorization.client;
 
 import feign.Client;
 import feign.Feign;
+import feign.FeignException;
 import feign.Logger;
 import feign.Request;
 import feign.RequestInterceptor;
@@ -77,7 +78,7 @@ public class OAuthRequestInterceptor implements RequestInterceptor {
     private static String deviceMgtServerUrl;
     private static String scopes;
     private static Map<String, String> globalProperties;
-
+    private ApiApplicationKey apiApplicationKey;
 
     /**
      * Creates an interceptor that authenticates all requests.
@@ -104,27 +105,36 @@ public class OAuthRequestInterceptor implements RequestInterceptor {
     @Override
     public void apply(RequestTemplate template) {
         if (tokenInfo == null) {
-            //had to do on demand initialization due to start up error.
+            if (apiApplicationKey == null) {
                 ApiRegistrationProfile apiRegistrationProfile = new ApiRegistrationProfile();
                 apiRegistrationProfile.setApplicationName(APPLICATION_NAME);
                 apiRegistrationProfile.setIsAllowedToAllDomains(false);
                 apiRegistrationProfile.setIsMappingAnExistingOAuthApp(false);
                 apiRegistrationProfile.setTags(DEVICE_MANAGEMENT_SERVICE_TAG);
-            ApiApplicationKey apiApplicationKey = apiApplicationRegistrationService.register(apiRegistrationProfile);
+                apiApplicationKey = apiApplicationRegistrationService.register(apiRegistrationProfile);
+            }
             String consumerKey = apiApplicationKey.getConsumerKey();
             String consumerSecret = apiApplicationKey.getConsumerSecret();
+            if (tokenIssuerService == null) {
                 tokenIssuerService = Feign.builder().client(getSSLClient())
                         .logger(new Slf4jLogger()).logLevel(Logger.Level.FULL)
                         .requestInterceptor(new BasicAuthRequestInterceptor(consumerKey, consumerSecret))
                         .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() * 1000));
-        }
+        } else {
-        synchronized(this) {
+            synchronized (this) {
                 if (System.currentTimeMillis() + refreshTimeOffset > tokenInfo.getExpires_in()) {
+                    try {
                         tokenInfo = tokenIssuerService.getToken(REFRESH_GRANT_TYPE, tokenInfo.getRefresh_token());
                         tokenInfo.setExpires_in(System.currentTimeMillis() + tokenInfo.getExpires_in());
+                    } catch (FeignException e) {
+                        tokenInfo = null;
+                        apply(template);
+                    }
+                }
             }
         }
         String headerValue = "Bearer " + tokenInfo.getAccess_token();

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

@@ -16,6 +16,7 @@ package org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.client
 
 import feign.Client;
 import feign.Feign;
+import feign.FeignException;
 import feign.Logger;
 import feign.Request;
 import feign.RequestInterceptor;
@@ -62,6 +63,7 @@ public class OAuthRequestInterceptor implements RequestInterceptor {
     private static final String REQUIRED_SCOPE = "perm:authorization:verify";
     private ApiApplicationRegistrationService apiApplicationRegistrationService;
     private TokenIssuerService tokenIssuerService;
+    private ApiApplicationKey apiApplicationKey;
 
     private static Log log = LogFactory.getLog(OAuthRequestInterceptor.class);
 
@@ -105,26 +107,36 @@ public class OAuthRequestInterceptor implements RequestInterceptor {
     @Override
     public void apply(RequestTemplate template) {
         if (tokenInfo == null) {
-            //had to do on demand initialization due to start up error.
+            if (apiApplicationKey == null) {
                 ApiRegistrationProfile apiRegistrationProfile = new ApiRegistrationProfile();
                 apiRegistrationProfile.setApplicationName(APPLICATION_NAME);
                 apiRegistrationProfile.setIsAllowedToAllDomains(false);
                 apiRegistrationProfile.setIsMappingAnExistingOAuthApp(false);
                 apiRegistrationProfile.setTags(DEVICE_MANAGEMENT_SERVICE_TAG);
-            ApiApplicationKey apiApplicationKey = apiApplicationRegistrationService.register(apiRegistrationProfile);
+                apiApplicationKey = apiApplicationRegistrationService.register(
+                        apiRegistrationProfile);
+            }
             String consumerKey = apiApplicationKey.getConsumerKey();
             String consumerSecret = apiApplicationKey.getConsumerSecret();
-            tokenIssuerService = Feign.builder().client(getSSLClient()).logger(new Slf4jLogger()).logLevel(Logger.Level.FULL)
+            if (tokenIssuerService == null) {
+                tokenIssuerService = Feign.builder().client(getSSLClient()).logger(new Slf4jLogger()).logLevel(
+                        Logger.Level.FULL)
                         .requestInterceptor(new BasicAuthRequestInterceptor(consumerKey, consumerSecret))
                         .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() * 1000));
         }
         synchronized(this) {
             if (System.currentTimeMillis() + refreshTimeOffset > tokenInfo.getExpires_in()) {
+                try {
                     tokenInfo = tokenIssuerService.getToken(REFRESH_GRANT_TYPE, tokenInfo.getRefresh_token());
                     tokenInfo.setExpires_in(System.currentTimeMillis() + tokenInfo.getExpires_in());
+                } catch (FeignException e) {
+                    tokenInfo = null;
+                    apply(template);
+                }
             }
         }
         String headerValue = "Bearer " + tokenInfo.getAccess_token();

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

@@ -16,6 +16,7 @@ package org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.client;
 
 import feign.Client;
 import feign.Feign;
+import feign.FeignException;
 import feign.Logger;
 import feign.Request;
 import feign.RequestInterceptor;
@@ -63,6 +64,7 @@ public class OAuthRequestInterceptor implements RequestInterceptor {
     private ApiApplicationRegistrationService apiApplicationRegistrationService;
     private TokenIssuerService tokenIssuerService;
     private static Log log = LogFactory.getLog(OAuthRequestInterceptor.class);
+    private ApiApplicationKey apiApplicationKey;
 
     /**
      * Creates an interceptor that authenticates all requests.
@@ -82,29 +84,39 @@ public class OAuthRequestInterceptor implements RequestInterceptor {
     @Override
     public void apply(RequestTemplate template) {
         if (tokenInfo == null) {
-            //had to do on demand initialization due to start up error.
+            if (apiApplicationKey == null) {
                 ApiRegistrationProfile apiRegistrationProfile = new ApiRegistrationProfile();
                 apiRegistrationProfile.setApplicationName(APPLICATION_NAME);
                 apiRegistrationProfile.setIsAllowedToAllDomains(false);
                 apiRegistrationProfile.setIsMappingAnExistingOAuthApp(false);
                 apiRegistrationProfile.setTags(DEVICE_MANAGEMENT_SERVICE_TAG);
-            ApiApplicationKey apiApplicationKey = apiApplicationRegistrationService.register(apiRegistrationProfile);
+                apiApplicationKey = apiApplicationRegistrationService.register(apiRegistrationProfile);
+            }
             String consumerKey = apiApplicationKey.getConsumerKey();
             String consumerSecret = apiApplicationKey.getConsumerSecret();
             String username = AuthorizationConfigurationManager.getInstance().getUsername();
             String password = AuthorizationConfigurationManager.getInstance().getPassword();
-            tokenIssuerService = Feign.builder().client(getSSLClient()).logger(new Slf4jLogger()).logLevel(Logger.Level.FULL)
+            if (tokenIssuerService == null) {
+                tokenIssuerService = Feign.builder().client(getSSLClient()).logger(new Slf4jLogger()).logLevel(
+                        Logger.Level.FULL)
                         .requestInterceptor(new BasicAuthRequestInterceptor(consumerKey, consumerSecret))
                         .contract(new JAXRSContract()).encoder(new GsonEncoder()).decoder(new GsonDecoder())
                         .target(TokenIssuerService.class,
                                 AuthorizationConfigurationManager.getInstance().getTokenEndpoint());
+            }
             tokenInfo = tokenIssuerService.getToken(PASSWORD_GRANT_TYPE, username, password, REQUIRED_SCOPE);
             tokenInfo.setExpires_in(System.currentTimeMillis() + (tokenInfo.getExpires_in() * 1000));
-        }
+        } else {
             synchronized (this) {
                 if (System.currentTimeMillis() + refreshTimeOffset > tokenInfo.getExpires_in()) {
+                    try {
                         tokenInfo = tokenIssuerService.getToken(REFRESH_GRANT_TYPE, tokenInfo.getRefresh_token());
                         tokenInfo.setExpires_in(System.currentTimeMillis() + tokenInfo.getExpires_in());
+                    } catch (FeignException e) {
+                        tokenInfo = null;
+                        apply(template);
+                    }
+                }
             }
         }
         String headerValue = "Bearer " + tokenInfo.getAccess_token();