Merge pull request #128 from Adyen/develop

Release 6.0.0
Adyen · Aug 1, 2019 · f023a1b · f023a1b
2 parents f07c2d5 + 0c604d9
commit f023a1b
Show file tree

Hide file tree

Showing 23 changed files with 219 additions and 83 deletions.
diff --git a/...ratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenSummaryCheckoutStepController.java b/...ratoraddon/web/src/com/adyen/v6/controllers/pages/AdyenSummaryCheckoutStepController.java
@@ -22,6 +22,7 @@
 
 import java.net.UnknownHostException;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
 import javax.annotation.Resource;
@@ -81,7 +82,7 @@
 import static com.adyen.v6.constants.Adyenv6coreConstants.RATEPAY;
 import static com.adyen.v6.constants.Adyenv6coreConstants.PAYMENT_METHOD_MULTIBANCO;
 import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.MODEL_CHECKOUT_SHOPPER_HOST;
-import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.MODEL_ORIGIN_KEY;
+import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.MODEL_ENVIRONMENT_MODE;
 
 @Controller
 @RequestMapping(value = AdyenControllerConstants.SUMMARY_CHECKOUT_PREFIX)
@@ -92,6 +93,7 @@ public class AdyenSummaryCheckoutStepController extends AbstractCheckoutStepCont
     private static final String AUTHORISE_3D_SECURE_PAYMENT_URL = "/authorise-3d-adyen-response";
     private static final String HPP_RESULT_URL = "/hpp-adyen-response";
     private static final String ADYEN_PAYLOAD = "payload";
+    private static final String REDIRECT_RESULT = "redirectResult";
 
     @Resource(name = "siteBaseUrlResolutionService")
     private SiteBaseUrlResolutionService siteBaseUrlResolutionService;
