community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

IOTS-340: Fixing consumer key and consumer secret is null on api-mgt-ext

Browse Source
This commit is contained in:
Rasika Perera 2016-12-20 13:03:19 +05:30
parent 84918f58c7
commit a633547d19
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,16 +75,9 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe
"Api application creation failed for " + applicationName + " to the user " + username); "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) { if (tags != null && tags.length > 0) {
createApplicationAndSubscribeToAPIs(applicationName, tags, username); createApplicationAndSubscribeToAPIs(applicationName, tags, username);
} }
@ -152,18 +145,11 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe
"Api application creation failed for " + apiApplicationName + " to the user " + username); "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 apiApplicationKey = new ApiApplicationKey();
apiApplicationKey.setConsumerKey(retrievedApiApplicationKey.getConsumerKey()); apiApplicationKey.setConsumerKey(oAuthApp.getClientId());
apiApplicationKey.setConsumerSecret(retrievedApiApplicationKey.getConsumerSecret()); apiApplicationKey.setConsumerSecret(oAuthApp.getClientSecret());
return apiApplicationKey; return apiApplicationKey;
} }
String[] allowedDomains = new String[1]; String[] allowedDomains = new String[1];