Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Integration test for the fix problems when changing the app owner of an application #13197

Merged
merged 4 commits into from
Feb 1, 2024
Merged

Integration test for the fix problems when changing the app owner of an application #13197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
04517e2
Initial commit
thisaltennakoon Apr 5, 2023
fe668e5
Update RestAPIAdminImpl.java
thisaltennakoon Jan 11, 2024
a1c58bd
Update RestAPIAdminImpl.java
thisaltennakoon Jan 11, 2024
90744c0
Merge branch 'wso2:master' into Integration-test-for-the-fix-problems…
thisaltennakoon Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions ...egration-test-utils/src/main/java/org/wso2/am/integration/test/impl/RestAPIAdminImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
import org.wso2.am.integration.test.HttpResponse;

import java.io.File;
import java.util.Arrays;
import java.util.Base64;

/**
* This util class performs the actions related to APIDTOobjects.
Expand Down Expand Up @@ -698,6 +700,40 @@ public ApiResponse<Void> changeApplicationOwner(String newOwner, String applicat
return applicationApi.applicationsApplicationIdChangeOwnerPostWithHttpInfo(newOwner, applicationId);
}

/**
* This method is used to retrieve scopes for a particular user.
*
* @param scopeName Scope name.
* @param username Username of the user.
* @return ScopeSettingsDTO returned by API call.
* @throws ApiException if an error occurs while retrieving the scopes of a particular user.
*/
public ScopeSettingsDTO retrieveScopesForParticularUser(String scopeName, String username) throws ApiException {
return systemScopesApi.systemScopesScopeNameGet(new String(Base64.getEncoder().encode(scopeName.getBytes())), username);
}

/**
* This method is used to add a new role alias mapping for system scope roles.
*
* @param count The number of role aliases.
* @param role Name of the role.
* @param aliases List of aliases.
* @return RoleAliasListDTO returned by API call.
* @throws ApiException if an error occurs while adding role aliases mappings for system scope roles.
*/
public RoleAliasListDTO addRoleAliasMappingForSystemScopeRoles(int count, String role, String[] aliases) throws ApiException {

RoleAliasDTO roleAliasDTO = new RoleAliasDTO();
roleAliasDTO.setRole(role);
roleAliasDTO.setAliases(Arrays.asList(aliases));

RoleAliasListDTO roleAliasListDTO = new RoleAliasListDTO();
roleAliasListDTO.setCount(count);
roleAliasListDTO.setList(Arrays.asList(roleAliasDTO));

return systemScopesApi.systemScopesRoleAliasesPut(roleAliasListDTO);
}

