Added 25.2.0 changes from private repo.

rharot-visa · rharot-visa · commit 965431a6d178 · 2025-03-18T19:10:44.000Z
diff --git a/documentation/CJL/CJL.md b/documentation/CJL/CJL.md
@@ -2,7 +2,7 @@
 
 ## CJL - Core Java Library <!-- omit in toc -->
 
-**Version 25.1.0**
+**Version 25.2.0**
 March 2025
 
 ## Contents <!-- omit in toc -->
diff --git a/documentation/sap-commerce.md b/documentation/sap-commerce.md
@@ -3,7 +3,7 @@
 
 ## SAP Commerce <!-- omit in toc -->
 
-**Version 25.1.0**
+**Version 25.2.0**
 March 2025
 
 ## Contents <!-- omit in toc -->
@@ -161,6 +161,7 @@ March 2025
 | March 2021    | 3.2.0                        | - SAP Commerce upgrade to 2011 |
 | February 2024 | 24.1.0                       | - Upgraded Cybersource REST Client SDK to version 0.0.58 |
 | March 2025    | 25.1.0                       | - Dependencies version upgraded <br>- Security Scan Fixes <br>- Changed the authentication mechanism for SOAP API to P12 Authentication |
+| March 2025    | 25.2.0                       | - Microform v2 upgrade |
 
 ### Audience and Purpose
 
@@ -311,7 +312,7 @@ All technical installation concepts in this document are initial draft provided
 The following components are required:
 
 1. SAP Commerce platform release v2011
-2. sap-commerce-payment-plugin-25.1.0.zip
+2. sap-commerce-payment-plugin-25.2.0.zip
 3. Java 11
 4. Required Dependencies installed in maven repository
 
diff --git a/hybris/bin/b2b/isvb2bpaymentaddon/resources/isvb2bpaymentaddon.build.number b/hybris/bin/b2b/isvb2bpaymentaddon/resources/isvb2bpaymentaddon.build.number
@@ -5,5 +5,5 @@ name=isvb2bpaymentaddon
 builddate=20210318 1419
 releasedate=20210318 1509
 vendor=isv.sap
-version=25.1.0
+version=25.2.0
 version.api=2011
diff --git a/hybris/bin/b2b/isvfulfilmentprocess/resources/isvfulfilmentprocess.build.number b/hybris/bin/b2b/isvfulfilmentprocess/resources/isvfulfilmentprocess.build.number
@@ -5,5 +5,5 @@ name=isvfulfilmentprocess
 builddate=20210318 1419
 releasedate=20210318 1509
 vendor=isv.sap
-version=25.1.0
+version=25.2.0
 version.api=2011
diff --git a/hybris/bin/b2b/isvpayment/project.properties b/hybris/bin/b2b/isvpayment/project.properties
@@ -44,7 +44,7 @@ ext.isvpayment.extension.usemaven=true
 
 # Please contact your ISV Account representative to obtain a value for these fields
 isv.payment.customer.request.developer.id=<merchantID>
-isv.payment.customer.request.partnerSolution.id=GL89J8L0
+isv.payment.customer.request.partnerSolution.id=GM03SKIH
 
 # The environment the code base is running on. Please update accordingly
 isv.payment.customer.request.client.environment=<environment>
diff --git a/hybris/bin/b2b/isvpayment/resources/isvpayment.build.number b/hybris/bin/b2b/isvpayment/resources/isvpayment.build.number
@@ -5,5 +5,5 @@ name=isvpayment
 builddate=20210318 1419
 releasedate=20210318 1509
 vendor=isv.sap
-version=25.1.0
+version=25.2.0
 version.api=2011
diff --git a/hybris/bin/b2b/isvpayment/resources/version.info b/hybris/bin/b2b/isvpayment/resources/version.info
@@ -1,2 +1,2 @@
-build_version=25.1.0
+build_version=25.2.0
 build_number=null
diff --git a/hybris/bin/b2b/isvpaymentaddon/resources/isvpaymentaddon.build.number b/hybris/bin/b2b/isvpaymentaddon/resources/isvpaymentaddon.build.number
@@ -5,5 +5,5 @@ name=isvpaymentaddon
 builddate=20210318 1419
 releasedate=20210318 1509
 vendor=isv.sap
-version=25.1.0
+version=25.2.0
 version.api=2011
diff --git a/hybris/bin/b2b/isvpaymentsampledata/resources/isvpaymentsampledata.build.number b/hybris/bin/b2b/isvpaymentsampledata/resources/isvpaymentsampledata.build.number
@@ -5,5 +5,5 @@ name=isvpaymentsampledata
 builddate=20210318 1419
 releasedate=20210318 1509
 vendor=isv.sap
