Merge pull request #12590 from nisan-abeywickrama/admin-search

Add support to search applications by owner or name
wso2 · Oct 3, 2024 · 9c560ad · 9c560ad
2 parents 1e7da75 + b472c16
commit 9c560ad
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 14 deletions.
diff --git a/...pimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/constants/SQLConstantOracle.java b/...pimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/constants/SQLConstantOracle.java
@@ -270,7 +270,7 @@ public class SQLConstantOracle extends SQLConstants{
                     "    SUB.TENANT_ID = ? "+
                     " And "+
                     "    ( SUB.CREATED_BY like ?"+
-                    " AND APP.NAME like ?"+
+                    " OR APP.NAME like ?"+
                     " )) a WHERE r BETWEEN ?+1 AND ?"+
                     " ) "+
                     " ORDER BY $1 $2 ";

diff --git a/...t.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/constants/SQLConstantPostgreSQL.java b/...t.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/constants/SQLConstantPostgreSQL.java
@@ -252,7 +252,7 @@ public class SQLConstantPostgreSQL extends SQLConstants{
                     "    SUB.TENANT_ID = ? "+
                     " And "+
                     "    ( SUB.CREATED_BY like ?"+
-                    " AND APP.NAME like ?"+
+                    " OR APP.NAME like ?"+
                     " ) ORDER BY $1 $2 " +
                     " offset ? limit  ? ";
 

diff --git a/....apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/constants/SQLConstantsDB2.java b/....apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/constants/SQLConstantsDB2.java
@@ -260,7 +260,7 @@ public class SQLConstantsDB2 extends SQLConstants{
                     "    SUB.TENANT_ID = ? "+
                     " And "+
                     "    ( SUB.CREATED_BY like ?"+
-                    " AND APP.NAME like ?"+
+                    " OR APP.NAME like ?"+
                     " )) a ) " +
                     " ORDER BY $1 $2 limit ? , ? ";
 

diff --git a/...mgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/constants/SQLConstantsH2MySQL.java b/...mgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/constants/SQLConstantsH2MySQL.java
@@ -249,7 +249,7 @@ public class SQLConstantsH2MySQL extends SQLConstants{
                     "    SUB.TENANT_ID = ? "+
                     " And "+
                     "   ( SUB.CREATED_BY like ?"+
-                    " AND APP.NAME like ?"+
+                    " OR APP.NAME like ?"+
                     " ) ORDER BY $1 $2 " +
                     " limit ? , ? ";
 

diff --git a/...pimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/constants/SQLConstantsMSSQL.java b/...pimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/dao/constants/SQLConstantsMSSQL.java
@@ -273,7 +273,7 @@ public class SQLConstantsMSSQL extends SQLConstants{
                     "    SUB.TENANT_ID = ?"+
                     " And "+
                     "    ( SUB.CREATED_BY like ?"+
-                    " AND APP.NAME like ?"+
+                    " OR APP.NAME like ?"+
                     " )) a " +
                     " )" +
                     " ORDER BY $1 $2 OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";

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);