public HttpResponse getWorkflowByExternalWorkflowReference(String externalWorkflowRef) throws ApiException {
WorkflowInfoDTO workflowInfodto = null;
HttpResponse response = null;
Expand Down
59 changes: 58 additions & 1 deletion ...rc/test/java/org/wso2/am/integration/tests/admin/OAuthApplicationOwnerUpdateTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.wso2.am.integration.clients.admin.ApiResponse;
import org.wso2.am.integration.clients.admin.api.dto.ApplicationInfoDTO;
import org.wso2.am.integration.clients.admin.api.dto.ApplicationListDTO;
import org.wso2.am.integration.clients.admin.api.dto.ScopeSettingsDTO;
import org.wso2.am.integration.clients.store.api.v1.dto.ApplicationDTO;
import org.wso2.am.integration.clients.store.api.v1.dto.ApplicationKeyGenerateRequestDTO;
import org.wso2.am.integration.test.impl.RestAPIAdminImpl;
Expand Down Expand Up @@ -73,6 +74,14 @@ public class OAuthApplicationOwnerUpdateTestCase extends APIMIntegrationBaseTest
private static final String TENANT_DOMAIN = "tenant.com";
private static final String TENANT_ADMIN_WITH_DOMAIN = TENANT_ADMIN + "@" + TENANT_DOMAIN;
private static final String TENANT_ADMIN_APP = "tenantAdminApp";
private static final String APIM_SUBSCRIBE_SCOPE = "apim:subscribe";
private static final String CUSTOM_ROLE1 = "customRole1";
private static final String CUSTOM_ROLE1_PWD = "customRole1@";
private static final String CUSTOM_ROLE2 = "customRole2";
private static final String CUSTOM_ROLE2_PWD = "customRole2@";
private static final String CUSTOM_ROLE1_ASSIGNED_USER = "customRole1AssignedUser";
private static final String CUSTOM_ROLE2_ASSIGNED_USER = "customRole2AssignedUser";
private static final String[] PERMISSIONS = {"/permission/admin/manage/api/subscribe"};

private static final String TENANT_USER1_WITH_DOMAIN = TENANT_USER1 + "@" + TENANT_DOMAIN;
private static final String TENANT_USER2_WITH_DOMAIN = TENANT_USER2 + "@" + TENANT_DOMAIN;
Expand All @@ -87,6 +96,8 @@ public class OAuthApplicationOwnerUpdateTestCase extends APIMIntegrationBaseTest
private RestAPIStoreImpl restAPIStoreClient5;
private RestAPIStoreImpl restAPIStoreClient6;
private RestAPIAdminImpl restAPIAdminClient;
private RestAPIStoreImpl restAPIStoreClientForCustomRole1AssignedUser;
private RestAPIStoreImpl restAPIStoreClientForCustomRole2AssignedUser;

private String appIdOfJohnApp;
private String appIdOfMaryApp;
Expand All @@ -95,6 +106,8 @@ public class OAuthApplicationOwnerUpdateTestCase extends APIMIntegrationBaseTest
private String appIdOfTenantUser1App;
private String appIdOfTenantUser2App;
private String appIdOfTenantUser3App;
private String appIdOftestAppCreatedByCustomRole1AssignedUser;
private String appIdOftestAppCreatedByCustomRole2AssignedUser;

@BeforeClass(alwaysRun = true)
public void setEnvironment() throws Exception {
Expand Down Expand Up @@ -191,7 +204,7 @@ public void checkSubscriberValidity() {
try {
updateOwner(appIdOfTenantUser3App, TENANT_USER4_WITH_DOMAIN, TENANT_DOMAIN);
} catch (ApiException e) {
Assert.assertEquals(e.getCode(), HttpStatus.SC_INTERNAL_SERVER_ERROR);
Assert.assertEquals(e.getCode(), HttpStatus.SC_NOT_FOUND);
}
}

Expand Down Expand Up @@ -278,6 +291,33 @@ public void testApplicationUpdateAfterOwnerChange() throws Exception {

}

@Test(groups = {"wso2.am"}, description = "Update application ownership to another user when custom user roles assigned to them")
public void updateApplicationOwnerWhenHavingCustomRoles() throws Exception {

//Add custom roles
userManagementClient.addRole(CUSTOM_ROLE1, null, PERMISSIONS);
userManagementClient.addRole(CUSTOM_ROLE2, null, PERMISSIONS);

//Add users with custom roles created above
userManagementClient.addUser(CUSTOM_ROLE1_ASSIGNED_USER, CUSTOM_ROLE1_PWD, new String[]{CUSTOM_ROLE1}, CUSTOM_ROLE1_ASSIGNED_USER);
userManagementClient.addUser(CUSTOM_ROLE2_ASSIGNED_USER, CUSTOM_ROLE2_PWD, new String[]{CUSTOM_ROLE2}, CUSTOM_ROLE2_ASSIGNED_USER);

//Add role alias mapping for system scope roles
restAPIAdminClient = new RestAPIAdminImpl(user.getUserName(), user.getPassword(), SUPER_TENANT_DOMAIN, publisherURLHttps);
restAPIAdminClient.addRoleAliasMappingForSystemScopeRoles(1, APIMIntegrationConstants.APIM_INTERNAL_ROLE.SUBSCRIBER, new String[]{CUSTOM_ROLE1, CUSTOM_ROLE2});

//Create applications
restAPIStoreClientForCustomRole1AssignedUser = new RestAPIStoreImpl(CUSTOM_ROLE1_ASSIGNED_USER, CUSTOM_ROLE1_PWD, SUPER_TENANT_DOMAIN, storeURLHttps);
appIdOftestAppCreatedByCustomRole1AssignedUser = restAPIStoreClientForCustomRole1AssignedUser.addApplication("testAppCreatedByCustomRole1AssignedUser",
APIMIntegrationConstants.APPLICATION_TIER.UNLIMITED, "", "App of user customRole1AssignedUser").getApplicationId();
restAPIStoreClientForCustomRole2AssignedUser = new RestAPIStoreImpl(CUSTOM_ROLE2_ASSIGNED_USER, CUSTOM_ROLE2_PWD, SUPER_TENANT_DOMAIN, storeURLHttps);
appIdOftestAppCreatedByCustomRole2AssignedUser = restAPIStoreClientForCustomRole2AssignedUser.addApplication("testAppCreatedByCustomRole2AssignedUser",
APIMIntegrationConstants.APPLICATION_TIER.UNLIMITED, "", "App of user customRole2AssignedUser").getApplicationId();

// Change application owner of testAppCreatedByCustomRole1AssignedUser from CUSTOM_ROLE1_ASSIGNED_USER to CUSTOM_ROLE2_ASSIGNED_USER
updateOwner(appIdOftestAppCreatedByCustomRole1AssignedUser, CUSTOM_ROLE2_ASSIGNED_USER, SUPER_TENANT_DOMAIN);
}

@AfterClass(alwaysRun = true)
public void destroy() throws Exception {

Expand All @@ -291,12 +331,23 @@ public void destroy() throws Exception {
if (userManagementClient != null) {
userManagementClient.deleteUser(USER_JOHN);
userManagementClient.deleteUser(USER_MARY);
userManagementClient.deleteUser(CUSTOM_ROLE1_ASSIGNED_USER);
userManagementClient.deleteUser(CUSTOM_ROLE2_ASSIGNED_USER);

userManagementClient.deleteRole(CUSTOM_ROLE1);
userManagementClient.deleteRole(CUSTOM_ROLE2);
}
if (userManagementClient1 != null) {
userManagementClient1.deleteUser(TENANT_USER1);
userManagementClient1.deleteUser(TENANT_USER2);
userManagementClient1.deleteUser(TENANT_USER3);
}
if (restAPIStoreClientForCustomRole1AssignedUser != null && appIdOftestAppCreatedByCustomRole1AssignedUser != null) {
restAPIStoreClientForCustomRole1AssignedUser.deleteApplication(appIdOftestAppCreatedByCustomRole1AssignedUser);
}
if (restAPIStoreClientForCustomRole2AssignedUser != null && appIdOftestAppCreatedByCustomRole2AssignedUser != null) {
restAPIStoreClientForCustomRole2AssignedUser.deleteApplication(appIdOftestAppCreatedByCustomRole2AssignedUser);
}
tenantManagementServiceClient.deleteTenant(TENANT_DOMAIN);
}

Expand All @@ -308,6 +359,12 @@ public void destroy() throws Exception {
* @param appTenantDomain Tenant domain of the application
*/
private void updateOwner(String applicationId, String newOwner, String appTenantDomain) throws ApiException {


// Verify whether the new owner has the scope "apim:subscribe"
ScopeSettingsDTO scopeSettingsDTO = restAPIAdminClient.retrieveScopesForParticularUser(APIM_SUBSCRIBE_SCOPE, newOwner);
Assert.assertEquals(scopeSettingsDTO.getName(), APIM_SUBSCRIBE_SCOPE);

//Update owner of the application
ApiResponse<Void> changeOwnerResponse = restAPIAdminClient.changeApplicationOwner(newOwner, applicationId);
Assert.assertEquals(changeOwnerResponse.getStatusCode(), HttpStatus.SC_OK);
Expand Down
Loading