Enable API Resources APIs for organization level

wso2 · Nov 18, 2024 · 6b9c81d · 6b9c81d
1 parent b6ef275
commit 6b9c81d
Show file tree

Hide file tree

Showing 10 changed files with 705 additions and 204 deletions.
diff --git a/...va/org/wso2/carbon/identity/api/resource/mgt/constant/APIResourceManagementConstants.java b/...va/org/wso2/carbon/identity/api/resource/mgt/constant/APIResourceManagementConstants.java
@@ -142,7 +142,16 @@ public enum ErrorMessages {
                 "properties.", "Error while adding API resource properties to the database."),
         ERROR_CODE_ERROR_WHILE_UPDATING_SCOPE_METADATA("65015", "Error while updating scope metadata.",
                 "Error while updating scope metadata in the database."),
-        ;
+        ERROR_CODE_ERROR_WHILE_RESOLVING_ORGANIZATION_FOR_TENANT("65016", "Error while resolving organization",
+                "Error while resolving organization for tenant domain : %s"),
+        ERROR_CODE_ADDING_API_RESOURCE_NOT_SUPPORTED_FOR_ORGANIZATIONS("65017", "Unable to add API resources",
+                "Adding API resource is not supported for organizations."),
+        ERROR_CODE_DELETING_API_RESOURCE_NOT_SUPPORTED_FOR_ORGANIZATIONS("65018", "Unable to delete API resources",
+                "Deleting API resource is not supported for organizations."),
+        ERROR_CODE_ADDING_SCOPES_NOT_SUPPORTED_FOR_ORGANIZATIONS("65019", "Unable to add scopes",
+                "Adding scope is not supported for organizations."),
+        ERROR_CODE_DELETING_SCOPES_NOT_SUPPORTED_FOR_ORGANIZATIONS("65020", "Unable to add scopes",
+                "Deleting scope is not supported for organizations.");
 
         private final String code;
         private final String message;

