From 4e1fdd3730e8259157012fda783e68b7bc9dd244 Mon Sep 17 00:00:00 2001
From: rushannanayakkara <rushannana@gmail.com>
Date: Thu, 24 Oct 2024 18:54:13 +0530
Subject: [PATCH] Remove dual scopes from Notification template api access
 controls and refactor to placement.

---
 .../resources/resource-access-control-v2.xml  | 38 +++++++--------
 .../resource-access-control-v2.xml.j2         | 48 +++++++++----------
 2 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/resource-access-control-v2.xml b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/resource-access-control-v2.xml
index 607f8cdf3746..2f270e84cfb0 100644
--- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/resource-access-control-v2.xml
+++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/resource-access-control-v2.xml
@@ -626,25 +626,6 @@
         <Scopes>internal_claim_meta_delete</Scopes>
     </Resource>
 
-    <!-- [Organization] Email Template Management API v1/v2 -->
-    <Resource context="(.*)/o/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="GET">
-        <Scopes>internal_org_email_mgt_view</Scopes>
-    </Resource>
-
-    <!-- Email Template Management API v1/v2 -->
-    <Resource context="(.*)/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="GET">
-        <Scopes>internal_email_mgt_view</Scopes>
-    </Resource>
-    <Resource context="(.*)/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="POST">
-        <Scopes>internal_email_mgt_create</Scopes>
-    </Resource>
-    <Resource context="(.*)/api/server/v(.*)/email/template-types/(.*)" secured="true" http-method="PUT">
-        <Scopes>internal_email_mgt_update</Scopes>
-    </Resource>
-    <Resource context="(.*)/api/server/v1(.*)/email/template-types/(.*)" secured="true" http-method="DELETE">
-        <Scopes>internal_email_mgt_delete</Scopes>
-    </Resource>
-
     <!-- [Organization] Notification Template Management API -->
     <Resource context="(.*)/o/api/server/v(.*)/notification/email/template-types(.*)" secured="true" http-method="GET">
         <Scopes>internal_org_email_mgt_view,internal_org_template_mgt_view</Scopes>
@@ -682,6 +663,25 @@
         <Scopes>internal_template_mgt_delete</Scopes>
     </Resource>
 
+    <!-- [Organization] Email Template Management API v1/v2 -->
+    <Resource context="(.*)/o/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="GET">
+        <Scopes>internal_org_email_mgt_view</Scopes>
+    </Resource>
+
+    <!-- Email Template Management API v1/v2 -->
+    <Resource context="(.*)/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="GET">
+        <Scopes>internal_email_mgt_view</Scopes>
+    </Resource>
+    <Resource context="(.*)/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="POST">
+        <Scopes>internal_email_mgt_create</Scopes>
+    </Resource>
+    <Resource context="(.*)/api/server/v(.*)/email/template-types/(.*)" secured="true" http-method="PUT">
+        <Scopes>internal_email_mgt_update</Scopes>
+    </Resource>
+    <Resource context="(.*)/api/server/v1(.*)/email/template-types/(.*)" secured="true" http-method="DELETE">
+        <Scopes>internal_email_mgt_delete</Scopes>
+    </Resource>
+
     <!-- Keystore Management API -->
     <Resource context="(.*)/api/server/v1/keystores/certs/public(.*)" secured="false" http-method="GET"/>
     <Resource context="(.*)/api/server/v1/keystores/(.*)" secured="true" http-method="GET">
diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/resource-access-control-v2.xml.j2 b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/resource-access-control-v2.xml.j2
index 08998327c58c..cb127f2bd417 100644
--- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/resource-access-control-v2.xml.j2
+++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/resource-access-control-v2.xml.j2
@@ -675,28 +675,9 @@
             <Scopes>internal_claim_meta_delete</Scopes>
         </Resource>
 
