From bf390b2ca21d46dd21b3185714dcbbde0f709b8f Mon Sep 17 00:00:00 2001
From: rushannanayakkara <rushannana@gmail.com>
Date: Wed, 10 Jul 2024 12:20:50 +0530
Subject: [PATCH 1/6] Add Notification Template API Resource

---
 .../resources/system-api-resource.xml         | 33 ++++++++++++++++++
 .../resources/system-api-resource.xml.j2      | 33 ++++++++++++++++++
 .../resources/resource-access-control-v2.xml  | 34 +++++++++++++++++++
 .../resource-access-control-v2.xml.j2         | 34 +++++++++++++++++++
 4 files changed, 134 insertions(+)

diff --git a/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml b/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml
index b59eb1bb0f23..f97ddff5cdf7 100644
--- a/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml
+++ b/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml
@@ -722,6 +722,39 @@
                     description="View email templates and types in the organization"/>
         </Scopes>
     </APIResource>
+    <APIResource name="Notification Template Management API"
+                 identifier="/api/server/v(.*)/notification/(?:email|sms)/template-types" requiresAuthorization="true"
+                 description="API representation of the Notification Template Management API" type="TENANT">
+        <Scopes>
+            <Scope displayName="View Email Template" name="internal_email_mgt_view"
+                   description="View email templates and types in the organization (root)"/>
+            <Scope displayName="Create Email Template" name="internal_email_mgt_create"
+                   description="Create new email template and types in the organization (root)"/>
+            <Scope displayName="Update Email Template" name="internal_email_mgt_update"
+                   description="Update email templates and types in the organization (root)"/>
+            <Scope displayName="Delete Email Template" name="internal_email_mgt_delete"
+                   description="Delete email templates and types in the organization (root)"/>
+            <Scope displayName="View SMS Template" name="internal_sms_mgt_view"
+                   description="View SMS templates and types in the organization (root)"/>
+            <Scope displayName="Create SMS Template" name="internal_sms_mgt_create"
+                   description="Create SMS sms template and types in the organization (root)"/>
+            <Scope displayName="Update SMS Template" name="internal_sms_mgt_update"
+                   description="Update SMS templates and types in the organization (root)"/>
+            <Scope displayName="Delete SMS Template" name="internal_sms_mgt_delete"
+                   description="Delete SMS templates and types in the organization (root)"/>
+        </Scopes>
+    </APIResource>
+    <APIResource name="Notification Template Management API"
+                 identifier="/o/api/server/v(.*)/notification/(?:email|sms)/template-types" requiresAuthorization="true"
+                 description="API representation of the Notification Template Management API"
+                 type="CONSOLE_ORG_LEVEL">
+        <Scopes>
+            <Scope displayName="View Email Template" name="internal_org_email_mgt_view"
+                   description="View email templates and types in the organization"/>
+            <Scope displayName="View SMS Template" name="internal_org_sms_mgt_view"
+                   description="View SMS templates and types in the organization"/>
+        </Scopes>
+    </APIResource>
     <APIResource name="Entitlement Management API" identifier="/api/identity/entitlement/"
                  requiresAuthorization="true"
                  description="API representation of the Entitlement Management API" type="TENANT">
diff --git a/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml.j2 b/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml.j2
index 124f332302c0..401110b21cfd 100644
--- a/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml.j2
+++ b/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml.j2
@@ -731,6 +731,39 @@
                     description="View email templates and types in the organization"/>
         </Scopes>
     </APIResource>