-version=25.1.0
+version=25.2.0
 version.api=2011
diff --git a/hybris/bin/b2c/isvb2cpaymentaddon/acceleratoraddon/web/src/isv/sap/payment/addon/b2c/controllers/pages/checkout/payment/flex/FlexMicroformController.java b/hybris/bin/b2c/isvb2cpaymentaddon/acceleratoraddon/web/src/isv/sap/payment/addon/b2c/controllers/pages/checkout/payment/flex/FlexMicroformController.java
@@ -3,7 +3,8 @@
 import java.util.Map;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpSession;
-
+// import org.apache.commons.lang3.ObjectUtils;
+ 
 import com.cybersource.flex.sdk.CaptureContext;
 import de.hybris.platform.acceleratorstorefrontcommons.controllers.pages.AbstractCheckoutController;
 import de.hybris.platform.commercefacades.order.data.AbstractOrderData;
@@ -40,6 +41,7 @@
 
 //OLH: For Reflected XSS fix. Used to sanitize some text
 import org.apache.commons.text.StringEscapeUtils;
+import isv.sap.payment.addon.utils.AjaxResponse;
 
 @Controller
 @RequestMapping(path = "/checkout/payment/flex")
@@ -67,18 +69,24 @@ public class FlexMicroformController extends AbstractCheckoutController
 
     @GetMapping(value = "/newJwk", produces = MediaType.APPLICATION_JSON_VALUE)
     @ResponseBody
-    public String newJwk(final HttpSession session, final UriComponentsBuilder uriComponentsBuilder)
+    public AjaxResponse newJwk(final HttpSession session, final UriComponentsBuilder uriComponentsBuilder)
     {
         final String targetOrigin = uriComponentsBuilder
                 .replacePath(null).replaceQuery(null).userInfo(null).fragment(null)
                 .build()
                 .toUriString();
+        final Map<String, String> captureContext = flexService.createKey(targetOrigin);
 
-        final CaptureContext captureContext = flexService.createKey(targetOrigin);
+        session.setAttribute(FLEX_CAPTURE_CONTEXT_ATTRIBUTE, captureContext.get("captureContext"));
 
-        session.setAttribute(FLEX_CAPTURE_CONTEXT_ATTRIBUTE, captureContext.toString());
+        // session.setAttribute("clientLiberary", captureContext.get("clientLiberary"));
+        // session.setAttribute("clientLibraryIntegrity",captureContext.get("clientLibraryIntegrity"));
+        return AjaxResponse.success()
+                        .put("captureContext", captureContext.get("captureContext"))
+                        .put("clientLibrary", captureContext.get("clientLibrary"))
+.put("clientLibraryIntegrity", captureContext.get("clientLibraryIntegrity"));
 
-        return captureContext.toString();
+        // return captureContext.get("captureContext");
     }
 
     @PostMapping(value = "/verifyToken", consumes = MediaType.APPLICATION_JSON_VALUE)
diff --git a/hybris/bin/b2c/isvb2cpaymentaddon/acceleratoraddon/web/src/isv/sap/payment/addon/b2c/controllers/pages/checkout/steps/SummaryCheckoutStepController.java b/hybris/bin/b2c/isvb2cpaymentaddon/acceleratoraddon/web/src/isv/sap/payment/addon/b2c/controllers/pages/checkout/steps/SummaryCheckoutStepController.java
@@ -93,9 +93,6 @@ public class SummaryCheckoutStepController extends AbstractCheckoutStepControlle
     @Value("${klarna.sdk.url}")
     private String klarnaSDKUrl;
 
-    @Value("${isv.payment.flex.microform.sdk.url}")
-    private String flexSDKUrl;
-
     @Value("${isv.payment.flex.card.type.selection}")
     private boolean flexCardTypeSelection;
 
