Get token separately for REST calls

Co-authored-by: Pasindu Rupasinghe <pasindu@entgra.io>
Co-committed-by: Pasindu Rupasinghe <pasindu@entgra.io>

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/src/main/java/io/entgra/device/mgt/core/apimgt/application/extension/APIManagementProviderServiceImpl.java

@@ -138,7 +138,7 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe
                 Map<String, String> queryParams = new HashMap<>();
                 queryParams.put("tag", tag);
 
-                APIInfo[] apiInfos = consumerRESTAPIServices.getAllApis(applicationInfo, queryParams, headerParams);
+                APIInfo[] apiInfos = consumerRESTAPIServices.getAllApis(applicationInfo, null, queryParams, headerParams);
 
                 uniqueApiList.addAll(List.of(apiInfos));
                 Set<APIInfo> taggedAPISet = new HashSet<>(uniqueApiList);
@@ -147,21 +147,22 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe
             }
 
             io.entgra.device.mgt.core.apimgt.extension.rest.api.bean.APIMConsumer.Application[] applications =
-                    consumerRESTAPIServices.getAllApplications(applicationInfo, applicationName);
+                    consumerRESTAPIServices.getAllApplications(applicationInfo, null, applicationName);
             io.entgra.device.mgt.core.apimgt.extension.rest.api.bean.APIMConsumer.Application application;
             boolean isNewApplication = false;
             if (applications.length == 0) {
                 isNewApplication = true;
                 application = new io.entgra.device.mgt.core.apimgt.extension.rest.api.bean.APIMConsumer.Application();
                 application.setName(applicationName);
-                application = consumerRESTAPIServices.createApplication(applicationInfo, application);
+                application = consumerRESTAPIServices.createApplication(applicationInfo, null, application);
                 addSubscriptions(application, uniqueApiList, applicationInfo);
             } else {
                 if (applications.length == 1) {
                     Optional<io.entgra.device.mgt.core.apimgt.extension.rest.api.bean.APIMConsumer.Application> applicationOpt =
                             Arrays.stream(applications).findFirst();
                     application = applicationOpt.get();
-                    Subscription[] subscriptions = consumerRESTAPIServices.getAllSubscriptions(applicationInfo, application.getApplicationId());
+                    Subscription[] subscriptions = consumerRESTAPIServices.getAllSubscriptions(applicationInfo, null,
+                            application.getApplicationId());
                     Arrays.stream(subscriptions).map(Subscription::getApiInfo).forEachOrdered(uniqueApiList::remove);
                     addSubscriptions(application, uniqueApiList, applicationInfo);
                 } else {
@@ -173,7 +174,7 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe
 
             MetadataManagementService metadataManagementService = APIApplicationManagerExtensionDataHolder.getInstance().getMetadataManagementService();
             if (isNewApplication) {
-                KeyManager[] keyManagers = consumerRESTAPIServices.getAllKeyManagers(applicationInfo);
+                KeyManager[] keyManagers = consumerRESTAPIServices.getAllKeyManagers(applicationInfo, null);
                 KeyManager keyManager;
                 if (keyManagers.length == 1) {
                     keyManager = keyManagers[0];
@@ -182,7 +183,8 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe
                             "Found invalid number of key managers. No of key managers found from the APIM: " + keyManagers.length;
                     throw new APIManagerException(msg);
                 }
-                ApplicationKey applicationKey = consumerRESTAPIServices.generateApplicationKeys(applicationInfo, application, keyManager);
+                ApplicationKey applicationKey = consumerRESTAPIServices.generateApplicationKeys(applicationInfo, null,
+                        application.getApplicationId(), keyManager.getName(), keyType, validityTime);
                 ApiApplicationKey apiApplicationKey = new ApiApplicationKey();
                 apiApplicationKey.setConsumerKey(applicationKey.getConsumerKey());
                 apiApplicationKey.setConsumerSecret(applicationKey.getConsumerSecret());
@@ -221,7 +223,7 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe
                     }
                     String applicationId = metaValues[0];
                     String keyMappingId = metaValues[1];
-                    ApplicationKey applicationKey = consumerRESTAPIServices.getKeyDetails(applicationInfo, applicationId, keyMappingId);
+                    ApplicationKey applicationKey = consumerRESTAPIServices.getKeyDetails(applicationInfo, null, applicationId, keyMappingId);
                     ApiApplicationKey apiApplicationKey = new ApiApplicationKey();
                     apiApplicationKey.setConsumerKey(applicationKey.getConsumerKey());
                     apiApplicationKey.setConsumerSecret(applicationKey.getConsumerSecret());
@@ -273,7 +275,7 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe
             subscription.setApplicationId(application.getApplicationId());
             subscriptionList.add(subscription);
         });