+    <APIResource name="Notification Template Management API"
+                 identifier="/api/server/v(.*)/notification/(?:email|sms)/template-types" requiresAuthorization="true"
+                 description="API representation of the Notification Template Management API" type="TENANT">
+        <Scopes>
+            <Scope displayName="View Email Template" name="internal_email_mgt_view"
+                    description="View email templates and types in the organization (root)"/>
+            <Scope displayName="Create Email Template" name="internal_email_mgt_create"
+                    description="Create new email template and types in the organization (root)"/>
+            <Scope displayName="Update Email Template" name="internal_email_mgt_update"
+                    description="Update email templates and types in the organization (root)"/>
+            <Scope displayName="Delete Email Template" name="internal_email_mgt_delete"
+                    description="Delete email templates and types in the organization (root)"/>
+            <Scope displayName="View SMS Template" name="internal_sms_mgt_view"
+                    description="View SMS templates and types in the organization (root)"/>
+            <Scope displayName="Create SMS Template" name="internal_sms_mgt_create"
+                    description="Create SMS sms template and types in the organization (root)"/>
+            <Scope displayName="Update SMS Template" name="internal_sms_mgt_update"
+                    description="Update SMS templates and types in the organization (root)"/>
+            <Scope displayName="Delete SMS Template" name="internal_sms_mgt_delete"
+                    description="Delete SMS templates and types in the organization (root)"/>
+        </Scopes>
+    </APIResource>
+    <APIResource name="Notification Template Management API"
+                 identifier="/o/api/server/v(.*)/notification/(?:email|sms)/template-types" requiresAuthorization="true"
+                 description="API representation of the Notification Template Management API"
+                 type="CONSOLE_ORG_LEVEL">
+        <Scopes>
+            <Scope displayName="View Email Template" name="internal_org_email_mgt_view"
+                    description="View email templates and types in the organization"/>
+            <Scope displayName="View SMS Template" name="internal_org_sms_mgt_view"
+                    description="View SMS templates and types in the organization"/>
+        </Scopes>
+    </APIResource>
     <APIResource name="Entitlement Management API" identifier="/api/identity/entitlement/"
                  requiresAuthorization="true"
                  description="API representation of the Entitlement Management API" type="TENANT">
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 0956d9d4fc23..af8a8201dee3 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
@@ -645,6 +645,40 @@
         <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</Scopes>
+    </Resource>
+    <Resource context="(.*)/o/api/server/v(.*)/notification/sms/template-types(.*)" secured="true" http-method="GET">
+        <Scopes>internal_org_email_mgt_view</Scopes>
+    </Resource>
+
+    <!-- Notification Template Management API -->
+    <Resource context="(.*)/api/server/v(.*)/notification/email/template-types(.*)" secured="true" http-method="GET">
+        <Scopes>internal_email_mgt_view</Scopes>
+    </Resource>
+    <Resource context="(.*)/api/server/v(.*)/notification/email/template-types(.*)" secured="true" http-method="POST">
+        <Scopes>internal_email_mgt_create</Scopes>
+    </Resource>
+    <Resource context="(.*)/api/server/v(.*)/notification/email/template-types/(.*)" secured="true" http-method="PUT">
+        <Scopes>internal_email_mgt_update</Scopes>
+    </Resource>
+    <Resource context="(.*)/api/server/v(.*)/notification/email/template-types/(.*)" secured="true" http-method="DELETE">
+        <Scopes>internal_email_mgt_delete</Scopes>
+    </Resource>
+    <Resource context="(.*)/api/server/v(.*)/notification/sms/template-types(.*)" secured="true" http-method="GET">
+        <Scopes>internal_sms_mgt_view</Scopes>
+    </Resource>
+    <Resource context="(.*)/api/server/v(.*)/notification/sms/template-types(.*)" secured="true" http-method="POST">
+        <Scopes>internal_sms_mgt_create</Scopes>
+    </Resource>
+    <Resource context="(.*)/api/server/v(.*)/notification/sms/template-types/(.*)" secured="true" http-method="PUT">
+        <Scopes>internal_sms_mgt_update</Scopes>
+    </Resource>
+    <Resource context="(.*)/api/server/v(.*)/notification/sms/template-types/(.*)" secured="true" http-method="DELETE">
+        <Scopes>internal_sms_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 1fc33b46bb2d..78765701833f 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
@@ -694,6 +694,40 @@
             <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</Scopes>
