Modify org discovery resource access control and API categorization

dewniMW · Dec 15, 2023 · b3525e2 · b3525e2
1 parent 6f67f98
commit b3525e2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 44 deletions.
diff --git a/...rg.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml b/...rg.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml
@@ -338,7 +338,7 @@
     <APIResource name="Organization Discovery API"
                  identifier="/api/server/v1/organizations/discovery"
                  requiresAuthorization="true"
-                 description="API representation of the Organization Discovery API" type="OTHER">
+                 description="API representation of the Organization Discovery API" type="TENANT_ADMIN">
         <Scopes>
             <Scope displayName="View Organization Discovery"
                    name="internal_organization_discovery_view"/>
@@ -352,14 +352,10 @@
                  identifier="/o/api/server/v1/organizations/discovery"
                  requiresAuthorization="true"
                  description="API representation of the Organization Discovery API"
-                 type="OTHER">
+                 type="ORGANIZATION_ADMIN">
         <Scopes>
             <Scope displayName="View Organization Discovery"
                    name="internal_org_organization_discovery_view"/>
-            <Scope displayName="Update Organization Discovery"
-                   name="internal_org_organization_discovery_update"/>
-            <Scope displayName="Delete Organization Discovery"
-                   name="internal_org_organization_discovery_delete"/>
         </Scopes>
     </APIResource>
     <APIResource name="Organization Management API" identifier="/api/server/v1/organizations"

diff --git a/...wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml.j2 b/...wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml.j2
@@ -347,7 +347,7 @@
     <APIResource name="Organization Discovery API"
                  identifier="/api/server/v1/organizations/discovery"
                  requiresAuthorization="true"
-                 description="API representation of the Organization Discovery API" type="OTHER">
+                 description="API representation of the Organization Discovery API" type="TENANT_ADMIN">
         <Scopes>
             <Scope displayName="View Organization Discovery"
                    name="internal_organization_discovery_view"/>
@@ -361,14 +361,10 @@
                  identifier="/o/api/server/v1/organizations/discovery"
                  requiresAuthorization="true"
                  description="API representation of the Organization Discovery API"
-                 type="OTHER">
+                 type="ORGANIZATION_ADMIN">
         <Scopes>
             <Scope displayName="View Organization Discovery"
                    name="internal_org_organization_discovery_view"/>
-            <Scope displayName="Update Organization Discovery"
-                   name="internal_org_organization_discovery_update"/>
-            <Scope displayName="Delete Organization Discovery"
-                   name="internal_org_organization_discovery_delete"/>
         </Scopes>
     </APIResource>
     <APIResource name="Organization Management API" identifier="/api/server/v1/organizations"

diff --git a/...ore/org.wso2.carbon.identity.core.server.feature/resources/resource-access-control-v2.xml b/...ore/org.wso2.carbon.identity.core.server.feature/resources/resource-access-control-v2.xml
@@ -1046,22 +1046,7 @@
     </Resource>
 
     <!-- [Organization] Organization Discovery API -->
-    <Resource context="(.*)/api/server/v1/organizations/discovery" secured="true" http-method="POST">
-        <Scopes>internal_org_organization_discovery_update</Scopes>
-    </Resource>
-    <Resource context="(.*)/api/server/v1/organizations/discovery" secured="true" http-method="GET">
-        <Scopes>internal_org_organization_discovery_view</Scopes>
-    </Resource>
-    <Resource context="(.*)/api/server/v1/organizations/(.*)/discovery" secured="true" http-method="GET">
-        <Scopes>internal_org_organization_discovery_view</Scopes>
-    </Resource>
-    <Resource context="(.*)/api/server/v1/organizations/(.*)/discovery" secured="true" http-method="PUT">
-        <Scopes>internal_org_organization_discovery_update</Scopes>
-    </Resource>
-    <Resource context="(.*)/api/server/v1/organizations/(.*)/discovery" secured="true" http-method="DELETE">
-        <Scopes>internal_org_organization_discovery_delete</Scopes>
-    </Resource>
-    <Resource context="(.*)/api/server/v1/organizations/check-discovery" secured="true" http-method="POST">
+    <Resource context="(.*)/o/api/server/v1/organizations/check-discovery" secured="true" http-method="POST">
         <Scopes>internal_org_organization_discovery_view</Scopes>
     </Resource>
 

diff --git a/.../org.wso2.carbon.identity.core.server.feature/resources/resource-access-control-v2.xml.j2 b/.../org.wso2.carbon.identity.core.server.feature/resources/resource-access-control-v2.xml.j2
@@ -1073,22 +1073,7 @@
         </Resource>
 
         <!-- [Organization] Organization Discovery API -->
-        <Resource context="(.*)/api/server/v1/organizations/discovery" secured="true" http-method="POST">
-            <Scopes>internal_org_organization_discovery_update</Scopes>
-        </Resource>
-        <Resource context="(.*)/api/server/v1/organizations/discovery" secured="true" http-method="GET">
-            <Scopes>internal_org_organization_discovery_view</Scopes>
-        </Resource>
-        <Resource context="(.*)/api/server/v1/organizations/(.*)/discovery" secured="true" http-method="GET">
-            <Scopes>internal_org_organization_discovery_view</Scopes>
-        </Resource>
-        <Resource context="(.*)/api/server/v1/organizations/(.*)/discovery" secured="true" http-method="PUT">
-            <Scopes>internal_org_organization_discovery_update</Scopes>
-        </Resource>
-        <Resource context="(.*)/api/server/v1/organizations/(.*)/discovery" secured="true" http-method="DELETE">
-            <Scopes>internal_org_organization_discovery_delete</Scopes>
-        </Resource>
-        <Resource context="(.*)/api/server/v1/organizations/check-discovery" secured="true" http-method="POST">
+        <Resource context="(.*)/o/api/server/v1/organizations/check-discovery" secured="true" http-method="POST">
             <Scopes>internal_org_organization_discovery_view</Scopes>
         </Resource>