-        consumerRESTAPIServices.createSubscriptions(apiApplicationInfo, subscriptionList);
+        consumerRESTAPIServices.createSubscriptions(apiApplicationInfo, null, subscriptionList);
     }
 
     /**

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/src/main/java/io/entgra/device/mgt/core/apimgt/extension/rest/api/ConsumerRESTAPIServices.java

@@ -28,36 +28,39 @@ import java.util.List;
 import java.util.Map;
 
 public interface ConsumerRESTAPIServices {
-    Application[] getAllApplications(ApiApplicationInfo applicationInfo, String appName)
+    Application[] getAllApplications(ApiApplicationInfo applicationInfo, String accessToken, String appName)
             throws APIServicesException, BadRequestException, UnexpectedResponseException;
 
-    Application getDetailsOfAnApplication(ApiApplicationInfo applicationInfo, String applicationId)
+    Application getDetailsOfAnApplication(ApiApplicationInfo apiApplicationInfo, String accessToken, String applicationId)
             throws APIServicesException, BadRequestException, UnexpectedResponseException;
 
-    Application createApplication(ApiApplicationInfo applicationInfo, Application application)
+    Application createApplication(ApiApplicationInfo apiApplicationInfo, String accessToken, Application application)
             throws APIServicesException, BadRequestException, UnexpectedResponseException;
 
-    Application deleteApplication(ApiApplicationInfo apiApplicationInfo, String applicationId)
+    Boolean deleteApplication(ApiApplicationInfo apiApplicationInfo, String accessToken, String applicationId)
             throws APIServicesException, BadRequestException, UnexpectedResponseException;
 
-    Subscription[] getAllSubscriptions(ApiApplicationInfo apiApplicationInfo, String applicationId)
+    Subscription[] getAllSubscriptions(ApiApplicationInfo apiApplicationInfo, String accessToken, String applicationId)
             throws APIServicesException, BadRequestException, UnexpectedResponseException;
 
-    APIInfo[] getAllApis(ApiApplicationInfo applicationInfo, Map<String, String> queryParam, Map<String, String> headerParams)
+    APIInfo[] getAllApis(ApiApplicationInfo apiApplicationInfo, String accessToken, Map<String, String> queryParams,
+                         Map<String, String> headerParams)
             throws APIServicesException, BadRequestException, UnexpectedResponseException;
 
-    Subscription createSubscription(ApiApplicationInfo apiApplicationInfo, Subscription subscriptions)
+    Subscription createSubscription(ApiApplicationInfo apiApplicationInfo, String accessToken, Subscription subscriptions)
             throws APIServicesException, BadRequestException, UnexpectedResponseException;
 
-    Subscription[] createSubscriptions(ApiApplicationInfo apiApplicationInfo, List<Subscription> subscriptions)
+    Subscription[] createSubscriptions(ApiApplicationInfo apiApplicationInfo, String accessToken,
+                                       List<Subscription> subscriptions)
             throws APIServicesException, BadRequestException, UnexpectedResponseException;
 
-    ApplicationKey generateApplicationKeys(ApiApplicationInfo applicationInfo, Application application, KeyManager keyManager)
+    ApplicationKey generateApplicationKeys(ApiApplicationInfo apiApplicationInfo, String accessToken, String  applicationId,
+                                           String keyManager, String validityTime, String keyType)
             throws APIServicesException, BadRequestException, UnexpectedResponseException;
 
-    ApplicationKey getKeyDetails(ApiApplicationInfo apiApplicationInfo, String applicationId, String keyMapId)
+    ApplicationKey getKeyDetails(ApiApplicationInfo apiApplicationInfo, String accessToken, String applicationId, String keyMapId)
             throws APIServicesException, BadRequestException, UnexpectedResponseException;
 
-    KeyManager[] getAllKeyManagers(ApiApplicationInfo apiApplicationInfo)
+    KeyManager[] getAllKeyManagers(ApiApplicationInfo apiApplicationInfo, String accessToken)
             throws APIServicesException, BadRequestException, UnexpectedResponseException;
 }

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/src/main/java/io/entgra/device/mgt/core/apimgt/extension/rest/api/ConsumerRESTAPIServicesImpl.java

@@ -50,16 +50,22 @@ public class ConsumerRESTAPIServicesImpl implements ConsumerRESTAPIServices {
             + Constants.COLON + port;
 
     @Override
-    public Application[] getAllApplications(ApiApplicationInfo applicationInfo, String appName)
+    public Application[] getAllApplications(ApiApplicationInfo applicationInfo, String accessToken, String appName)
             throws APIServicesException, BadRequestException, UnexpectedResponseException {
 
         String getAllApplicationsUrl = endPointPrefix + Constants.APPLICATIONS_API + "?query=" + appName;
-        Request request = new Request.Builder()
-                .url(getAllApplicationsUrl)
-                .addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
-                        + applicationInfo.getAccess_token())
-                .get()
-                .build();
+
+        Request.Builder builder = new Request.Builder();
+        builder.url(getAllApplicationsUrl);
+        if (!(applicationInfo == null) && accessToken == null) {
+            builder.addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
+                    + applicationInfo.getAccess_token());
+        } else {
+            builder.addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
+                    + accessToken);
+        }
+        builder.get();
+        Request request = builder.build();
 
         try {
             Response response = client.newCall(request).execute();
@@ -67,13 +73,19 @@ public class ConsumerRESTAPIServicesImpl implements ConsumerRESTAPIServices {
                 JSONArray applicationList = (JSONArray) new JSONObject(response.body().string()).get("list");
                 return gson.fromJson(applicationList.toString(), Application[].class);
             } else if (HttpStatus.SC_UNAUTHORIZED == response.code()) {
+                if (!(applicationInfo == null) && accessToken == null) {
                     APIApplicationServices apiApplicationServices = new APIApplicationServicesImpl();
                     AccessTokenInfo refreshedAccessToken = apiApplicationServices.
                             generateAccessTokenFromRefreshToken(applicationInfo.getRefresh_token(),
                                     applicationInfo.getClientId(), applicationInfo.getClientSecret());
                     ApiApplicationInfo refreshedApiApplicationInfo = returnApplicationInfo(applicationInfo, refreshedAccessToken);
                     //TODO: max attempt count
-                return getAllApplications(refreshedApiApplicationInfo, appName);
+                    return getAllApplications(refreshedApiApplicationInfo, null, appName);
+                } else {
+                    String msg = "Invalid or null access token";
+                    log.error(msg);
+                    throw new BadRequestException(msg);
+                }
             } else if (HttpStatus.SC_BAD_REQUEST == response.code()) {
                 String msg = "Bad Request, Invalid request";
                 log.error(msg);
@@ -90,29 +102,41 @@ public class ConsumerRESTAPIServicesImpl implements ConsumerRESTAPIServices {
     }
 
     @Override
-    public Application getDetailsOfAnApplication(ApiApplicationInfo apiApplicationInfo, String applicationId)
+    public Application getDetailsOfAnApplication(ApiApplicationInfo apiApplicationInfo, String accessToken, String applicationId)
             throws APIServicesException, BadRequestException, UnexpectedResponseException {
 
-        String getAllApplicationsUrl = endPointPrefix + Constants.APPLICATIONS_API + Constants.SLASH + applicationId;
-        Request request = new Request.Builder()
-                .url(getAllApplicationsUrl)
-                .addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
-                        + apiApplicationInfo.getAccess_token())
-                .get()
-                .build();
+        String getDetailsOfAPPUrl = endPointPrefix + Constants.APPLICATIONS_API + Constants.SLASH + applicationId;
+
+        Request.Builder builder = new Request.Builder();
+        builder.url(getDetailsOfAPPUrl);
+        if (!(apiApplicationInfo == null) && accessToken == null) {
+            builder.addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
+                    + apiApplicationInfo.getAccess_token());
+        } else {
+            builder.addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
+                    + accessToken);
+        }
+        builder.get();
+        Request request = builder.build();
 
         try {
             Response response = client.newCall(request).execute();
             if (HttpStatus.SC_OK == response.code()) {
                 return gson.fromJson(response.body().string(), Application.class);
             } else if (HttpStatus.SC_UNAUTHORIZED == response.code()) {
+                if (!(apiApplicationInfo == null) && accessToken == null) {
                     APIApplicationServices apiApplicationServices = new APIApplicationServicesImpl();
                     AccessTokenInfo refreshedAccessToken = apiApplicationServices.
                             generateAccessTokenFromRefreshToken(apiApplicationInfo.getRefresh_token(),
                                     apiApplicationInfo.getClientId(), apiApplicationInfo.getClientSecret());
                     ApiApplicationInfo refreshedApiApplicationInfo = returnApplicationInfo(apiApplicationInfo, refreshedAccessToken);
                     //TODO: max attempt count
-                return getDetailsOfAnApplication(refreshedApiApplicationInfo, applicationId);
+                    return getDetailsOfAnApplication(refreshedApiApplicationInfo, null, applicationId);
+                } else {
+                    String msg = "Invalid or null access token";
+                    log.error(msg);
+                    throw new BadRequestException(msg);
+                }
             } else if (HttpStatus.SC_BAD_REQUEST == response.code()) {
                 String msg = "Bad Request, Invalid request";
                 log.error(msg);
@@ -129,7 +153,7 @@ public class ConsumerRESTAPIServicesImpl implements ConsumerRESTAPIServices {
     }
 
     @Override
-    public Application createApplication(ApiApplicationInfo apiApplicationInfo, Application application)
+    public Application createApplication(ApiApplicationInfo apiApplicationInfo, String accessToken, Application application)
             throws APIServicesException, BadRequestException, UnexpectedResponseException {
 
         String getAllScopesUrl = endPointPrefix + Constants.APPLICATIONS_API;
@@ -143,27 +167,38 @@ public class ConsumerRESTAPIServicesImpl implements ConsumerRESTAPIServices {
                 "  \"attributes\": " + application.getAttributes().toString() + ",\n" +
                 "  \"subscriptionScopes\": " + gson.toJson(application.getSubscriptionScopes()) + "\n" +
                 "}";
-
         RequestBody requestBody = RequestBody.create(JSON, applicationInfo);
-        Request request = new Request.Builder()
-                .url(getAllScopesUrl)
-                .addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
-                        + apiApplicationInfo.getAccess_token())
-                .post(requestBody)
-                .build();
+
+        Request.Builder builder = new Request.Builder();
+        builder.url(getAllScopesUrl);
+        if (!(apiApplicationInfo == null) && accessToken == null) {
+            builder.addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
+                    + apiApplicationInfo.getAccess_token());
+        } else {
+            builder.addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
+                    + accessToken);
+        }
+        builder.post(requestBody);
+        Request request = builder.build();
 
         try {
             Response response = client.newCall(request).execute();
             if (HttpStatus.SC_CREATED == response.code()) {
                 return gson.fromJson(response.body().string(), Application.class);
             } else if (HttpStatus.SC_UNAUTHORIZED == response.code()) {
+                if (!(apiApplicationInfo == null) && accessToken == null) {
                     APIApplicationServices apiApplicationServices = new APIApplicationServicesImpl();
                     AccessTokenInfo refreshedAccessToken = apiApplicationServices.
                             generateAccessTokenFromRefreshToken(apiApplicationInfo.getRefresh_token(),
                                     apiApplicationInfo.getClientId(), apiApplicationInfo.getClientSecret());
                     ApiApplicationInfo refreshedApiApplicationInfo = returnApplicationInfo(apiApplicationInfo, refreshedAccessToken);
                     //TODO: max attempt count
-                return createApplication(refreshedApiApplicationInfo, application);
+                    return createApplication(refreshedApiApplicationInfo, null, application);
+                } else {
+                    String msg = "Invalid or null access token";
+                    log.error(msg);
+                    throw new BadRequestException(msg);
+                }
             } else if (HttpStatus.SC_BAD_REQUEST == response.code()) {
                 String msg = "Bad Request, Invalid request body";
                 log.error(msg);
@@ -180,30 +215,41 @@ public class ConsumerRESTAPIServicesImpl implements ConsumerRESTAPIServices {
     }
 
     @Override
-    public Application deleteApplication(ApiApplicationInfo apiApplicationInfo, String applicationId)
+    public Boolean deleteApplication(ApiApplicationInfo apiApplicationInfo, String accessToken, String applicationId)
             throws APIServicesException, BadRequestException, UnexpectedResponseException {
 
         String deleteScopesUrl = endPointPrefix + Constants.APPLICATIONS_API + Constants.SLASH + applicationId;
 
-        Request request = new Request.Builder()
-                .url(deleteScopesUrl)
-                .addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
-                        + apiApplicationInfo.getAccess_token())
-                .delete()
-                .build();
+        Request.Builder builder = new Request.Builder();
+        builder.url(deleteScopesUrl);
+        if (!(apiApplicationInfo == null) && accessToken == null) {
+            builder.addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
+                    + apiApplicationInfo.getAccess_token());
+        } else {
+            builder.addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
+                    + accessToken);
+        }
+        builder.delete();
+        Request request = builder.build();
 
         try {
             Response response = client.newCall(request).execute();
             if (HttpStatus.SC_OK == response.code()) {
-                return gson.fromJson(response.body().string(), Application.class);
+                return true;
             } else if (HttpStatus.SC_UNAUTHORIZED == response.code()) {
+                if (!(apiApplicationInfo == null) && accessToken == null) {
                     APIApplicationServices apiApplicationServices = new APIApplicationServicesImpl();
                     AccessTokenInfo refreshedAccessToken = apiApplicationServices.
                             generateAccessTokenFromRefreshToken(apiApplicationInfo.getRefresh_token(),
                                     apiApplicationInfo.getClientId(), apiApplicationInfo.getClientSecret());
                     ApiApplicationInfo refreshedApiApplicationInfo = returnApplicationInfo(apiApplicationInfo, refreshedAccessToken);
                     //TODO: max attempt count
-                return deleteApplication(refreshedApiApplicationInfo, applicationId);
+                    return deleteApplication(refreshedApiApplicationInfo, null, applicationId);
+                } else {
+                    String msg = "Invalid or null access token";
+                    log.error(msg);
+                    throw new BadRequestException(msg);
+                }
             } else if (HttpStatus.SC_BAD_REQUEST == response.code()) {
                 String msg = "Bad Request, Invalid request body";
                 log.error(msg);
@@ -220,16 +266,22 @@ public class ConsumerRESTAPIServicesImpl implements ConsumerRESTAPIServices {
     }
 
     @Override
-    public Subscription[] getAllSubscriptions(ApiApplicationInfo apiApplicationInfo, String applicationId)
+    public Subscription[] getAllSubscriptions(ApiApplicationInfo apiApplicationInfo, String accessToken, String applicationId)
             throws APIServicesException, BadRequestException, UnexpectedResponseException {
 
         String getAllScopesUrl = endPointPrefix + Constants.SUBSCRIPTION_API + "?applicationId=" + applicationId;
-        Request request = new Request.Builder()
-                .url(getAllScopesUrl)
-                .addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
-                        + apiApplicationInfo.getAccess_token())
-                .get()
-                .build();
+
+        Request.Builder builder = new Request.Builder();
+        builder.url(getAllScopesUrl);
+        if (!(apiApplicationInfo == null) && accessToken == null) {
+            builder.addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
+                    + apiApplicationInfo.getAccess_token());
+        } else {
+            builder.addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
+                    + accessToken);
+        }
+        builder.get();
+        Request request = builder.build();
 
         try {
             Response response = client.newCall(request).execute();
@@ -237,13 +289,19 @@ public class ConsumerRESTAPIServicesImpl implements ConsumerRESTAPIServices {
                 JSONArray subscriptionList = (JSONArray) new JSONObject(response.body().string()).get("list");
                 return gson.fromJson(subscriptionList.toString(), Subscription[].class);
             } else if (HttpStatus.SC_UNAUTHORIZED == response.code()) {
+                if (!(apiApplicationInfo == null) && accessToken == null) {
                     APIApplicationServices apiApplicationServices = new APIApplicationServicesImpl();
                     AccessTokenInfo refreshedAccessToken = apiApplicationServices.
                             generateAccessTokenFromRefreshToken(apiApplicationInfo.getRefresh_token(),
                                     apiApplicationInfo.getClientId(), apiApplicationInfo.getClientSecret());
                     ApiApplicationInfo rehreshedApiApplicationInfo = returnApplicationInfo(apiApplicationInfo, refreshedAccessToken);
                     //TODO: max attempt count
-                return getAllSubscriptions(rehreshedApiApplicationInfo, applicationId);
+                    return getAllSubscriptions(rehreshedApiApplicationInfo, null, applicationId);
+                } else {
+                    String msg = "Invalid or null access token";
+                    log.error(msg);
+                    throw new BadRequestException(msg);
+                }
             } else if (HttpStatus.SC_BAD_REQUEST == response.code()) {
                 String msg = "Bad Request, Invalid request";
                 log.error(msg);
@@ -260,20 +318,25 @@ public class ConsumerRESTAPIServicesImpl implements ConsumerRESTAPIServices {
     }
 
     @Override
-    public APIInfo[] getAllApis(ApiApplicationInfo applicationInfo, Map<String, String> queryParams,
+    public APIInfo[] getAllApis(ApiApplicationInfo apiApplicationInfo, String accessToken, Map<String, String> queryParams,
                                 Map<String, String> headerParams)
             throws APIServicesException, BadRequestException, UnexpectedResponseException {
 
-        String getAPIsURL = endPointPrefix + Constants.DEV_PORTAL_API;
+        StringBuilder getAPIsURL = new StringBuilder(endPointPrefix + Constants.DEV_PORTAL_API);
 
         for (Map.Entry<String, String> query : queryParams.entrySet()) {
-            getAPIsURL = getAPIsURL + Constants.AMPERSAND + query.getKey() + Constants.EQUAL + query.getValue();
+            getAPIsURL.append(Constants.AMPERSAND).append(query.getKey()).append(Constants.EQUAL).append(query.getValue());
         }
 
         Request.Builder builder = new Request.Builder();
-        builder.url(getAPIsURL);
+        builder.url(getAPIsURL.toString());
+        if (!(apiApplicationInfo == null) && accessToken == null) {
             builder.addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
-                + applicationInfo.getAccess_token());
+                    + apiApplicationInfo.getAccess_token());
+        } else {
+            builder.addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
+                    + accessToken);
+        }
         for (Map.Entry<String, String> header : headerParams.entrySet()) {
             builder.addHeader(header.getKey(), header.getValue());
         }
@@ -286,13 +349,19 @@ public class ConsumerRESTAPIServicesImpl implements ConsumerRESTAPIServices {
                 JSONArray apiList = (JSONArray) new JSONObject(response.body().string()).get("list");
                 return gson.fromJson(apiList.toString(), APIInfo[].class);
             } else if (HttpStatus.SC_UNAUTHORIZED == response.code()) {
+                if (!(apiApplicationInfo == null) && accessToken == null) {
                     APIApplicationServices apiApplicationServices = new APIApplicationServicesImpl();
                     AccessTokenInfo refreshedAccessToken = apiApplicationServices.
-                        generateAccessTokenFromRefreshToken(applicationInfo.getRefresh_token(),
-                                applicationInfo.getClientId(), applicationInfo.getClientSecret());
-                ApiApplicationInfo rehreshedApiApplicationInfo = returnApplicationInfo(applicationInfo, refreshedAccessToken);
+                            generateAccessTokenFromRefreshToken(apiApplicationInfo.getRefresh_token(),
+                                    apiApplicationInfo.getClientId(), apiApplicationInfo.getClientSecret());
+                    ApiApplicationInfo rehreshedApiApplicationInfo = returnApplicationInfo(apiApplicationInfo, refreshedAccessToken);
                     //TODO: max attempt count
-                return getAllApis(rehreshedApiApplicationInfo, queryParams, headerParams);
+                    return getAllApis(rehreshedApiApplicationInfo, null, queryParams, headerParams);
+                } else {
+                    String msg = "Invalid or null access token";
+                    log.error(msg);
+                    throw new BadRequestException(msg);
+                }
             } else if (HttpStatus.SC_BAD_REQUEST == response.code()) {
                 String msg = "Bad Request, Invalid request";
                 log.error(msg);
@@ -309,10 +378,10 @@ public class ConsumerRESTAPIServicesImpl implements ConsumerRESTAPIServices {
     }
 
     @Override
-    public Subscription createSubscription(ApiApplicationInfo applicationInfo, Subscription subscriptions)
+    public Subscription createSubscription(ApiApplicationInfo apiApplicationInfo, String accessToken, Subscription subscriptions)
             throws APIServicesException, BadRequestException, UnexpectedResponseException {
 
-        String getAllScopesUrl = endPointPrefix + Constants.SUBSCRIPTION_API;
+        String createSubscriptionUrl = endPointPrefix + Constants.SUBSCRIPTION_API;
 
         String subscriptionObject = "{\n" +
                 "  \"applicationId\": \"" + subscriptions.getApplicationId() + "\",\n" +
@@ -322,25 +391,37 @@ public class ConsumerRESTAPIServicesImpl implements ConsumerRESTAPIServices {
                 "}";
 
         RequestBody requestBody = RequestBody.create(JSON, subscriptionObject);
-        Request request = new Request.Builder()
-                .url(getAllScopesUrl)
-                .addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
-                        + applicationInfo.getAccess_token())
-                .post(requestBody)
-                .build();
+
+        Request.Builder builder = new Request.Builder();
+        builder.url(createSubscriptionUrl);
+        if (!(apiApplicationInfo == null) && accessToken == null) {
+            builder.addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
+                    + apiApplicationInfo.getAccess_token());
+        } else {
+            builder.addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
+                    + accessToken);
+        }
+        builder.post(requestBody);
+        Request request = builder.build();
 
         try {
             Response response = client.newCall(request).execute();
             if (HttpStatus.SC_CREATED == response.code()) {
                 return gson.fromJson(response.body().string(), Subscription.class);
             } else if (HttpStatus.SC_UNAUTHORIZED == response.code()) {
+                if (!(apiApplicationInfo == null) && accessToken == null) {
                     APIApplicationServices apiApplicationServices = new APIApplicationServicesImpl();
                     AccessTokenInfo refreshedAccessToken = apiApplicationServices.
-                        generateAccessTokenFromRefreshToken(applicationInfo.getRefresh_token(),
-                                applicationInfo.getClientId(), applicationInfo.getClientSecret());
-                ApiApplicationInfo refreshedApiApplicationInfo = returnApplicationInfo(applicationInfo, refreshedAccessToken);
+                            generateAccessTokenFromRefreshToken(apiApplicationInfo.getRefresh_token(),
+                                    apiApplicationInfo.getClientId(), apiApplicationInfo.getClientSecret());
+                    ApiApplicationInfo refreshedApiApplicationInfo = returnApplicationInfo(apiApplicationInfo, refreshedAccessToken);
                     //TODO: max attempt count
-                return createSubscription(refreshedApiApplicationInfo, subscriptions);
+                    return createSubscription(refreshedApiApplicationInfo, null, subscriptions);
+                } else {
+                    String msg = "Invalid or null access token";
+                    log.error(msg);
+                    throw new BadRequestException(msg);
+                }
             } else if (HttpStatus.SC_BAD_REQUEST == response.code()) {
                 String msg = "Bad Request, Invalid request body";
                 log.error(msg);
@@ -357,20 +438,26 @@ public class ConsumerRESTAPIServicesImpl implements ConsumerRESTAPIServices {
     }
 
     @Override
-    public Subscription[] createSubscriptions(ApiApplicationInfo apiApplicationInfo, List<Subscription> subscriptions)
+    public Subscription[] createSubscriptions(ApiApplicationInfo apiApplicationInfo, String accessToken,
+                                              List<Subscription> subscriptions)
             throws APIServicesException, BadRequestException, UnexpectedResponseException {
 
-        String getAllScopesUrl = endPointPrefix + Constants.SUBSCRIPTION_API + "/multiple";
+        String createSubscriptionsUrl = endPointPrefix + Constants.SUBSCRIPTION_API + "/multiple";
 
         String subscriptionsList = gson.toJson(subscriptions);
-
         RequestBody requestBody = RequestBody.create(JSON, subscriptionsList);
-        Request request = new Request.Builder()
-                .url(getAllScopesUrl)
-                .addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
-                        + apiApplicationInfo.getAccess_token())
-                .post(requestBody)
-                .build();
+
+        Request.Builder builder = new Request.Builder();
+        builder.url(createSubscriptionsUrl);
+        if (!(apiApplicationInfo == null) && accessToken == null) {
+            builder.addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
+                    + apiApplicationInfo.getAccess_token());
+        } else {
+            builder.addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
+                    + accessToken);
+        }
+        builder.post(requestBody);
+        Request request = builder.build();
 
         try {
             Response response = client.newCall(request).execute();
@@ -378,13 +465,19 @@ public class ConsumerRESTAPIServicesImpl implements ConsumerRESTAPIServices {
                 JSONArray subscriptionsArray = (JSONArray) new JSONObject(response.body().string()).get("list");
                 return gson.fromJson(subscriptionsArray.toString(), Subscription[].class);
             } else if (HttpStatus.SC_UNAUTHORIZED == response.code()) {
+                if (!(apiApplicationInfo == null) && accessToken == null) {
                     APIApplicationServices apiApplicationServices = new APIApplicationServicesImpl();
                     AccessTokenInfo refreshedAccessToken = apiApplicationServices.
                             generateAccessTokenFromRefreshToken(apiApplicationInfo.getRefresh_token(),
                                     apiApplicationInfo.getClientId(), apiApplicationInfo.getClientSecret());
                     ApiApplicationInfo refreshedApiApplicationInfo = returnApplicationInfo(apiApplicationInfo, refreshedAccessToken);
                     //TODO: max attempt count
-                return createSubscriptions(refreshedApiApplicationInfo, subscriptions);
+                    return createSubscriptions(refreshedApiApplicationInfo, null, subscriptions);
+                } else {
+                    String msg = "Invalid or null access token";
+                    log.error(msg);
+                    throw new BadRequestException(msg);
+                }
             } else if (HttpStatus.SC_BAD_REQUEST == response.code()) {
                 String msg = "Bad Request, Invalid request body";
                 log.error(msg);
@@ -401,15 +494,16 @@ public class ConsumerRESTAPIServicesImpl implements ConsumerRESTAPIServices {
     }
 
     @Override
-    public ApplicationKey generateApplicationKeys(ApiApplicationInfo apiApplicationInfo, Application application, KeyManager keyManager)
+    public ApplicationKey generateApplicationKeys(ApiApplicationInfo apiApplicationInfo, String accessToken, String applicationId,
+                                                  String keyManager, String validityTime, String keyType)
             throws APIServicesException, BadRequestException, UnexpectedResponseException {
 
-        String getAllScopesUrl = endPointPrefix + Constants.APPLICATIONS_API + Constants.SLASH +
-                application.getApplicationId() + "/generate-keys";
+        String generateApplicationKeysUrl = endPointPrefix + Constants.APPLICATIONS_API + Constants.SLASH +
+                applicationId + "/generate-keys";
 
         String keyInfo = "{\n" +
-                "  \"keyType\": \"PRODUCTION\",\n" +
-                "  \"keyManager\": \""+ keyManager.getName() +"\",\n" +
+                "  \"keyType\": \"" + keyType + "\",\n" +
+                "  \"keyManager\": \"" + keyManager + "\",\n" +
                 "  \"grantTypesToBeSupported\": [\n" +
                 "    \"password\",\n" +
                 "    \"client_credentials\"\n" +
@@ -419,30 +513,42 @@ public class ConsumerRESTAPIServicesImpl implements ConsumerRESTAPIServices {
                 "    \"am_application_scope\",\n" +
                 "    \"default\"\n" +
                 "  ],\n" +
-                "  \"validityTime\": 3600,\n" +
+                "  \"validityTime\": " + validityTime + ",\n" +
                 "  \"additionalProperties\": {}\n" +
                 "}";
 
         RequestBody requestBody = RequestBody.create(JSON, keyInfo);
-        Request request = new Request.Builder()
-                .url(getAllScopesUrl)
-                .addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
-                        + apiApplicationInfo.getAccess_token())
-                .post(requestBody)
-                .build();
+
+        Request.Builder builder = new Request.Builder();
+        builder.url(generateApplicationKeysUrl);
+        if (!(apiApplicationInfo == null) && accessToken == null) {
+            builder.addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
+                    + apiApplicationInfo.getAccess_token());
+        } else {
+            builder.addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
+                    + accessToken);
+        }
+        builder.post(requestBody);
+        Request request = builder.build();
 
         try {
             Response response = client.newCall(request).execute();
             if (HttpStatus.SC_OK == response.code()) {
                 return gson.fromJson(response.body().string(), ApplicationKey.class);
             } else if (HttpStatus.SC_UNAUTHORIZED == response.code()) {
+                if (!(apiApplicationInfo == null) && accessToken == null) {
                     APIApplicationServices apiApplicationServices = new APIApplicationServicesImpl();
                     AccessTokenInfo refreshedAccessToken = apiApplicationServices.
                             generateAccessTokenFromRefreshToken(apiApplicationInfo.getRefresh_token(),
                                     apiApplicationInfo.getClientId(), apiApplicationInfo.getClientSecret());
                     ApiApplicationInfo refreshedApiApplicationKey = returnApplicationInfo(apiApplicationInfo, refreshedAccessToken);
                     //TODO: max attempt count
-                return generateApplicationKeys(refreshedApiApplicationKey, application, keyManager);
+                    return generateApplicationKeys(refreshedApiApplicationKey, null, applicationId, keyManager, validityTime, keyType);
+                } else {
+                    String msg = "Invalid or null access token";
+                    log.error(msg);
+                    throw new BadRequestException(msg);
+                }
             } else if (HttpStatus.SC_BAD_REQUEST == response.code()) {
                 String msg = "Bad Request, Invalid request body";
                 log.error(msg);
@@ -459,30 +565,41 @@ public class ConsumerRESTAPIServicesImpl implements ConsumerRESTAPIServices {
     }
 
     @Override
-    public ApplicationKey getKeyDetails(ApiApplicationInfo apiApplicationInfo, String applicationId, String keyMapId)
+    public ApplicationKey getKeyDetails(ApiApplicationInfo apiApplicationInfo, String accessToken, String applicationId, String keyMapId)
             throws APIServicesException, BadRequestException, UnexpectedResponseException {
 
         String getKeyDetails = endPointPrefix + Constants.APPLICATIONS_API + Constants.SLASH + applicationId + "/oauth-keys/" + keyMapId;
 
-        Request request = new Request.Builder()
-                .url(getKeyDetails)
-                .addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
-                        + apiApplicationInfo.getAccess_token())
-                .get()
-                .build();
+        Request.Builder builder = new Request.Builder();
+        builder.url(getKeyDetails);
+        if (!(apiApplicationInfo == null) && accessToken == null) {
+            builder.addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
+                    + apiApplicationInfo.getAccess_token());
+        } else {
+            builder.addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
+                    + accessToken);
+        }
+        builder.get();
+        Request request = builder.build();
 
         try {
             Response response = client.newCall(request).execute();
             if (HttpStatus.SC_OK == response.code()) {
                 return gson.fromJson(response.body().string(), ApplicationKey.class);
             } else if (HttpStatus.SC_UNAUTHORIZED == response.code()) {
+                if (!(apiApplicationInfo == null) && accessToken == null) {
                     APIApplicationServices apiApplicationServices = new APIApplicationServicesImpl();
                     AccessTokenInfo refreshedAccessToken = apiApplicationServices.
                             generateAccessTokenFromRefreshToken(apiApplicationInfo.getRefresh_token(),
                                     apiApplicationInfo.getClientId(), apiApplicationInfo.getClientSecret());
                     ApiApplicationInfo refreshedApiApplicationKey = returnApplicationInfo(apiApplicationInfo, refreshedAccessToken);
                     //TODO: max attempt count
-                return getKeyDetails(refreshedApiApplicationKey, applicationId, keyMapId);
+                    return getKeyDetails(refreshedApiApplicationKey, null, applicationId, keyMapId);
+                } else {
+                    String msg = "Invalid or null access token";
+                    log.error(msg);
+                    throw new BadRequestException(msg);
+                }
             } else if (HttpStatus.SC_BAD_REQUEST == response.code()) {
                 String msg = "Bad Request, Invalid request";
                 log.error(msg);
@@ -499,16 +616,22 @@ public class ConsumerRESTAPIServicesImpl implements ConsumerRESTAPIServices {
     }
 
     @Override
-    public KeyManager[] getAllKeyManagers(ApiApplicationInfo apiApplicationInfo)
+    public KeyManager[] getAllKeyManagers(ApiApplicationInfo apiApplicationInfo, String accessToken)
             throws APIServicesException, BadRequestException, UnexpectedResponseException {
 
         String getAllKeyManagersUrl = endPointPrefix + Constants.KEY_MANAGERS_API;
-        Request request = new Request.Builder()
-                .url(getAllKeyManagersUrl)
-                .addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
-                        + apiApplicationInfo.getAccess_token())
-                .get()
-                .build();
+
+        Request.Builder builder = new Request.Builder();
+        builder.url(getAllKeyManagersUrl);
+        if (!(apiApplicationInfo == null) && accessToken == null) {
+            builder.addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
+                    + apiApplicationInfo.getAccess_token());
+        } else {
+            builder.addHeader(Constants.AUTHORIZATION_HEADER_NAME, Constants.AUTHORIZATION_HEADER_PREFIX_BEARER
+                    + accessToken);
+        }
+        builder.get();
+        Request request = builder.build();
 
         try {
             Response response = client.newCall(request).execute();
@@ -516,13 +639,19 @@ public class ConsumerRESTAPIServicesImpl implements ConsumerRESTAPIServices {
                 JSONArray keyManagerList = (JSONArray) new JSONObject(response.body().string()).get("list");
                 return gson.fromJson(keyManagerList.toString(), KeyManager[].class);
             } else if (HttpStatus.SC_UNAUTHORIZED == response.code()) {
+                if (!(apiApplicationInfo == null) && accessToken == null) {
                     APIApplicationServices apiApplicationServices = new APIApplicationServicesImpl();
                     AccessTokenInfo refreshedAccessToken = apiApplicationServices.
                             generateAccessTokenFromRefreshToken(apiApplicationInfo.getRefresh_token(),
                                     apiApplicationInfo.getClientId(), apiApplicationInfo.getClientSecret());
                     ApiApplicationInfo refreshedApiApplicationInfo = returnApplicationInfo(apiApplicationInfo, refreshedAccessToken);
                     //TODO: max attempt count
-                return getAllKeyManagers(refreshedApiApplicationInfo);
+                    return getAllKeyManagers(refreshedApiApplicationInfo, null);
+                } else {
+                    String msg = "Invalid or null access token";
+                    log.error(msg);
+                    throw new BadRequestException(msg);
+                }
             } else if (HttpStatus.SC_BAD_REQUEST == response.code()) {
                 String msg = "Bad Request, Invalid request";
                 log.error(msg);

components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/impl/DeviceManagementServiceImpl.java

@@ -19,6 +19,10 @@
 package io.entgra.device.mgt.core.device.mgt.api.jaxrs.service.impl;
 
 import com.google.gson.Gson;
+import io.entgra.device.mgt.core.apimgt.application.extension.APIManagementProviderService;
+import io.entgra.device.mgt.core.apimgt.application.extension.APIManagementProviderServiceImpl;
+import io.entgra.device.mgt.core.apimgt.application.extension.dto.ApiApplicationKey;
+import io.entgra.device.mgt.core.apimgt.application.extension.exception.APIManagerException;
 import io.entgra.device.mgt.core.apimgt.keymgt.extension.DCRResponse;
 import io.entgra.device.mgt.core.apimgt.keymgt.extension.TokenRequest;
 import io.entgra.device.mgt.core.apimgt.keymgt.extension.TokenResponse;
@@ -825,6 +829,13 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
             deviceConfig.setClientId(dcrResponse.getClientId());
             deviceConfig.setClientSecret(dcrResponse.getClientSecret());
 
+            APIManagementProviderService apiManagementProviderService = new APIManagementProviderServiceImpl();
+            ApiApplicationKey apiApplicationKey = apiManagementProviderService.generateAndRetrieveApplicationKeys(applicationName,
+                    new String[] {"device_management"}, null, username, false, String.valueOf(validityTime),  null);
+
+            deviceConfig.setClientId(apiApplicationKey.getConsumerKey());
+            deviceConfig.setClientSecret(apiApplicationKey.getConsumerSecret());
+
             StringBuilder scopes = new StringBuilder("device:" + type.replace(" ", "") + ":" + id);
             for (String topic : mqttEventTopicStructure) {
                 if (topic.contains("${deviceId}")) {
@@ -871,6 +882,9 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
             log.error(msg, e);
             return Response.serverError().entity(
                     new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build();
+        } catch (APIManagerException e) {
+            String msg = "Error while calling rest Call for application key generation";
+            log.error(msg, e);
         }
         return Response.status(Response.Status.OK).entity(deviceConfig).build();