Update template existence check with resolve param in org templates.

wso2 · Dec 10, 2024 · eb70b91 · eb70b91
1 parent 6d4675c
commit eb70b91
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/...2/carbon/identity/rest/api/server/email/template/v1/core/ServerEmailTemplatesService.java b/...2/carbon/identity/rest/api/server/email/template/v1/core/ServerEmailTemplatesService.java
@@ -246,7 +246,7 @@ public SimpleEmailTemplate addEmailTemplate(String templateTypeId, EmailTemplate
         try {
             boolean isTemplateExists = EmailTemplatesServiceHolder.getEmailTemplateManager()
                     .isEmailTemplateExists(templateTypeDisplayName, emailTemplateWithID.getId(),
-                            getTenantDomainFromContext());
+                            getTenantDomainFromContext(), null, false);
             if (!isTemplateExists) {
                 // Email template is new, hence add to the system.
                 addEmailTemplateToTheSystem(templateTypeDisplayName, emailTemplateWithID);
@@ -308,7 +308,7 @@ public void deleteEmailTemplate(String templateTypeId, String templateId) {
         }
         try {
             boolean isTemplateExists = EmailTemplatesServiceHolder.getEmailTemplateManager().isEmailTemplateExists(
-                    templateTypeDisplayName, templateId, getTenantDomainFromContext());
+                    templateTypeDisplayName, templateId, getTenantDomainFromContext(), null, false);
             if (isTemplateExists) {
                 EmailTemplatesServiceHolder.getEmailTemplateManager().deleteEmailTemplate(templateTypeDisplayName,
                         templateId, getTenantDomainFromContext());
@@ -329,9 +329,11 @@ public void updateEmailTemplate(String templateTypeId, String templateId, EmailT
 
         String templateTypeDisplayName = decodeTemplateTypeId(templateTypeId);
         try {
-            // Check whether the email template exists, first.
+            /* Check whether the email template exists, first. Here, resolve param is specified as true since
+              resolved org templates are returned in GET endpoint, by default. Therefore, resolved template existence
+              is checked before updating. */
             boolean isTemplateExists = EmailTemplatesServiceHolder.getEmailTemplateManager().isEmailTemplateExists(
-                    templateTypeDisplayName, templateId, getTenantDomainFromContext());
+                    templateTypeDisplayName, templateId, getTenantDomainFromContext(), null, true);
             if (isTemplateExists) {
                 addEmailTemplateToTheSystem(templateTypeDisplayName, emailTemplateWithID);
             } else {

diff --git a/...2/carbon/identity/rest/api/server/email/template/v2/core/ServerEmailTemplatesService.java b/...2/carbon/identity/rest/api/server/email/template/v2/core/ServerEmailTemplatesService.java
@@ -243,7 +243,7 @@ public SimpleEmailTemplate addEmailTemplate(String templateTypeId, EmailTemplate
         try {
             boolean isTemplateExists = EmailTemplatesServiceHolder.getEmailTemplateManager()
                     .isEmailTemplateExists(templateTypeDisplayName, emailTemplateWithID.getLocale(),
-                            getTenantDomainFromContext());
+                            getTenantDomainFromContext(), null, false);
             if (!isTemplateExists) {
                 // Email template is new, hence add to the system.
                 addEmailTemplateToTheSystem(templateTypeDisplayName, emailTemplateWithID);
@@ -332,7 +332,7 @@ public void deleteEmailTemplate(String templateTypeId, String templateId) {
         }
         try {
             boolean isTemplateExists = EmailTemplatesServiceHolder.getEmailTemplateManager().isEmailTemplateExists(
-                    templateTypeDisplayName, templateId, getTenantDomainFromContext());
+                    templateTypeDisplayName, templateId, getTenantDomainFromContext(), null, false);
             if (isTemplateExists) {
                 EmailTemplatesServiceHolder.getEmailTemplateManager().deleteEmailTemplate(templateTypeDisplayName,
                         templateId, getTenantDomainFromContext());
@@ -353,9 +353,11 @@ public void updateEmailTemplate(String templateTypeId, String templateId, EmailT
 
         String templateTypeDisplayName = decodeTemplateTypeId(templateTypeId);
         try {
-            // Check whether the email template exists, first.
+            /* Check whether the email template exists, first. Here, resolve param is specified as true since
+              resolved org templates are returned in GET endpoint, by default. Therefore, resolved template existence
+              is checked before updating. */
             boolean isTemplateExists = EmailTemplatesServiceHolder.getEmailTemplateManager().isEmailTemplateExists(
-                    templateTypeDisplayName, templateId, getTenantDomainFromContext());
+                    templateTypeDisplayName, templateId, getTenantDomainFromContext(), null, true);
             if (isTemplateExists) {
                 addEmailTemplateToTheSystem(templateTypeDisplayName, emailTemplateWithID);
             } else {