@@ -265,7 +262,6 @@ protected void prepareFlexMicroformData(final Model model)
     {
         if (checkoutPciStrategy.getSubscriptionPciOption().equals(FLEX))
         {
-                model.addAttribute("flexSdkUrl", flexSDKUrl);
                 model.addAttribute("flexCardTypeSelection", flexCardTypeSelection);
 
         }
diff --git a/hybris/bin/b2c/isvb2cpaymentaddon/resources/isvb2cpaymentaddon.build.number b/hybris/bin/b2c/isvb2cpaymentaddon/resources/isvb2cpaymentaddon.build.number
@@ -5,5 +5,5 @@ name=isvb2cpaymentaddon
 builddate=20210318 1419
 releasedate=20210318 1509
 vendor=isv.sap
-version=25.1.0
+version=25.2.0
 version.api=2011
diff --git a/hybris/bin/b2c/isvfulfilmentprocess/resources/isvfulfilmentprocess.build.number b/hybris/bin/b2c/isvfulfilmentprocess/resources/isvfulfilmentprocess.build.number
@@ -5,5 +5,5 @@ name=isvfulfilmentprocess
 builddate=20210318 1419
 releasedate=20210318 1509
 vendor=isv.sap
-version=25.1.0
+version=25.2.0
 version.api=2011
diff --git a/hybris/bin/b2c/isvpayment/project.properties b/hybris/bin/b2c/isvpayment/project.properties
@@ -44,7 +44,7 @@ ext.isvpayment.extension.usemaven=true
 
 # Please contact your ISV Account representative to obtain a value for these fields
 isv.payment.customer.request.developer.id=<merchantID>
-isv.payment.customer.request.partnerSolution.id=GL89J8L0
+isv.payment.customer.request.partnerSolution.id=GM03SKIH
 
 # The environment the code base is running on. Please update accordingly
 isv.payment.customer.request.client.environment=<environment>
@@ -229,6 +229,8 @@ isv.payment.card.to.commerceIndicator.002=spa
 isv.payment.card.to.commerceIndicator.003=aesk
 isv.payment.card.to.commerceIndicator.004=dipb
 
+isv.payment.network.to.allowedCardType=VISA,MAESTRO,MASTERCARD,AMEX,DISCOVER,DINERSCLUB,JCB,CUP,CARTESBANCAIRES
+
 isv.payment.network.to.cardType.visa=VISA
 isv.payment.network.to.cardType.amex=AMEX
 isv.payment.network.to.cardType.mastercard=MASTERCARD_EUROCARD
diff --git a/hybris/bin/b2c/isvpayment/resources/isvpayment.build.number b/hybris/bin/b2c/isvpayment/resources/isvpayment.build.number
@@ -5,5 +5,5 @@ name=isvpayment
 builddate=20210318 1419
 releasedate=20210318 1509
 vendor=isv.sap
-version=25.1.0
+version=25.2.0
 version.api=2011
diff --git a/hybris/bin/b2c/isvpayment/resources/version.info b/hybris/bin/b2c/isvpayment/resources/version.info
@@ -1,2 +1,2 @@
-build_version=25.1.0
+build_version=25.2.0
 build_number=null
diff --git a/hybris/bin/b2c/isvpaymentaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/payment/flex/microform.tag b/hybris/bin/b2c/isvpaymentaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/payment/flex/microform.tag
diff --git a/hybris/bin/b2c/isvpaymentaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/payment/flexCardPaymentDetails.jsp b/hybris/bin/b2c/isvpaymentaddon/acceleratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/payment/flexCardPaymentDetails.jsp
diff --git a/hybris/bin/b2c/isvpaymentaddon/resources/isvpaymentaddon.build.number b/hybris/bin/b2c/isvpaymentaddon/resources/isvpaymentaddon.build.number
diff --git a/hybris/bin/b2c/isvpaymentsampledata/resources/isvpaymentsampledata.build.number b/hybris/bin/b2c/isvpaymentsampledata/resources/isvpaymentsampledata.build.number

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-build_version=25.1.0`
	`1`	`+build_version=25.2.0`
`2`	`2`	`build_number=null`
Original file line number	Diff line number	Diff line change
`@@ -93,9 +93,6 @@ public class SummaryCheckoutStepController extends AbstractCheckoutStepControlle`
`93`	`93`	`@Value("${klarna.sdk.url}")`
`94`	`94`	`private String klarnaSDKUrl;`
`95`	`95`
`96`		`- @Value("${isv.payment.flex.microform.sdk.url}")`
`97`		`- private String flexSDKUrl;`
`98`		`-`
`99`	`96`	`@Value("${isv.payment.flex.card.type.selection}")`
`100`	`97`	`private boolean flexCardTypeSelection;`
`101`	`98`
`@@ -265,7 +262,6 @@ protected void prepareFlexMicroformData(final Model model)`
`265`	`262`	`{`
`266`	`263`	`if (checkoutPciStrategy.getSubscriptionPciOption().equals(FLEX))`
`267`	`264`	`{`
`268`		`- model.addAttribute("flexSdkUrl", flexSDKUrl);`
`269`	`265`	`model.addAttribute("flexCardTypeSelection", flexCardTypeSelection);`
`270`	`266`
`271`	`267`	`}`