+        </Resource>
+        <Resource context="(.*)/o/api/server/v(.*)/notification/sms/template-types(.*)" secured="true" http-method="GET">
+            <Scopes>internal_org_email_mgt_view</Scopes>
+        </Resource>
+
+        <!-- Notification Template Management API -->
+        <Resource context="(.*)/api/server/v(.*)/notification/email/template-types(.*)" secured="true" http-method="GET">
+            <Scopes>internal_email_mgt_view</Scopes>
+        </Resource>
+        <Resource context="(.*)/api/server/v(.*)/notification/email/template-types(.*)" secured="true" http-method="POST">
+            <Scopes>internal_email_mgt_create</Scopes>
+        </Resource>
+        <Resource context="(.*)/api/server/v(.*)/notification/email/template-types/(.*)" secured="true" http-method="PUT">
+            <Scopes>internal_email_mgt_update</Scopes>
+        </Resource>
+        <Resource context="(.*)/api/server/v(.*)/notification/email/template-types/(.*)" secured="true" http-method="DELETE">
+            <Scopes>internal_email_mgt_delete</Scopes>
+        </Resource>
+        <Resource context="(.*)/api/server/v(.*)/notification/sms/template-types(.*)" secured="true" http-method="GET">
+            <Scopes>internal_sms_mgt_view</Scopes>
+        </Resource>
+        <Resource context="(.*)/api/server/v(.*)/notification/sms/template-types(.*)" secured="true" http-method="POST">
+            <Scopes>internal_sms_mgt_create</Scopes>
+        </Resource>
+        <Resource context="(.*)/api/server/v(.*)/notification/sms/template-types/(.*)" secured="true" http-method="PUT">
+            <Scopes>internal_sms_mgt_update</Scopes>
+        </Resource>
+        <Resource context="(.*)/api/server/v(.*)/notification/sms/template-types/(.*)" secured="true" http-method="DELETE">
+            <Scopes>internal_sms_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">

From 53d2ec4392fa5615ad299e823d311eadc5705646 Mon Sep 17 00:00:00 2001
From: rushannanayakkara <rushannana@gmail.com>
Date: Thu, 26 Sep 2024 22:26:35 +0530
Subject: [PATCH 2/6] Add Notification Template API Resource and Access Control

---
 .../resources/system-api-resource.xml.j2      | 33 +++++++++++++++++
 .../resource-access-control-v2.xml.j2         | 35 +++++++++++++++++++
 2 files changed, 68 insertions(+)

diff --git a/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml.j2 b/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml.j2
index 494cf2b3ee61..c46220b09eea 100644
--- a/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml.j2
+++ b/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml.j2
@@ -778,6 +778,39 @@
                     description="View SMS templates and types in the organization"/>
         </Scopes>
     </APIResource>
+    <APIResource name="Notification Template Management API"
+                 identifier="/api/server/v(.*)/notification/(?:email|sms)/template-types" requiresAuthorization="true"
+                 description="API representation of the Notification Template Management API" type="TENANT">
+        <Scopes>
+            <Scope displayName="View Email Template" name="internal_notification_email_mgt_view"
+                   description="View email templates and types in the organization (root)"/>
+            <Scope displayName="Create Email Template" name="internal_notification_email_mgt_create"
+                   description="Create new email template and types in the organization (root)"/>
+            <Scope displayName="Update Email Template" name="internal_notification_email_mgt_update"
+                   description="Update email templates and types in the organization (root)"/>
+            <Scope displayName="Delete Email Template" name="internal_notification_email_mgt_delete"
+                   description="Delete email templates and types in the organization (root)"/>
+            <Scope displayName="View SMS Template" name="internal_notification_sms_mgt_view"
+                   description="View SMS templates and types in the organization (root)"/>
+            <Scope displayName="Create SMS Template" name="internal_notification_sms_mgt_create"
+                   description="Create SMS sms template and types in the organization (root)"/>
+            <Scope displayName="Update SMS Template" name="internal_notification_sms_mgt_update"
+                   description="Update SMS templates and types in the organization (root)"/>
+            <Scope displayName="Delete SMS Template" name="internal_notification_sms_mgt_delete"
+                   description="Delete SMS templates and types in the organization (root)"/>
+        </Scopes>
+    </APIResource>
+    <APIResource name="Notification Template Management API"
+                 identifier="/o/api/server/v(.*)/notification/(?:email|sms)/template-types" requiresAuthorization="true"
+                 description="API representation of the Notification Template Management API"
+                 type="CONSOLE_ORG_LEVEL">
+        <Scopes>
+            <Scope displayName="View Email Template" name="internal_org_notification_email_mgt_view"
+                   description="View email templates and types in the organization"/>
+            <Scope displayName="View SMS Template" name="internal_org_notification_sms_mgt_view"
+                   description="View SMS templates and types in the organization"/>
+        </Scopes>
+    </APIResource>
     <APIResource name="Entitlement Management API" identifier="/api/identity/entitlement/"
                  requiresAuthorization="true"
                  description="API representation of the Entitlement Management API" type="TENANT">
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 b6c17f9fd566..ddee836984dd 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
@@ -728,6 +728,41 @@
             <Scopes>internal_sms_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_notification_email_mgt_view</Scopes>
