Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature

components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/src/main/java/org/wso2/carbon/apimgt/application/extension/APIManagementProviderServiceImpl.java

@@ -75,16 +75,9 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe
                             "Api application creation failed for " + applicationName + " to the user " + username);
                 }
 
-                APIKey retrievedApiApplicationKey = null;
+                OAuthApplicationInfo oAuthApp = application.getOAuthApp(keyType);
-                for (APIKey apiKey : application.getKeys()) {
+                if (oAuthApp != null) {
-                    String applicationKeyType = apiKey.getType();
+                    if (oAuthApp.getClientId().equals(clientId)) {
-                    if (applicationKeyType != null && applicationKeyType.equals(keyType)) {
-                        retrievedApiApplicationKey = apiKey;
-                        break;
-                    }
-                }
-                if (retrievedApiApplicationKey != null) {
-                    if (retrievedApiApplicationKey.getConsumerKey().equals(clientId)) {
                         if (tags != null && tags.length > 0) {
                             createApplicationAndSubscribeToAPIs(applicationName, tags, username);
                         }
@@ -152,18 +145,11 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe
                         "Api application creation failed for " + apiApplicationName + " to the user " + username);
             }
 
-            APIKey retrievedApiApplicationKey = null;
+            OAuthApplicationInfo oAuthApp = application.getOAuthApp(keyType);
-            for (APIKey apiKey : application.getKeys()) {
+            if (oAuthApp != null) {
-                String applicationKeyType = apiKey.getType();
-                if (applicationKeyType != null && applicationKeyType.equals(keyType)) {
-                    retrievedApiApplicationKey = apiKey;
-                    break;
-                }
-            }
-            if (retrievedApiApplicationKey != null) {
                 ApiApplicationKey apiApplicationKey = new ApiApplicationKey();
-                apiApplicationKey.setConsumerKey(retrievedApiApplicationKey.getConsumerKey());
+                apiApplicationKey.setConsumerKey(oAuthApp.getClientId());
-                apiApplicationKey.setConsumerSecret(retrievedApiApplicationKey.getConsumerSecret());
+                apiApplicationKey.setConsumerSecret(oAuthApp.getClientSecret());
                 return apiApplicationKey;
             }
             String[] allowedDomains = new String[1];