address comments

wso2-extensions · Dec 11, 2024 · 2b04eef · 2b04eef
1 parent f30c591
commit 2b04eef
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/...ain/java/org/wso2/carbon/identity/conditional/auth/functions/http/CookieFunctionImpl.java b/...ain/java/org/wso2/carbon/identity/conditional/auth/functions/http/CookieFunctionImpl.java
@@ -188,10 +188,6 @@ public String getCookieValue(JsServletRequest request, Object... params) {
                         try {
                             String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext()
                                     .getTenantDomain();
-                            // For getCookie, setCookie functionalities tenant shouldn't use its tenanted keystore.
-                            // Hence, below code will create a keystore for this context if not exists.
-                            HTTPFunctionsServiceHolder.getInstance().getIdentityKeyStoreGenerator()
-                                    .generateKeyStoreIfNotExists(tenantDomain, KEY_STORE_CONTEXT);
                             boolean isValid = IdentityUtil.validateSignatureFromTenant(valueString, signature,
                                     tenantDomain, KEY_STORE_CONTEXT);
                             if (!isValid) {

diff --git a/.../java/org/wso2/carbon/identity/conditional/auth/functions/http/GetCookieFunctionImpl.java b/.../java/org/wso2/carbon/identity/conditional/auth/functions/http/GetCookieFunctionImpl.java
@@ -106,10 +106,6 @@ public String getCookieValue(JsServletRequest request, Object... params) {
                         try {
                             String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext()
                                     .getTenantDomain();
-                            // For getCookie, setCookie functionalities tenant shouldn't use its tenanted keystore.
-                            // Hence, below code will create a keystore for this context if not exists.
-                            HTTPFunctionsServiceHolder.getInstance().getIdentityKeyStoreGenerator()
-                                    .generateKeyStoreIfNotExists(tenantDomain, KEY_STORE_CONTEXT);
                             boolean isValid = IdentityUtil.validateSignatureFromTenant(valueString, signature,
                                     tenantDomain, KEY_STORE_CONTEXT);
                             if (!isValid) {

diff --git a/.../java/org/wso2/carbon/identity/conditional/auth/functions/http/SetCookieFunctionImpl.java b/.../java/org/wso2/carbon/identity/conditional/auth/functions/http/SetCookieFunctionImpl.java
@@ -74,7 +74,7 @@ public void setCookie(JsServletResponse response, String name, Object... params)
                     // For getCookie, setCookie functionalities tenant shouldn't use its tenanted keystore.
                     // Hence, below code will create a keystore for this context if not exists.
                     HTTPFunctionsServiceHolder.getInstance().getIdentityKeyStoreGenerator()
-                            .generateKeyStoreIfNotExists(tenantDomain, KEY_STORE_CONTEXT);
+                            .generateKeyStore(tenantDomain, KEY_STORE_CONTEXT);
                     signature = Base64.encode(IdentityUtil.signWithTenantKey(value, tenantDomain, KEY_STORE_CONTEXT));
                 } catch (Exception e) {
                     log.error("Error occurred when signing the cookie value.", e);