+        </Resource>
+        <Resource context="(.*)/o/api/server/v(.*)/notification/sms/template-types(.*)" secured="true" http-method="GET">
+            <Scopes>internal_org_notification_sms_mgt_view</Scopes>
+        </Resource>
+
+        <!-- Notification Template Management API -->
+        <Resource context="(.*)/api/server/v(.*)/notification/email/template-types(.*)" secured="true" http-method="GET">
+            <Scopes>internal_notification_email_mgt_view</Scopes>
+        </Resource>
+        <Resource context="(.*)/api/server/v(.*)/notification/email/template-types(.*)" secured="true" http-method="POST">
+            <Scopes>internal_notification_email_mgt_create</Scopes>
+        </Resource>
+        <Resource context="(.*)/api/server/v(.*)/notification/email/template-types/(.*)" secured="true" http-method="PUT">
+            <Scopes>internal_notification_email_mgt_update</Scopes>
+        </Resource>
+        <Resource context="(.*)/api/server/v(.*)/notification/email/template-types/(.*)" secured="true" http-method="DELETE">
+            <Scopes>internal_notification_email_mgt_delete</Scopes>
+        </Resource>
+        <Resource context="(.*)/api/server/v(.*)/notification/sms/template-types(.*)" secured="true" http-method="GET">
+            <Scopes>internal_notification_sms_mgt_view</Scopes>
+        </Resource>
+        <Resource context="(.*)/api/server/v(.*)/notification/sms/template-types(.*)" secured="true" http-method="POST">
+            <Scopes>internal_notification_sms_mgt_create</Scopes>
+        </Resource>
+        <Resource context="(.*)/api/server/v(.*)/notification/sms/template-types/(.*)" secured="true" http-method="PUT">
+            <Scopes>internal_notification_sms_mgt_update</Scopes>
+        </Resource>
+        <Resource context="(.*)/api/server/v(.*)/notification/sms/template-types/(.*)" secured="true" http-method="DELETE">
+            <Scopes>internal_notification_sms_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">

From bfcda1b44a37d049fd09c057973ad392e0a3bca3 Mon Sep 17 00:00:00 2001
From: rushannanayakkara <rushannana@gmail.com>
Date: Sun, 29 Sep 2024 19:11:10 +0530
Subject: [PATCH 3/6] Update Notification Template API Scopes

---
 .../resources/system-api-resource.xml.j2      | 63 +++----------------
 .../resource-access-control-v2.xml.j2         | 55 +++-------------
 2 files changed, 20 insertions(+), 98 deletions(-)

diff --git a/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml.j2 b/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml.j2
index c46220b09eea..3c87451e3763 100644
--- a/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml.j2
+++ b/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml.j2
@@ -749,55 +749,14 @@
                  identifier="/api/server/v(.*)/notification/(?:email|sms)/template-types" requiresAuthorization="true"
                  description="API representation of the Notification Template Management API" type="TENANT">
         <Scopes>