@@ -208,20 +210,20 @@ public String placeOrder(@ModelAttribute("placeOrderForm") final PlaceOrderForm
                     errorMessage = getErrorMessageByRefusalReason(paymentsResponse.getRefusalReason());
                 }
                 if (IDENTIFYSHOPPER == paymentsResponse.getResultCode()) {
-                    if (adyenPaymentMethod.equals(PAYMENT_METHOD_CC)|| adyenPaymentMethod.indexOf(PAYMENT_METHOD_ONECLICK) == 0) {
+                    if (adyenPaymentMethod.equals(PAYMENT_METHOD_CC) || adyenPaymentMethod.indexOf(PAYMENT_METHOD_ONECLICK) == 0) {
                         model.addAttribute(MODEL_CHECKOUT_SHOPPER_HOST, adyenCheckoutFacade.getCheckoutShopperHost());
+                        model.addAttribute(MODEL_ENVIRONMENT_MODE, adyenCheckoutFacade.getEnvironmentMode());
                         model.addAttribute(SHOPPER_LOCALE, adyenCheckoutFacade.getShopperLocale());
-                        model.addAttribute(MODEL_ORIGIN_KEY, adyenCheckoutFacade.getOriginKey());
                         model.addAttribute(PAYMENT_DATA, paymentsResponse.getPaymentData());
                         model.addAttribute(FINGERPRINT_TOKEN, paymentsResponse.getAuthentication().get(THREEDS2_FINGERPRINT_TOKEN));
                         return AdyenControllerConstants.Views.Pages.MultiStepCheckout.Validate3DS2PaymentPage;
                     }
                 }
                 if (CHALLENGESHOPPER == paymentsResponse.getResultCode()) {
-                    if (adyenPaymentMethod.equals(PAYMENT_METHOD_CC)|| adyenPaymentMethod.indexOf(PAYMENT_METHOD_ONECLICK) == 0) {
+                    if (adyenPaymentMethod.equals(PAYMENT_METHOD_CC) || adyenPaymentMethod.indexOf(PAYMENT_METHOD_ONECLICK) == 0) {
                         model.addAttribute(MODEL_CHECKOUT_SHOPPER_HOST, adyenCheckoutFacade.getCheckoutShopperHost());
+                        model.addAttribute(MODEL_ENVIRONMENT_MODE, adyenCheckoutFacade.getEnvironmentMode());
                         model.addAttribute(SHOPPER_LOCALE, adyenCheckoutFacade.getShopperLocale());
-                        model.addAttribute(MODEL_ORIGIN_KEY, adyenCheckoutFacade.getOriginKey());
                         model.addAttribute(PAYMENT_DATA, paymentsResponse.getPaymentData());
                         model.addAttribute(CHALLENGE_TOKEN, paymentsResponse.getAuthentication().get(THREEDS2_CHALLENGE_TOKEN));
                         return AdyenControllerConstants.Views.Pages.MultiStepCheckout.Validate3DS2PaymentPage;
@@ -251,8 +253,8 @@ public String authorise3DS2Payment(final Model model,
             PaymentsResponse paymentsResponse = e.getPaymentsResponse();
             if (paymentsResponse != null && paymentsResponse.getResultCode() == CHALLENGESHOPPER) {
                 model.addAttribute(MODEL_CHECKOUT_SHOPPER_HOST, adyenCheckoutFacade.getCheckoutShopperHost());
+                model.addAttribute(MODEL_ENVIRONMENT_MODE, adyenCheckoutFacade.getEnvironmentMode());
                 model.addAttribute(SHOPPER_LOCALE, adyenCheckoutFacade.getShopperLocale());
-                model.addAttribute(MODEL_ORIGIN_KEY, adyenCheckoutFacade.getOriginKey());
                 model.addAttribute(PAYMENT_DATA, paymentsResponse.getPaymentData());
                 model.addAttribute(CHALLENGE_TOKEN, paymentsResponse.getAuthentication().get("threeds2.challengeToken"));
                 return AdyenControllerConstants.Views.Pages.MultiStepCheckout.Validate3DS2PaymentPage;
@@ -264,7 +266,7 @@ public String authorise3DS2Payment(final Model model,
             LOGGER.debug("Redirecting to summary" + errorMessage);
             return redirectToSummaryWithError(redirectModel, errorMessage);
         }
-        LOGGER.debug("Redirecting to final step of checkout" +errorMessage);
+        LOGGER.debug("Redirecting to final step of checkout" + errorMessage);
         return redirectToSummaryWithError(redirectModel, errorMessage);
     }
 
@@ -298,11 +300,19 @@ public String authorise3DSecurePayment(final Model model,
     @RequestMapping(value = HPP_RESULT_URL, method = RequestMethod.GET)
     @RequireHardLogIn
     public String handleAdyenResponse(final HttpServletRequest request, final RedirectAttributes redirectModel) {
-        //Compose HPP response data map
         String payload = request.getParameter(ADYEN_PAYLOAD);
+        String redirectResult = request.getParameter(REDIRECT_RESULT);
+        HashMap<String, String> details = new HashMap<>();
+
+        if (payload != null && ! payload.isEmpty()) {
+            details.put(ADYEN_PAYLOAD, payload);
+        }
+        if (redirectResult != null && ! redirectResult.isEmpty()) {
+            details.put(REDIRECT_RESULT, redirectResult);
+        }
 
         try {
-            PaymentsResponse response = adyenCheckoutFacade.handleRedirectPayload(payload);
+            PaymentsResponse response = adyenCheckoutFacade.handleRedirectPayload(details);
 
             switch (response.getResultCode()) {
                 case AUTHORISED:
@@ -352,12 +362,20 @@ private void addMultibancoMessage(RedirectAttributes redirectModel, final String
 
         GlobalMessages.addFlashMessage(redirectModel,
                                        GlobalMessages.INFO_MESSAGES_HOLDER,
-                                       "<p> Multibanco order summary " + "</p>" +
-                                       "<p> Amount: "  + orderData.getAdyenMultibancoAmount() + "</p>"
-                                               + "<p> Entity: "  + orderData.getAdyenMultibancoEntity() + "</p>"
-                                               + "<p> Deadline: "  + orderData.getAdyenMultibancoDeadline() + "</p>"
-                                               + "<p> Reference: "  + orderData.getAdyenMultibancoReference() + "</p>"
-        );
+                                       "<p> Multibanco order summary "
+                                               + "</p>"
+                                               + "<p> Amount: "
+                                               + orderData.getAdyenMultibancoAmount()
+                                               + "</p>"
+                                               + "<p> Entity: "
+                                               + orderData.getAdyenMultibancoEntity()
+                                               + "</p>"
+                                               + "<p> Deadline: "
+                                               + orderData.getAdyenMultibancoDeadline()
+                                               + "</p>"
+                                               + "<p> Reference: "
+                                               + orderData.getAdyenMultibancoReference()
+                                               + "</p>");
     }
 
     /**

diff --git a/.../adyen/v6/controllers/pages/checkout/steps/SelectPaymentMethodCheckoutStepController.java b/.../adyen/v6/controllers/pages/checkout/steps/SelectPaymentMethodCheckoutStepController.java
@@ -20,20 +20,25 @@
  */
 package com.adyen.v6.controllers.pages.checkout.steps;
 
+import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.List;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+import com.adyen.service.exception.ApiException;
 import com.adyen.v6.constants.AdyenControllerConstants;
 import com.adyen.v6.facades.AdyenCheckoutFacade;
 import com.adyen.v6.forms.AdyenPaymentForm;
@@ -44,6 +49,7 @@
 import de.hybris.platform.cms2.exceptions.CMSItemNotFoundException;
 import de.hybris.platform.cms2.model.pages.ContentPageModel;
 import de.hybris.platform.commercefacades.order.data.CartData;
+import static com.adyen.v6.facades.DefaultAdyenCheckoutFacade.MODEL_ORIGIN_KEY;
 import static de.hybris.platform.acceleratorstorefrontcommons.constants.WebConstants.BREADCRUMBS_KEY;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
 import static org.springframework.web.bind.annotation.RequestMethod.POST;
@@ -65,6 +71,9 @@ public class SelectPaymentMethodCheckoutStepController extends AbstractCheckoutS
     @Resource(name = "adyenCheckoutFacade")
     private AdyenCheckoutFacade adyenCheckoutFacade;
 
+    @Autowired
+    private HttpServletRequest httpServletRequest;
+
     /**
      * {@inheritDoc}
      */
@@ -84,6 +93,14 @@ public String enterStep(final Model model, final RedirectAttributes redirectAttr
         model.addAttribute(CART_DATA_ATTR, cartData);
         model.addAttribute("expiryYears", getExpiryYears());
 
+        try {
+            model.addAttribute(MODEL_ORIGIN_KEY, adyenCheckoutFacade.getOriginKey(httpServletRequest));
+        } catch (IOException e) {
+            LOGGER.error("Exception occurred during getting the origin key" + ExceptionUtils.getStackTrace(e));
+        } catch (ApiException e) {
+            LOGGER.error("Exception occurred during getting origin key" + ExceptionUtils.getStackTrace(e));
+        }
+
         adyenCheckoutFacade.initializeCheckoutData(model);
 
         super.prepareDataForPage(model);

diff --git a/...celeratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/3ds2_payment.jsp b/...celeratoraddon/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/3ds2_payment.jsp
@@ -3,16 +3,15 @@
 <html>
 <head>
 
-    <script type="text/javascript" src="https://${checkoutShopperHost}/checkoutshopper/sdk/2.5.0/adyen.js"></script>
-    <link rel="stylesheet" href="https://${checkoutShopperHost}/checkoutshopper/sdk/2.5.0/adyen.css"/>
+    <script type="text/javascript" src="https://${checkoutShopperHost}/checkoutshopper/sdk/3.0.0/adyen.js"></script>
+    <link rel="stylesheet" href="https://${checkoutShopperHost}/checkoutshopper/sdk/3.0.0/adyen.css"/>
 
     <script type="text/javascript">
 
-        function initiateCheckout ( locale, loadingContext, originKey ) {
+        function initiateCheckout ( locale, environmentMode ) {
             var configuration = {
                 locale: locale,// shopper's locale
-                loadingContext: loadingContext,
-                originKey: originKey,
+                environment: environmentMode, //test or live
                 risk: {
                     enabled: false
                 }
@@ -21,7 +20,7 @@
         }
 
         function perform3DS2Operations () {
-            initiateCheckout( "${shopperLocale}", "https://${checkoutShopperHost}/checkoutshopper/", "${originKey}" );
+            initiateCheckout( "${shopperLocale}", "${environmentMode}" );
             var challengeToken = "${challengeToken}";
             var fingerprintToken = "${fingerprintToken}";
             if ( challengeToken ) {

diff --git a/...don/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/selectPaymentMethodPage.jsp b/...don/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/selectPaymentMethodPage.jsp
@@ -17,12 +17,12 @@
 <template:page pageTitle="${pageTitle}" hideHeaderLinks="true">
     <jsp:attribute name="pageScripts">
         <script type="text/javascript" src="${dfUrl}"></script>
-        <script type="text/javascript" src="https://${checkoutShopperHost}/checkoutshopper/sdk/2.5.0/adyen.js"></script>
+        <script type="text/javascript" src="https://${checkoutShopperHost}/checkoutshopper/sdk/3.0.0/adyen.js"></script>
         <link rel="stylesheet" href="https://checkoutshopper-live.adyen.com/checkoutshopper/css/chckt-default-v1.css"/>
-        <link rel="stylesheet" href="https://${checkoutShopperHost}/checkoutshopper/sdk/2.5.0/adyen.css"/>
+        <link rel="stylesheet" href="https://${checkoutShopperHost}/checkoutshopper/sdk/3.0.0/adyen.css"/>
 
         <script type="text/javascript">
-            AdyenCheckoutHybris.initiateCheckout("${shopperLocale}", "https://${checkoutShopperHost}/checkoutshopper/", "${originKey}" );
+            AdyenCheckoutHybris.initiateCheckout("${shopperLocale}", "${environmentMode}", "${originKey}" );
 
             <c:if test="${not empty allowedCards}">
             //Set the allowed cards

diff --git a/...6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen.checkout.js b/...6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen.checkout.js
@@ -25,7 +25,7 @@ var AdyenCheckoutHybris = (function () {
 
             // Check if it is a valid card and encrypt
             if ( paymentMethod === "adyen_cc" ) {
-                if (!this.card.isValid()) {
+                if (!this.card.isValid) {
                     window.alert('This credit card is not allowed');
                     return false;
                 }
@@ -36,15 +36,15 @@ var AdyenCheckoutHybris = (function () {
                 var recurringReference = paymentMethod.slice("adyen_oneclick_".length);
                 var oneClickCard = this.oneClickCards[recurringReference];
 
-                if (!(oneClickCard && oneClickCard.isValid())) {
+                if (!(oneClickCard && oneClickCard.isValid)) {
                     window.alert('This credit card is not allowed');
                     return false;
                 }
                 if ( (oneClickCard.props.type == "bcmc") ) {
                     this.copyOneClickCardDataBCMC( recurringReference )
                 }
                 else {
-                    this.copyOneClickCardData( recurringReference, oneClickCard.state.data.encryptedSecurityCode );
+                    this.copyOneClickCardData( recurringReference, oneClickCard.data.paymentMethod.encryptedSecurityCode );
                 }
             }
 
@@ -54,14 +54,14 @@ var AdyenCheckoutHybris = (function () {
         },
 
         copyCardData: function() {
-            var state = this.card.state.data;
+            var state = this.card.data.paymentMethod;
             $( 'input[name="encryptedCardNumber"]' ).val( state.encryptedCardNumber );
             $( 'input[name="encryptedExpiryMonth"]' ).val( state.encryptedExpiryMonth );
             $( 'input[name="encryptedExpiryYear"]' ).val( state.encryptedExpiryYear );
             $( 'input[name="encryptedSecurityCode"]' ).val( state.encryptedSecurityCode );
             $( 'input[name="cardHolder"]' ).val( state.holderName );
-            if(state.storeDetails!=null){
-            $( 'input[name="rememberTheseDetails"]' ).val( state.storeDetails );}
+            if(this.card.data.storePaymentMethod!=null){
+            $( 'input[name="rememberTheseDetails"]' ).val( this.card.data.storePaymentMethod );}
 
         },
 
@@ -118,10 +118,10 @@ var AdyenCheckoutHybris = (function () {
         createDfValue: function () {
             window.dfDo( "dfValue" );
         },
-        initiateCheckout: function ( locale, loadingContext, originKey ) {
+        initiateCheckout: function ( locale, environment, originKey ) {
             var configuration = {
                 locale: locale,// shopper's locale
-                loadingContext: loadingContext,
+                environment: environment,
                 originKey: originKey,
                 risk: {
                     enabled: false
@@ -180,7 +180,7 @@ var AdyenCheckoutHybris = (function () {
 
             function handleChange(event) {
                 var issuerIdField = document.getElementById('issuerId');
-                var issuerId = event.data.issuer;
+                var issuerId = event.data.paymentMethod.issuer;
                 issuerIdField.value = issuerId;
             }
 

diff --git a/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon.build.number b/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon.build.number
@@ -7,5 +7,5 @@ module.name=platform-module
 name=adyenv6b2ccheckoutaddon
 releasedate=20170509 1903
 vendor=adyen
-version=5.0.0
-version.api=5.0.0
+version=6.0.0
+version.api=6.0.0
diff --git a/adyenv6backoffice/resources/adyenv6backoffice-backoffice-config.xml b/adyenv6backoffice/resources/adyenv6backoffice-backoffice-config.xml
@@ -28,11 +28,10 @@
                     <editorArea:attribute qualifier="adyenRecurringContractMode"/>
 					<editorArea:attribute qualifier="adyenTestMode"/>
                 </editorArea:section>
-				<editorArea:section name="hmc.adyen.api">
-					<editorArea:attribute qualifier="adyenAPIEndpointPrefix"/>
-					<editorArea:attribute qualifier="adyenAPIKey" editor="com.hybris.cockpitng.editor.defaultpassword"/>
-					<editorArea:attribute qualifier="adyenOriginKey"/>
-				</editorArea:section>
+                <editorArea:section name="hmc.adyen.api">
+                    <editorArea:attribute qualifier="adyenAPIEndpointPrefix"/>
+                    <editorArea:attribute qualifier="adyenAPIKey" editor="com.hybris.cockpitng.editor.defaultpassword"/>
+                </editorArea:section>
 				<editorArea:section name="hmc.adyen.hpp">
 					<editorArea:attribute qualifier="adyenSkinCode"/>
 					<editorArea:attribute qualifier="adyenSkinHMAC" editor="com.hybris.cockpitng.editor.defaultpassword"/>

diff --git a/adyenv6backoffice/resources/adyenv6backoffice.build.number b/adyenv6backoffice/resources/adyenv6backoffice.build.number
@@ -7,5 +7,5 @@ module.name=platform-module
 name=adyenv6backoffice
 releasedate=20170509 1903
 vendor=adyen
-version=5.0.0
-version.api=5.0.0
+version=6.0.0
+version.api=6.0.0
diff --git a/adyenv6core/lib/adyen-java-api-library-2.1.0-rc.jar b/adyenv6core/lib/adyen-java-api-library-2.1.0-rc.jar
diff --git a/adyenv6core/lib/adyen-java-api-library-2.4.1.jar b/adyenv6core/lib/adyen-java-api-library-2.4.1.jar
diff --git a/adyenv6core/resources/adyenv6core-items.xml b/adyenv6core/resources/adyenv6core-items.xml
@@ -161,14 +161,6 @@
                     <description>Merchant account name</description>
                     <persistence type="property"/>
                 </attribute>
-                <attribute qualifier="adyenOriginKey" type="java.lang.String">
-                    <description>WS User Origin key</description>
-                    <persistence type="property">
-                        <columntype>
-                            <value>HYBRIS.LONG_STRING</value>
-                        </columntype>
-                    </persistence>
-                </attribute>
                 <attribute qualifier="adyenSkinCode" type="java.lang.String">
                     <description>HPP skin code</description>
                     <persistence type="property"/>

diff --git a/adyenv6core/resources/adyenv6core.build.number b/adyenv6core/resources/adyenv6core.build.number
@@ -6,5 +6,5 @@ group.id=com.adyen.v6
 module.name=platform-module
 name=adyenv6core
 vendor=adyen
-version=5.0.0
-version.api=5.0.0
+version=6.0.0
+version.api=6.0.0
diff --git a/adyenv6core/resources/localization/adyenv6core-locales_en.properties b/adyenv6core/resources/localization/adyenv6core-locales_en.properties
@@ -24,8 +24,6 @@ type.basestore.adyenNotificationPassword.name=Server Communication HTTP Basic pa
 type.basestore.adyenNotificationPassword.description=Set your own password and copy it over to Adyen Customer Area => Settings => Server Communication => Standard Notification => Password.
 type.basestore.adyenMerchantAccount.name=Merchant account name
 type.basestore.adyenMerchantAccount.description=The merchant account identifier you want to process the (transaction) request with. Find this at the top of the screen in the Adyen Customer Area (CA), where you will see [YourCompanyAccount] > [YourMerchantAccount] .
-type.basestore.adyenOriginKey.name=WS User Origin Key
-type.basestore.adyenOriginKey.description=Copy this from the Adyen Customer Area > Settings > Users > System (from the dropdown) > [web service user] > Origin key.
 type.basestore.adyenSkinCode.name=HPP skin code
 type.basestore.adyenSkinCode.description=Copy and paste the skin code of the skin you want to use from Customer Area => Skins. Leave empty to disable Alternative Payment Methods.
 type.basestore.adyenSkinHMAC.name=HPP skin HMAC key