diff --git a/...ce.mgt/src/main/java/org/wso2/carbon/identity/api/resource/mgt/constant/SQLConstants.java b/...ce.mgt/src/main/java/org/wso2/carbon/identity/api/resource/mgt/constant/SQLConstants.java
@@ -65,10 +65,19 @@ public class SQLConstants {
             "DESCRIPTION, TENANT_ID, TYPE, REQUIRES_AUTHORIZATION FROM API_RESOURCE WHERE ";
     public static final String GET_API_RESOURCES_TAIL =
             " (TENANT_ID = %d OR TENANT_ID IS NULL) ORDER BY CURSOR_KEY %s LIMIT %d";
+    public static final String GET_API_RESOURCES_TAIL_FOR_ORGANIZATIONS =
+            " (TENANT_ID = %d OR TENANT_ID IS NULL) AND TYPE NOT IN ('TENANT', 'SYSTEM', 'CONSOLE_FEATURE') " +
+                    "ORDER BY CURSOR_KEY %s LIMIT %d";
     public static final String GET_API_RESOURCES_TAIL_MSSQL =
             " (TENANT_ID = %d OR TENANT_ID IS NULL) ORDER BY CURSOR_KEY %s";
+    public static final String GET_API_RESOURCES_TAIL_FOR_ORGANIZATIONS_MSSQL =
+            " (TENANT_ID = %d OR TENANT_ID IS NULL) AND TYPE NOT IN ('TENANT', 'SYSTEM', 'CONSOLE_FEATURE') ORDER " +
+                    "BY CURSOR_KEY %s";
     public static final String GET_API_RESOURCES_TAIL_ORACLE =
             " (TENANT_ID = %d OR TENANT_ID IS NULL) ORDER BY CURSOR_KEY %s FETCH FIRST %d ROWS ONLY";
+    public static final String GET_API_RESOURCES_TAIL_FOR_ORGANIZATIONS_ORACLE =
+            " (TENANT_ID = %d OR TENANT_ID IS NULL) AND TYPE NOT IN ('TENANT', 'SYSTEM', 'CONSOLE_FEATURE') " +
+                    "ORDER BY CURSOR_KEY %s FETCH FIRST %d ROWS ONLY";
     public static final String GET_API_RESOURCES_WITH_PROPERTIES_SELECTION = "SELECT" +
             " AR.ID AS API_RESOURCE_ID," +
             " AR.CURSOR_KEY AS CURSOR_KEY," +
@@ -99,6 +108,8 @@ public class SQLConstants {
             " LEFT JOIN API_RESOURCE_PROPERTY ARP ON AR.ID = ARP.API_ID ORDER BY CURSOR_KEY %s";
     public static final String GET_API_RESOURCES_COUNT = "SELECT COUNT(DISTINCT(ID)) FROM API_RESOURCE WHERE ";
     public static final String GET_API_RESOURCES_COUNT_TAIL = " (TENANT_ID = ? OR TENANT_ID IS NULL)";
+    public static final String GET_API_RESOURCES_COUNT_FOR_ORGANIZATIONS_TAIL =
+            " (TENANT_ID = ? OR TENANT_ID IS NULL) AND TYPE NOT IN ('TENANT', 'SYSTEM', 'CONSOLE_FEATURE')";
     public static final String GET_API_RESOURCE_BY_ID = "SELECT" +
             " AR.ID AS API_RESOURCE_ID," +
             " AR.NAME AS API_RESOURCE_NAME," +
@@ -113,6 +124,20 @@ public class SQLConstants {
             " S.DESCRIPTION AS SCOPE_DESCRIPTION" +
             " FROM API_RESOURCE AR LEFT JOIN SCOPE S ON AR.ID = S.API_ID WHERE AR.ID = ? AND (AR.TENANT_ID = ?" +
             " OR AR.TENANT_ID IS NULL)";
+    public static final String GET_API_RESOURCE_BY_ID_FOR_ORGANIZATIONS = "SELECT" +
+            " AR.ID AS API_RESOURCE_ID," +
+            " AR.NAME AS API_RESOURCE_NAME," +
+            " AR.IDENTIFIER AS API_RESOURCE_IDENTIFIER," +
+            " AR.DESCRIPTION AS API_RESOURCE_DESCRIPTION," +
+            " AR.TENANT_ID AS API_RESOURCE_TENANT_ID," +
+            " AR.TYPE AS API_RESOURCE_TYPE," +
+            " AR.REQUIRES_AUTHORIZATION AS REQUIRES_AUTHORIZATION," +
+            " S.ID AS SCOPE_ID," +
+            " S.NAME AS SCOPE_QUALIFIED_NAME," +
+            " S.DISPLAY_NAME AS SCOPE_DISPLAY_NAME," +
+            " S.DESCRIPTION AS SCOPE_DESCRIPTION" +
+            " FROM API_RESOURCE AR LEFT JOIN SCOPE S ON AR.ID = S.API_ID WHERE AR.ID = ? AND (AR.TENANT_ID = ?" +
+            " OR AR.TENANT_ID IS NULL) AND AR.TYPE NOT IN ('TENANT', 'SYSTEM', 'CONSOLE_FEATURE')";
     public static final String GET_SCOPES_BY_API_ID = "SELECT ID, NAME, DISPLAY_NAME, DESCRIPTION, API_ID, TENANT_ID "
             + "FROM SCOPE WHERE API_ID = ? AND (TENANT_ID = ? OR TENANT_ID IS NULL)";
     public static final String GET_API_RESOURCE_BY_IDENTIFIER = "SELECT" +
@@ -151,6 +176,12 @@ public class SQLConstants {
     public static final String GET_SCOPES_BY_TENANT_ID = "SELECT ID, NAME, DISPLAY_NAME, DESCRIPTION, API_ID, " +
             "TENANT_ID FROM SCOPE WHERE ";
     public static final String GET_SCOPES_BY_TENANT_ID_TAIL = " (TENANT_ID = ? OR TENANT_ID IS NULL)";
+    public static final String GET_SCOPES_BY_TENANT_ID_FOR_ORGANIZATIONS =
+            "SELECT SC.ID, SC.NAME, SC.DISPLAY_NAME, SC.DESCRIPTION, SC.API_ID, SC.TENANT_ID FROM SCOPE SC" +
+                    " JOIN API_RESOURCE AR ON AR.ID = SC.API_ID" +
+                    " WHERE ";
+    public static final String GET_SCOPES_BY_TENANT_ID_FOR_ORGANIZATIONS_TAIL = "(AR.TENANT_ID = ? OR AR.TENANT_ID " +
+            "IS NULL) AND TYPE NOT IN ('TENANT', 'SYSTEM', 'CONSOLE_FEATURE')";
     public static final String DELETE_SCOPE_BY_NAME = "DELETE FROM SCOPE WHERE NAME = ? AND TENANT_ID = ?";
     public static final String GET_API_RESOURCE_PROPERTIES_BY_API_ID = "SELECT ID, NAME, VALUE FROM " +
             "API_RESOURCE_PROPERTY WHERE API_ID = ?";