-            <Scope displayName="View Email Template" name="internal_email_mgt_view"
-                    description="View email templates and types in the organization (root)"/>
-            <Scope displayName="Create Email Template" name="internal_email_mgt_create"
-                    description="Create new email template and types in the organization (root)"/>
-            <Scope displayName="Update Email Template" name="internal_email_mgt_update"
-                    description="Update email templates and types in the organization (root)"/>
-            <Scope displayName="Delete Email Template" name="internal_email_mgt_delete"
-                    description="Delete email templates and types in the organization (root)"/>
-            <Scope displayName="View SMS Template" name="internal_sms_mgt_view"
-                    description="View SMS templates and types in the organization (root)"/>
-            <Scope displayName="Create SMS Template" name="internal_sms_mgt_create"
-                    description="Create SMS sms template and types in the organization (root)"/>
-            <Scope displayName="Update SMS Template" name="internal_sms_mgt_update"
-                    description="Update SMS templates and types in the organization (root)"/>
-            <Scope displayName="Delete SMS Template" name="internal_sms_mgt_delete"
-                    description="Delete SMS templates and types in the organization (root)"/>
-        </Scopes>
-    </APIResource>
-    <APIResource name="Notification Template Management API"
-                 identifier="/o/api/server/v(.*)/notification/(?:email|sms)/template-types" requiresAuthorization="true"
-                 description="API representation of the Notification Template Management API"
-                 type="CONSOLE_ORG_LEVEL">
-        <Scopes>
-            <Scope displayName="View Email Template" name="internal_org_email_mgt_view"
-                    description="View email templates and types in the organization"/>
-            <Scope displayName="View SMS Template" name="internal_org_sms_mgt_view"
-                    description="View SMS templates and types in the organization"/>
-        </Scopes>
-    </APIResource>
-    <APIResource name="Notification Template Management API"
-                 identifier="/api/server/v(.*)/notification/(?:email|sms)/template-types" requiresAuthorization="true"
-                 description="API representation of the Notification Template Management API" type="TENANT">
-        <Scopes>
-            <Scope displayName="View Email Template" name="internal_notification_email_mgt_view"
-                   description="View email templates and types in the organization (root)"/>
-            <Scope displayName="Create Email Template" name="internal_notification_email_mgt_create"
-                   description="Create new email template and types in the organization (root)"/>
-            <Scope displayName="Update Email Template" name="internal_notification_email_mgt_update"
-                   description="Update email templates and types in the organization (root)"/>
-            <Scope displayName="Delete Email Template" name="internal_notification_email_mgt_delete"
-                   description="Delete email templates and types in the organization (root)"/>
-            <Scope displayName="View SMS Template" name="internal_notification_sms_mgt_view"
-                   description="View SMS templates and types in the organization (root)"/>
-            <Scope displayName="Create SMS Template" name="internal_notification_sms_mgt_create"
-                   description="Create SMS sms template and types in the organization (root)"/>
-            <Scope displayName="Update SMS Template" name="internal_notification_sms_mgt_update"
-                   description="Update SMS templates and types in the organization (root)"/>
-            <Scope displayName="Delete SMS Template" name="internal_notification_sms_mgt_delete"
-                   description="Delete SMS templates and types in the organization (root)"/>
+            <Scope displayName="View Notification Template" name="internal_template_mgt_view"
+                   description="View notification templates and types in the organization (root)"/>
+            <Scope displayName="Create Notification Template" name="internal_template_mgt_create"
+                   description="Create new notification template and types in the organization (root)"/>
+            <Scope displayName="Update Notification Template" name="internal_template_mgt_update"
+                   description="Update notification templates and types in the organization (root)"/>
+            <Scope displayName="Delete Notification Template" name="internal_template_mgt_delete"
+                   description="Delete notification templates and types in the organization (root)"/>
         </Scopes>
     </APIResource>
     <APIResource name="Notification Template Management API"
@@ -805,10 +764,8 @@
                  description="API representation of the Notification Template Management API"
                  type="CONSOLE_ORG_LEVEL">
         <Scopes>