-        <!-- [Organization] Email Template Management API v1/v2 -->
-        <Resource context="(.*)/o/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="GET">
-            <Scopes>internal_org_email_mgt_view</Scopes>
-        </Resource>
-
-        <!-- Email Template Management API v1/v2 -->
-        <Resource context="(.*)/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="GET">
-            <Scopes>internal_email_mgt_view</Scopes>
-        </Resource>
-        <Resource context="(.*)/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="POST">
-            <Scopes>internal_email_mgt_create</Scopes>
-        </Resource>
-        <Resource context="(.*)/api/server/v(.*)/email/template-types/(.*)" secured="true" http-method="PUT">
-            <Scopes>internal_email_mgt_update</Scopes>
-        </Resource>
-        <Resource context="(.*)/api/server/v(.*)/email/template-types/(.*)" secured="true" http-method="DELETE">
-            <Scopes>internal_email_mgt_delete</Scopes>
-        </Resource>
-
         <!-- [Organization] Notification Template Management API -->
         <Resource context="(.*)/o/api/server/v(.*)/notification/email/template-types(.*)" secured="true" http-method="GET">
-            <Scopes>internal_org_email_mgt_view,internal_org_template_mgt_view</Scopes>
+            <Scopes>internal_org_template_mgt_view</Scopes>
         </Resource>
         <Resource context="(.*)/o/api/server/v(.*)/notification/sms/template-types(.*)" secured="true" http-method="GET">
             <Scopes>internal_org_template_mgt_view</Scopes>
@@ -704,16 +685,16 @@
 
         <!-- Notification Template Management API -->
         <Resource context="(.*)/api/server/v(.*)/notification/email/template-types(.*)" secured="true" http-method="GET">
-            <Scopes>internal_email_mgt_view,internal_template_mgt_view</Scopes>
+            <Scopes>internal_template_mgt_view</Scopes>
         </Resource>
         <Resource context="(.*)/api/server/v(.*)/notification/email/template-types(.*)" secured="true" http-method="POST">
-            <Scopes>internal_email_mgt_create,internal_template_mgt_create</Scopes>
+            <Scopes>internal_template_mgt_create</Scopes>
         </Resource>
         <Resource context="(.*)/api/server/v(.*)/notification/email/template-types/(.*)" secured="true" http-method="PUT">
-            <Scopes>internal_email_mgt_update,internal_template_mgt_update</Scopes>
+            <Scopes>internal_template_mgt_update</Scopes>
         </Resource>
         <Resource context="(.*)/api/server/v(.*)/notification/email/template-types/(.*)" secured="true" http-method="DELETE">
-            <Scopes>internal_email_mgt_delete,internal_template_mgt_delete</Scopes>
+            <Scopes>internal_template_mgt_delete</Scopes>
         </Resource>
         <Resource context="(.*)/api/server/v(.*)/notification/sms/template-types(.*)" secured="true" http-method="GET">
             <Scopes>internal_template_mgt_view</Scopes>
@@ -731,6 +712,25 @@
             <Scopes>internal_template_mgt_delete</Scopes>
         </Resource>
 
+        <!-- [Organization] Email Template Management API v1/v2 -->
+        <Resource context="(.*)/o/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="GET">
+            <Scopes>internal_org_email_mgt_view</Scopes>
+        </Resource>
+
+        <!-- Email Template Management API v1/v2 -->
+        <Resource context="(.*)/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="GET">
+            <Scopes>internal_email_mgt_view</Scopes>
+        </Resource>
+        <Resource context="(.*)/api/server/v(.*)/email/template-types(.*)" secured="true" http-method="POST">
+            <Scopes>internal_email_mgt_create</Scopes>
+        </Resource>
+        <Resource context="(.*)/api/server/v(.*)/email/template-types/(.*)" secured="true" http-method="PUT">
+            <Scopes>internal_email_mgt_update</Scopes>
+        </Resource>
+        <Resource context="(.*)/api/server/v(.*)/email/template-types/(.*)" secured="true" http-method="DELETE">
+            <Scopes>internal_email_mgt_delete</Scopes>
+        </Resource>
+
         <!-- Keystore Management API -->
         <Resource context="(.*)/api/server/v1/keystores/certs/public(.*)" secured="false" http-method="GET"/>
         <Resource context="(.*)/api/server/v1/keystores/(.*)" secured="true" http-method="GET">