From 0c35ad4353438ea3de81bd4244658563a65d58fd Mon Sep 17 00:00:00 2001 From: AnuGayan Date: Wed, 2 Oct 2024 22:58:51 +0530 Subject: [PATCH] Fix reported issue in Email notification Issue fixed: https://github.com/wso2/api-manager/issues/3156 --- .../src/main/resources/tenant/tenant-conf.json | 2 +- .../main/resources/tenant/tenant-config-schema.json | 10 +++++----- .../wso2/carbon/apimgt/impl/APIProviderImplTest.java | 2 +- .../carbon/apimgt/impl/dao/test/APIMgtDAOTest.java | 2 +- .../src/test/resources/tenant-conf.json | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/resources/tenant/tenant-conf.json b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/resources/tenant/tenant-conf.json index 6e9b19463b84..84687c133e67 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/resources/tenant/tenant-conf.json +++ b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/resources/tenant/tenant-conf.json @@ -383,7 +383,7 @@ "Class":"org.wso2.carbon.apimgt.impl.notification.NewAPIVersionEmailNotifier", "ClaimsRetrieverImplClass":"org.wso2.carbon.apimgt.impl.token.DefaultClaimsRetriever", "Title": "Version $2 of $1 Released", - "Template": "

We’re happy to announce the arrival of the next major version $2 of $1 API which is now available in Our API Store.

Click here to Visit WSO2 API Store" + "Template": "

We’re happy to announce the arrival of the next major version $2 of $1 API which is now available in Our API Store.

Click here to Visit WSO2 API Store" }] } ], diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/resources/tenant/tenant-config-schema.json b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/resources/tenant/tenant-config-schema.json index b28b19837c09..e76404b5eddf 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/resources/tenant/tenant-config-schema.json +++ b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/resources/tenant/tenant-config-schema.json @@ -528,7 +528,7 @@ "Class": "org.wso2.carbon.apimgt.impl.notification.NewAPIVersionEmailNotifier", "ClaimsRetrieverImplClass": "org.wso2.carbon.apimgt.impl.token.DefaultClaimsRetriever", "Title": "Version $2 of $1 Released", - "Template": "

We’re happy to announce the arrival of the next major version $2 of $1 API which is now available in Our API Store.

Click here to Visit WSO2 API Store" + "Template": "

We’re happy to announce the arrival of the next major version $2 of $1 API which is now available in Our API Store.

Click here to Visit WSO2 API Store" } ] } @@ -552,7 +552,7 @@ "Class": "org.wso2.carbon.apimgt.impl.notification.NewAPIVersionEmailNotifier", "ClaimsRetrieverImplClass": "org.wso2.carbon.apimgt.impl.token.DefaultClaimsRetriever", "Title": "Version $2 of $1 Released", - "Template": "

We’re happy to announce the arrival of the next major version $2 of $1 API which is now available in Our API Store.

Click here to Visit WSO2 API Store" + "Template": "

We’re happy to announce the arrival of the next major version $2 of $1 API which is now available in Our API Store.

Click here to Visit WSO2 API Store" } ] } @@ -584,7 +584,7 @@ "Class": "org.wso2.carbon.apimgt.impl.notification.NewAPIVersionEmailNotifier", "ClaimsRetrieverImplClass": "org.wso2.carbon.apimgt.impl.token.DefaultClaimsRetriever", "Title": "Version $2 of $1 Released", - "Template": "

We’re happy to announce the arrival of the next major version $2 of $1 API which is now available in Our API Store.

Click here to Visit WSO2 API Store" + "Template": "

We’re happy to announce the arrival of the next major version $2 of $1 API which is now available in Our API Store.

Click here to Visit WSO2 API Store" } ] ], @@ -603,7 +603,7 @@ "Class": "org.wso2.carbon.apimgt.impl.notification.NewAPIVersionEmailNotifier", "ClaimsRetrieverImplClass": "org.wso2.carbon.apimgt.impl.token.DefaultClaimsRetriever", "Title": "Version $2 of $1 Released", - "Template": "

We’re happy to announce the arrival of the next major version $2 of $1 API which is now available in Our API Store.

Click here to Visit WSO2 API Store" + "Template": "