-            <Scope displayName="View Email Template" name="internal_org_notification_email_mgt_view"
-                   description="View email templates and types in the organization"/>
-            <Scope displayName="View SMS Template" name="internal_org_notification_sms_mgt_view"
-                   description="View SMS templates and types in the organization"/>
+            <Scope displayName="View Notification Template" name="internal_org_template_mgt_view"
+                   description="View notification templates and types in the organization"/>
         </Scopes>
     </APIResource>
     <APIResource name="Entitlement Management API" identifier="/api/identity/entitlement/"
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 ddee836984dd..8cb2ed35c27d 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
@@ -696,71 +696,36 @@
 
         <!-- [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</Scopes>
-        </Resource>
-        <Resource context="(.*)/o/api/server/v(.*)/notification/sms/template-types(.*)" secured="true" http-method="GET">
-            <Scopes>internal_org_email_mgt_view</Scopes>
-        </Resource>
-
-        <!-- Notification Template Management API -->
-        <Resource context="(.*)/api/server/v(.*)/notification/email/template-types(.*)" secured="true" http-method="GET">
-            <Scopes>internal_email_mgt_view</Scopes>
-        </Resource>
-        <Resource context="(.*)/api/server/v(.*)/notification/email/template-types(.*)" secured="true" http-method="POST">
-            <Scopes>internal_email_mgt_create</Scopes>
-        </Resource>
-        <Resource context="(.*)/api/server/v(.*)/notification/email/template-types/(.*)" secured="true" http-method="PUT">
-            <Scopes>internal_email_mgt_update</Scopes>
-        </Resource>
-        <Resource context="(.*)/api/server/v(.*)/notification/email/template-types/(.*)" secured="true" http-method="DELETE">
-            <Scopes>internal_email_mgt_delete</Scopes>
-        </Resource>
-        <Resource context="(.*)/api/server/v(.*)/notification/sms/template-types(.*)" secured="true" http-method="GET">
-            <Scopes>internal_sms_mgt_view</Scopes>
-        </Resource>
-        <Resource context="(.*)/api/server/v(.*)/notification/sms/template-types(.*)" secured="true" http-method="POST">
-            <Scopes>internal_sms_mgt_create</Scopes>
-        </Resource>
-        <Resource context="(.*)/api/server/v(.*)/notification/sms/template-types/(.*)" secured="true" http-method="PUT">
-            <Scopes>internal_sms_mgt_update</Scopes>
-        </Resource>
-        <Resource context="(.*)/api/server/v(.*)/notification/sms/template-types/(.*)" secured="true" http-method="DELETE">
-            <Scopes>internal_sms_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_notification_email_mgt_view</Scopes>
+            <Scopes>internal_org_email_mgt_view,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_notification_sms_mgt_view</Scopes>
+            <Scopes>internal_org_template_mgt_view</Scopes>
         </Resource>
 
         <!-- Notification Template Management API -->
         <Resource context="(.*)/api/server/v(.*)/notification/email/template-types(.*)" secured="true" http-method="GET">
-            <Scopes>internal_notification_email_mgt_view</Scopes>
+            <Scopes>internal_email_mgt_view,internal_template_mgt_view</Scopes>
         </Resource>
         <Resource context="(.*)/api/server/v(.*)/notification/email/template-types(.*)" secured="true" http-method="POST">
-            <Scopes>internal_notification_email_mgt_create</Scopes>
+            <Scopes>internal_email_mgt_create,internal_template_mgt_create</Scopes>
         </Resource>
         <Resource context="(.*)/api/server/v(.*)/notification/email/template-types/(.*)" secured="true" http-method="PUT">
-            <Scopes>internal_notification_email_mgt_update</Scopes>
+            <Scopes>internal_email_mgt_update,internal_template_mgt_update</Scopes>
         </Resource>
         <Resource context="(.*)/api/server/v(.*)/notification/email/template-types/(.*)" secured="true" http-method="DELETE">
-            <Scopes>internal_notification_email_mgt_delete</Scopes>
+            <Scopes>internal_email_mgt_delete,internal_template_mgt_delete</Scopes>
         </Resource>
         <Resource context="(.*)/api/server/v(.*)/notification/sms/template-types(.*)" secured="true" http-method="GET">
-            <Scopes>internal_notification_sms_mgt_view</Scopes>
+            <Scopes>internal_template_mgt_view</Scopes>
         </Resource>
         <Resource context="(.*)/api/server/v(.*)/notification/sms/template-types(.*)" secured="true" http-method="POST">
-            <Scopes>internal_notification_sms_mgt_create</Scopes>
+            <Scopes>internal_template_mgt_create</Scopes>
         </Resource>
         <Resource context="(.*)/api/server/v(.*)/notification/sms/template-types/(.*)" secured="true" http-method="PUT">
-            <Scopes>internal_notification_sms_mgt_update</Scopes>
+            <Scopes>internal_template_mgt_update</Scopes>
         </Resource>
         <Resource context="(.*)/api/server/v(.*)/notification/sms/template-types/(.*)" secured="true" http-method="DELETE">
-            <Scopes>internal_notification_sms_mgt_delete</Scopes>
+            <Scopes>internal_template_mgt_delete</Scopes>
         </Resource>
 
         <!-- Keystore Management API -->

From 1eef740661e39aaa967e82bbc6259d7e50134ea6 Mon Sep 17 00:00:00 2001
From: rushannanayakkara <rushannana@gmail.com>
Date: Tue, 15 Oct 2024 07:06:18 +0530
Subject: [PATCH 4/6] update scopes in resource files

---
 .../resources/system-api-resource.xml         | 30 +++++++------------
 .../resources/resource-access-control-v2.xml  | 20 ++++++-------
 2 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml b/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml
index 2f7800706dfc..f69973173b77 100644
--- a/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml
+++ b/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml
@@ -768,22 +768,14 @@
                  identifier="/api/server/v(.*)/notification/(?:email|sms)/template-types" requiresAuthorization="true"
                  description="API representation of the Notification Template Management API" type="TENANT">
         <Scopes>
-            <Scope displayName="View Email Template" name="internal_email_mgt_view"
-                   description="View email templates and types in the organization (root)"/>
-            <Scope displayName="Create Email Template" name="internal_email_mgt_create"
-                   description="Create new email template and types in the organization (root)"/>
-            <Scope displayName="Update Email Template" name="internal_email_mgt_update"
-                   description="Update email templates and types in the organization (root)"/>
-            <Scope displayName="Delete Email Template" name="internal_email_mgt_delete"
-                   description="Delete email templates and types in the organization (root)"/>
-            <Scope displayName="View SMS Template" name="internal_sms_mgt_view"
-                   description="View SMS templates and types in the organization (root)"/>
-            <Scope displayName="Create SMS Template" name="internal_sms_mgt_create"
-                   description="Create SMS sms template and types in the organization (root)"/>
-            <Scope displayName="Update SMS Template" name="internal_sms_mgt_update"
-                   description="Update SMS templates and types in the organization (root)"/>
-            <Scope displayName="Delete SMS Template" name="internal_sms_mgt_delete"
-                   description="Delete SMS templates and types in the organization (root)"/>
+            <Scope displayName="View Notification Template" name="internal_template_mgt_view"
+                   description="View notification templates and types in the organization (root)"/>
+            <Scope displayName="Create Notification Template" name="internal_template_mgt_create"
+                   description="Create new notification template and types in the organization (root)"/>
+            <Scope displayName="Update Notification Template" name="internal_template_mgt_update"
+                   description="Update notification templates and types in the organization (root)"/>
+            <Scope displayName="Delete Notification Template" name="internal_template_mgt_delete"
+                   description="Delete notification templates and types in the organization (root)"/>
         </Scopes>
     </APIResource>
     <APIResource name="Notification Template Management API"
@@ -791,10 +783,8 @@
                  description="API representation of the Notification Template Management API"
                  type="CONSOLE_ORG_LEVEL">
         <Scopes>
-            <Scope displayName="View Email Template" name="internal_org_email_mgt_view"
-                   description="View email templates and types in the organization"/>
-            <Scope displayName="View SMS Template" name="internal_org_sms_mgt_view"
-                   description="View SMS templates and types in the organization"/>
+            <Scope displayName="View Notification Template" name="internal_org_template_mgt_view"
+                   description="View notification templates and types in the organization"/>
         </Scopes>
     </APIResource>
     <APIResource name="Entitlement Management API" identifier="/api/identity/entitlement/"
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 363bc5bfaefc..a70f4dad0acf 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
@@ -647,36 +647,36 @@
 
     <!-- [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</Scopes>
+        <Scopes>internal_org_email_mgt_view,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_email_mgt_view</Scopes>
+        <Scopes>internal_org_template_mgt_view</Scopes>
     </Resource>
 
     <!-- Notification Template Management API -->
     <Resource context="(.*)/api/server/v(.*)/notification/email/template-types(.*)" secured="true" http-method="GET">
-        <Scopes>internal_email_mgt_view</Scopes>
+        <Scopes>internal_email_mgt_view,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</Scopes>
+        <Scopes>internal_email_mgt_create,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</Scopes>
+        <Scopes>internal_email_mgt_update,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</Scopes>
+        <Scopes>internal_email_mgt_delete,internal_template_mgt_delete</Scopes>
     </Resource>
     <Resource context="(.*)/api/server/v(.*)/notification/sms/template-types(.*)" secured="true" http-method="GET">
-        <Scopes>internal_sms_mgt_view</Scopes>
+        <Scopes>internal_template_mgt_view</Scopes>
     </Resource>
     <Resource context="(.*)/api/server/v(.*)/notification/sms/template-types(.*)" secured="true" http-method="POST">
-        <Scopes>internal_sms_mgt_create</Scopes>
+        <Scopes>internal_template_mgt_create</Scopes>
     </Resource>
     <Resource context="(.*)/api/server/v(.*)/notification/sms/template-types/(.*)" secured="true" http-method="PUT">
-        <Scopes>internal_sms_mgt_update</Scopes>
+        <Scopes>internal_template_mgt_update</Scopes>
     </Resource>
     <Resource context="(.*)/api/server/v(.*)/notification/sms/template-types/(.*)" secured="true" http-method="DELETE">
-        <Scopes>internal_sms_mgt_delete</Scopes>
+        <Scopes>internal_template_mgt_delete</Scopes>
     </Resource>
 
     <!-- Keystore Management API -->

From f01fcd86667c5447d02912b2c9e6adbf01d488da Mon Sep 17 00:00:00 2001
From: rushannanayakkara <rushannana@gmail.com>
Date: Fri, 18 Oct 2024 09:41:20 +0530
Subject: [PATCH 5/6] Add scopes for notification/reset-template-type endpoint

---
 .../resources/resource-access-control-v2.xml                   | 3 +++
 .../resources/resource-access-control-v2.xml.j2                | 3 +++
 2 files changed, 6 insertions(+)

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 a70f4dad0acf..607f8cdf3746 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
@@ -678,6 +678,9 @@
     <Resource context="(.*)/api/server/v(.*)/notification/sms/template-types/(.*)" secured="true" http-method="DELETE">
         <Scopes>internal_template_mgt_delete</Scopes>
     </Resource>
+    <Resource context="(.*)/api/server/v(.*)/notification/reset-template-type" secured="true" http-method="POST">
+        <Scopes>internal_template_mgt_delete</Scopes>
+    </Resource>
 
     <!-- Keystore Management API -->
     <Resource context="(.*)/api/server/v1/keystores/certs/public(.*)" secured="false" 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 4f45a4676bfb..08998327c58c 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
@@ -727,6 +727,9 @@
         <Resource context="(.*)/api/server/v(.*)/notification/sms/template-types/(.*)" secured="true" http-method="DELETE">
             <Scopes>internal_template_mgt_delete</Scopes>
         </Resource>
+        <Resource context="(.*)/api/server/v(.*)/notification/reset-template-type" secured="true" http-method="POST">
+            <Scopes>internal_template_mgt_delete</Scopes>
+        </Resource>
 
         <!-- Keystore Management API -->
         <Resource context="(.*)/api/server/v1/keystores/certs/public(.*)" secured="false" http-method="GET"/>

From 157dbbbece3c59104bd1b769e15af04932a07717 Mon Sep 17 00:00:00 2001
From: rushannanayakkara <rushannana@gmail.com>
Date: Fri, 18 Oct 2024 09:50:08 +0530
Subject: [PATCH 6/6] Fix typo in scope description

---
 .../resources/system-api-resource.xml                           | 2 +-
 .../resources/system-api-resource.xml.j2                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml b/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml
index f69973173b77..e6357f633782 100644
--- a/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml
+++ b/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml
@@ -771,7 +771,7 @@
             <Scope displayName="View Notification Template" name="internal_template_mgt_view"
                    description="View notification templates and types in the organization (root)"/>
             <Scope displayName="Create Notification Template" name="internal_template_mgt_create"
-                   description="Create new notification template and types in the organization (root)"/>
+                   description="Create new notification templates and types in the organization (root)"/>
             <Scope displayName="Update Notification Template" name="internal_template_mgt_update"
                    description="Update notification templates and types in the organization (root)"/>
             <Scope displayName="Delete Notification Template" name="internal_template_mgt_delete"
diff --git a/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml.j2 b/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml.j2
index b73ca3b25dd0..db8b99fbab86 100644
--- a/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml.j2
+++ b/features/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt.server.feature/resources/system-api-resource.xml.j2
@@ -780,7 +780,7 @@
             <Scope displayName="View Notification Template" name="internal_template_mgt_view"
                    description="View notification templates and types in the organization (root)"/>
             <Scope displayName="Create Notification Template" name="internal_template_mgt_create"
-                   description="Create new notification template and types in the organization (root)"/>
+                   description="Create new notification templates and types in the organization (root)"/>
             <Scope displayName="Update Notification Template" name="internal_template_mgt_update"
                    description="Update notification templates and types in the organization (root)"/>
             <Scope displayName="Delete Notification Template" name="internal_template_mgt_delete"