Merge pull request #28 from CyberSource/v25.2.0

release V25.2.0

Author: ohernandovisa

.gitignore

@@ -2,3 +2,4 @@ int_cybersource_sfra/node_modules
 int_cybersource_sfra/.vscode
 **/dw.json
 node_modules
+.DS_Store

README.md

@@ -3,9 +3,9 @@
 
 * **Description:**  Cybersource, a Visa solution, is the only global, modular payment management platform built on secure Visa infrastructure with the payment reach and fraud insights of a massive $500B+ global processing network. You can find out more about what Cybersource does [here](https://www.cybersource.com/en-gb.html).
 * **Categories:** Payment Processing, Fraud Detection, Address Validation, Tax Computation
-* **Version:** 25.1.0
+* **Version:** 25.2.0
 * **Compatibility:** <span style="color:red">This version of the Cybersource cartridge is not compatible with versions of SFRA higher than Release 7.0.0. </span>
-This version can be found on the Master branch of the SFRA repository at commit 50ee82face6e0a000f649a51f162e8a3f171531c  [50ee82f] on December , 2024 <span style="color:red">This version is compatible with Salesforce B2C Commerce 22.2 release. <span>
+This version can be found on the Master branch of the SFRA repository on May , 2025 <span style="color:red">This version is compatible with Salesforce B2C Commerce 22.2 release. <span>
 
 ----
 

cartridges/int_cybersource_sfra/README.md

@@ -6,11 +6,11 @@ THe Cybersource cartridge has a link cartridge (`int_cybersource_sfra`) provided
 
 # Getting Started
 
-1 Set node version to 8.11.3
+1 Set node version to 18.19.0
 
 2 Clone this repository.
 
-3 Run `npm install` to install all of the local dependencies (node version 8.x or current LTS release recommended)
+3 Run `npm install` to install all of the local dependencies (node version 18.x or current LTS release recommended)
 
 4 Run `npm run compile:js` from the command line that would compile all client-side JS files. Run `npm run compile:scss` and `npm run compile:fonts` that would do the same for css and fonts.
 

cartridges/int_cybersource_sfra/cartridge/client/default/custom/cybersource-custom.js

@@ -208,8 +208,8 @@ var init = {
         $(document).on('click', '.billingAgreementExpressCheckout', function (e) {
             e.preventDefault();
             var paypalcallback = document.getElementById('paypal_callback').value;
-            paypalcallback = encodeURIComponent(paypalcallback);
-            if(init.verifyUrl(decodeURIComponent(paypalcallback))){
+            var encodedePaypalcallback = encodeURIComponent(paypalcallback);
+            if(init.verifyUrl(decodeURIComponent(encodedePaypalcallback))){
                 var form = $('<form action="' + paypalcallback + '" method="post">'
                         + '</form>');
                 $('body').append(form);

cartridges/int_cybersource_sfra/cartridge/client/default/scss/cyber-source.scss

@@ -71,6 +71,12 @@
 .billing-agreement-container {
 	white-space:nowrap;
 }
+.billingAgreementExpressCheckout {
+    display: block;
+    margin: 0 auto;
+    max-width: 100%;
+    height: auto;
+}
 .checkout-continue{
 	position: relative;
 	box-shadow : none;

cartridges/int_cybersource_sfra/cartridge/controllers/COPlaceOrder.js

@@ -11,167 +11,13 @@ var COHelpers = require('*/cartridge/scripts/checkout/checkoutHelpers');
 var OrderModel = require('*/cartridge/models/order');
 var csrfProtection = require('*/cartridge/scripts/middleware/csrf');
 
-/**
- * function
- * @param {*} args args
- * @returns {*} obj
- */
-function failOrder(args) {
-    var Cybersource = require('*/cartridge/scripts/Cybersource');
-    var orderResult = Cybersource.GetOrder(args.Order);
-    if (orderResult.error) {
-        // eslint-disable-next-line
-        args.PlaceOrderError = orderResult.PlaceOrderError;
-        return args;
-    }
-    var order = orderResult.Order;
-    var PlaceOrderError = args.PlaceOrderError != null ? args.PlaceOrderError : new dw.system.Status(dw.system.Status.ERROR, 'confirm.error.declined', 'Payment Declined');
-    session.privacy.SkipTaxCalculation = false;
-    var failResult = dw.system.Transaction.wrap(function () {
-        OrderMgr.failOrder(order, true);
-        return {
-            error: true,
-            PlaceOrderError: PlaceOrderError
-        };
-    });
-    if (failResult.error) {
-        // eslint-disable-next-line
-        args.PlaceOrderError = failResult.PlaceOrderError;
-    }
-    return args;
-}
-
-/**
- * Create Order and set to NOT CONFIRMED
- * @param {*} orderId orderId
- * @param {*} req req
- * @param {*} res res
- * @param {*} next next
- * @returns {*} obj
- */
-function reviewOrder(orderId, req, res, next) {
-    var currentBasket = BasketMgr.getCurrentBasket();
-    var order = OrderMgr.getOrder(orderId);
-    var fraudDetectionStatus = HookMgr.callHook('app.fraud.detection', 'fraudDetection', currentBasket);
-    var Transaction = require('dw/system/Transaction');
-
-    if (fraudDetectionStatus.status === 'fail') {
-        Transaction.wrap(function () { OrderMgr.failOrder(order, true); });
-        // fraud detection failed
-        req.session.privacyCache.set('fraudDetectionStatus', true);
-        res.redirect(URLUtils.https('Error-ErrorCode', 'err', fraudDetectionStatus.errorCode));
-        return next();
-    }
-
-    COHelpers.sendConfirmationEmail(order, req.locale.id);
-
-    //  Set Order confirmation status to NOT CONFIRMED
-    var Order = require('dw/order/Order');
-    Transaction.wrap(function () {
-        order.setConfirmationStatus(Order.CONFIRMATION_STATUS_NOTCONFIRMED);
-    });
-
-    // Reset usingMultiShip after successful Order placement
-    req.session.privacyCache.set('usingMultiShipping', false);
-    res.redirect(URLUtils.https('COPlaceOrder-SubmitOrderConformation', 'ID', order.orderNo, 'token', order.orderToken));
-    return next();
-}
-
-/**
- * Submit the order and send order confirmation email
- * @param {*} orderId orderId
- * @param {*} req req
- * @param {*} res res
- * @param {*} next next
- * @returns {*} obj
- */
-function submitOrder(orderId, req, res, next) {
-    var currentBasket = BasketMgr.getCurrentBasket();
-    var order = OrderMgr.getOrder(orderId);
-    var fraudDetectionStatus = HookMgr.callHook('app.fraud.detection', 'fraudDetection', currentBasket);
-    var Transaction = require('dw/system/Transaction');
-    var Resource = require('dw/web/Resource');
-
-    if (fraudDetectionStatus.status === 'fail') {
-        Transaction.wrap(function () { OrderMgr.failOrder(order, true); });
-        // fraud detection failed
-        req.session.privacyCache.set('fraudDetectionStatus', true);
-        res.redirect(URLUtils.https('Error-ErrorCode', 'err', fraudDetectionStatus.errorCode));
-        return next();
-    }
-
-    // Place the order
-    var placeOrderResult = COHelpers.placeOrder(order, fraudDetectionStatus);
-    if (placeOrderResult.error) {
-        res.redirect(URLUtils.https('Checkout-Begin', 'stage', 'placeOrder', 'PlaceOrderError', Resource.msg('error.technical', 'checkout', null)));
-        return next();
-    }
-
-    //  Set order confirmation status to not confirmed for REVIEW orders.
-    if (session.privacy.CybersourceFraudDecision === 'REVIEW') {
-        var Order = require('dw/order/Order');
-        Transaction.wrap(function () {
-            order.setConfirmationStatus(Order.CONFIRMATION_STATUS_NOTCONFIRMED);
-        });
-    }
-
-    COHelpers.sendConfirmationEmail(order, req.locale.id);
-    // Reset using MultiShip after successful Order placement
-    req.session.privacyCache.set('usingMultiShipping', false);
-    res.redirect(URLUtils.https('COPlaceOrder-SubmitOrderConformation', 'ID', order.orderNo, 'token', order.orderToken));
-    return next();
-}
-
-/**
- * function
- * @param {*} order order
- * @param {*} req req
- * @param {*} res res
- * @param {*} next next
- * @returns {*} obj
- */
-function submitApplePayOrder(order, req, res, next) {
-    var checkoutHelper = require('*/cartridge/scripts/checkout/checkoutHelpers');
-
-    if (!order && req.querystring.order_token !== order.getOrderToken()) {
-        return next(new Error('Order token does not match'));
-    }
-    // var HookMgr = require('dw/system/HookMgr');
-    var fraudDetectionStatus = HookMgr.callHook('app.fraud.detection', 'fraudDetection', order);
-    var orderPlacementStatus = checkoutHelper.placeOrder(order, fraudDetectionStatus);
-
-    if (orderPlacementStatus.error) {
-        return next(new Error('Could not place order'));
-    }
-
-    var config = {
-        numberOfLineItems: '*'
-    };
-    var orderModel = new OrderModel(order, { config: config });
-    if (!req.currentCustomer.profile) {
-        var passwordForm = server.forms.getForm('newPasswords');
-        passwordForm.clear();
-        res.render('checkout/confirmation/confirmation', {
-            order: orderModel,
-            returningCustomer: false,
-            passwordForm: passwordForm
-        });
-    } else {
-        res.render('checkout/confirmation/confirmation', {
-            order: orderModel,
-            returningCustomer: true
-        });
-    }
-    return next();
-}
-
 // eslint-disable-next-line
 server.use('Submit', csrfProtection.generateToken, function (req, res, next) {
     var order;
     if (!empty(req.querystring.order_id)) {
         order = OrderMgr.getOrder(req.querystring.order_id);
     } else {
-        order = OrderMgr.getOrder(session.privacy.order_id);
+        order = OrderMgr.getOrder(session.privacy.orderId);
     }
     if (!empty(order) && !empty(order.orderToken)) {
         // eslint-disable-next-line
@@ -192,17 +38,17 @@ server.use('Submit', csrfProtection.generateToken, function (req, res, next) {
         var providerResult = Provider.Check(order);
         if (!empty(providerResult)) {
             if (providerResult.pending) {
-                reviewOrder(providerResult.Order.orderNo, req, res, next);
+                COHelpers.reviewOrder(providerResult.Order.orderNo, req, res, next);
                 return next();
             } if (providerResult.load3DRequest) {
                 res.render('cart/payerAuthenticationRedirect');
                 return next();
             } if (providerResult.submit) {
-                submitOrder(providerResult.Order.orderNo, req, res, next);
+                COHelpers.submitOrder(providerResult.Order.orderNo, req, res, next);
                 return next();
             } if (providerResult.error) {
                 var args = { Order: providerResult.Order };
-                failOrder(args);
+                COHelpers.failOrder(args);
                 res.redirect(URLUtils.https('Checkout-Begin', 'stage', 'payment', 'payerAuthError', dw.web.Resource.msg('payerauthentication.carderror', 'cybersource', null)));
                 return next();
             } if (providerResult.cancelfail) {
@@ -232,18 +78,18 @@ server.use('Submit', csrfProtection.generateToken, function (req, res, next) {
             }
         }
     } else if (!empty(paymentInstrument) && paymentInstrument.paymentMethod === 'DW_APPLE_PAY') {
-        submitApplePayOrder(order, req, res, next);
+        COHelpers.submitApplePayOrder(order, req, res, next);
     }
 });
 
 server.get('SilentPostSubmitOrder', csrfProtection.generateToken, function (req, res, next) {
     var orderId = session.privacy.orderId;
-    submitOrder(orderId, req, res, next);
+    COHelpers.submitOrder(orderId, req, res, next);
 });
 
 server.get('SilentPostReviewOrder', csrfProtection.generateToken, function (req, res, next) {
     var orderId = session.privacy.orderId;
-    reviewOrder(orderId, req, res, next);
+    COHelpers.reviewOrder(orderId, req, res, next);
 });
 
 server.get('SubmitOrderConformation', csrfProtection.generateToken, function (req, res, next) {