We’re happy to announce the arrival of the next major version $2 of $1 API which is now available in Our API Store.

Click here to Visit WSO2 API Store" } ], "required": [ @@ -650,7 +650,7 @@ "description": "An explanation about the purpose of this instance.", "default": "", "examples": [ - "

We’re happy to announce the arrival of the next major version $2 of $1 API which is now available in Our API Store.

Click here to Visit WSO2 API Store" + "

We’re happy to announce the arrival of the next major version $2 of $1 API which is now available in Our API Store.

Click here to Visit WSO2 API Store" ] } }, diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/src/test/java/org/wso2/carbon/apimgt/impl/APIProviderImplTest.java b/components/apimgt/org.wso2.carbon.apimgt.impl/src/test/java/org/wso2/carbon/apimgt/impl/APIProviderImplTest.java index 234c96fb8e69..87b99d361bc0 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.impl/src/test/java/org/wso2/carbon/apimgt/impl/APIProviderImplTest.java +++ b/components/apimgt/org.wso2.carbon.apimgt.impl/src/test/java/org/wso2/carbon/apimgt/impl/APIProviderImplTest.java @@ -912,7 +912,7 @@ private byte[] getTenantConfigContent() { + "\"org.wso2.carbon.apimgt.impl.token.DefaultClaimsRetriever\",\"Title\":\"Version $2 of $1 Released\"," + "\"Template\":\"

We’re happy to announce the arrival of" + " the next major version $2 of $1 API which is now available in Our API Store.

Click here to Visit WSO2 API Store\"}]}]," + + "//localhost:9443/devportal\\\">Click here to Visit WSO2 API Store\"}]}]," + "\"DefaultRoles\":{\"PublisherRole\":{\"CreateOnTenantLoad\":true,\"RoleName\":" + "\"Internal/publisher\"},\"CreatorRole\":{\"CreateOnTenantLoad\":true,\"RoleName\":" + "\"Internal/creator\"},\"SubscriberRole\":{\"CreateOnTenantLoad\":true}}}"; diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/src/test/java/org/wso2/carbon/apimgt/impl/dao/test/APIMgtDAOTest.java b/components/apimgt/org.wso2.carbon.apimgt.impl/src/test/java/org/wso2/carbon/apimgt/impl/dao/test/APIMgtDAOTest.java index c26a3f863fdf..0e8b2f19ef52 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.impl/src/test/java/org/wso2/carbon/apimgt/impl/dao/test/APIMgtDAOTest.java +++ b/components/apimgt/org.wso2.carbon.apimgt.impl/src/test/java/org/wso2/carbon/apimgt/impl/dao/test/APIMgtDAOTest.java @@ -1247,7 +1247,7 @@ public void testAddAndGetApi() throws Exception{ Set apiStoreSet = new HashSet(); APIStore apiStore = new APIStore(); apiStore.setDisplayName("wso2"); - apiStore.setEndpoint("http://localhost:9433/store"); + apiStore.setEndpoint("http://localhost:9433/devportal"); apiStore.setName("wso2"); apiStore.setType("wso2"); apiStoreSet.add(apiStore); diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/src/test/resources/tenant-conf.json b/components/apimgt/org.wso2.carbon.apimgt.impl/src/test/resources/tenant-conf.json index bf6da4d6f7d6..1a16e4385eee 100644 --- a/components/apimgt/org.wso2.carbon.apimgt.impl/src/test/resources/tenant-conf.json +++ b/components/apimgt/org.wso2.carbon.apimgt.impl/src/test/resources/tenant-conf.json @@ -279,7 +279,7 @@ "Class":"org.wso2.carbon.apimgt.impl.notification.NewAPIVersionEmailNotifier", "ClaimsRetrieverImplClass":"org.wso2.carbon.apimgt.impl.token.DefaultClaimsRetriever", "Title": "Version $2 of $1 Released", - "Template": "

We’re happy to announce the arrival of the next major version $2 of $1 API which is now available in Our API Store.

Click here to Visit WSO2 API Store" + "Template": "

We’re happy to announce the arrival of the next major version $2 of $1 API which is now available in Our API Store.

Click here to Visit WSO2 API Store" }] } ],