Update search functionality to filter applications based on the logge…

…d-in user's tenant
wso2 · Oct 3, 2024 · b472c16 · b472c16
1 parent 8f31338
commit b472c16
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/...c/main/java/org/wso2/carbon/apimgt/rest/api/admin/v1/impl/ApplicationsApiServiceImpl.java b/...c/main/java/org/wso2/carbon/apimgt/rest/api/admin/v1/impl/ApplicationsApiServiceImpl.java
@@ -122,16 +122,8 @@ public Response applicationsGet(String user, Integer limit, Integer offset, Stri
             boolean migrationMode = Boolean.getBoolean(RestApiConstants.MIGRATION_MODE);
             int allApplicationsCount = 0;
             if (!migrationMode) { // normal non-migration flow
-                if (!MultitenantUtils.getTenantDomain(user).equals(RestApiCommonUtil.getLoggedInUserTenantDomain())) {
-                    String errorMsg = "User " + user + " is not available for the current tenant domain";
-                    log.error(errorMsg);
-                    return Response.status(Response.Status.FORBIDDEN).entity(errorMsg).build();
-                }
-                APIConsumer apiConsumer = APIManagerFactory.getInstance().getAPIConsumer(user);
-
-                // If no user is passed, get the applications for the tenant (not only for the user)
                 APIAdmin apiAdmin = new APIAdminImpl();
-                int tenantId = APIUtil.getTenantId(user);
+                int tenantId = APIUtil.getTenantId(RestApiCommonUtil.getLoggedInUsername());
                 allMatchedApps = apiAdmin.getApplicationsWithPagination(user, givenUser, tenantId, limit, offset,
                         applicationName, sortBy, sortOrder);
                 allApplicationsCount = apiAdmin.getApplicationsCount(tenantId, givenUser, applicationName);