Skip to content

Commit 63e4ebf

Browse files
Fix unneccessary env filtering on devportal side
1 parent 2d73391 commit 63e4ebf

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIProviderImpl.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -5832,12 +5832,11 @@ public API getLightweightAPIByUUID(String uuid, String organization) throws APIM
58325832
checkAccessControlPermission(userNameWithoutChange, api.getAccessControl(),
58335833
api.getAccessControlRoles());
58345834
// populate relevant external info environment
5835-
List<Environment> environments = null;
5835+
String environmentString = null;
58365836
if (api.getEnvironments() != null) {
5837-
environments = APIUtil.getEnvironmentsOfAPI(api);
5837+
environmentString = String.join(",", api.getEnvironments());
58385838
}
5839-
api.setEnvironments(APIUtil.extractEnvironmentsForAPI(environments, organization,
5840-
userNameWithoutChange));
5839+
api.setEnvironments(APIUtil.extractEnvironmentsForAPI(environmentString, organization));
58415840
//CORS . if null is returned, set default config from the configuration
58425841
if (api.getCorsConfiguration() == null) {
58435842
api.setCorsConfiguration(APIUtil.getDefaultCorsConfiguration());

components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/AbstractAPIManager.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1211,11 +1211,11 @@ protected void populateAPIInformation(String uuid, String organization, API api)
12111211
Organization org = new Organization(organization);
12121212
api.setOrganization(organization);
12131213
// environment
1214-
List<Environment> environments = null;
1214+
String environmentString = null;
12151215
if (api.getEnvironments() != null) {
1216-
environments = APIUtil.getEnvironmentsOfAPI(api);
1216+
environmentString = String.join(",", api.getEnvironments());
12171217
}
1218-
api.setEnvironments(APIUtil.extractEnvironmentsForAPI(environments, organization, username));
1218+
api.setEnvironments(APIUtil.extractEnvironmentsForAPI(environmentString, organization));
12191219
// workflow status
12201220
APIIdentifier apiId = api.getId();
12211221
WorkflowDTO workflow;

0 commit comments

Comments
 (0)