Release/v12.0.0 alpha

README.md

@@ -24,22 +24,51 @@ SAP Commerce (Hybris) version 2105 or later
 
 ### 2. Add the Adyen extensions to the config/localextensions.xml file
 
-Required for the checkout:
+#### Checkout
+
+Required for accelerator checkout:
 ```
 <extension dir="${HYBRIS_BIN_DIR}/custom/adyen-hybris/adyenv6core"/>
 <extension dir="${HYBRIS_BIN_DIR}/custom/adyen-hybris/adyenv6b2ccheckoutaddon"/>
 <extension dir="${HYBRIS_BIN_DIR}/custom/adyen-hybris/adyenv6backoffice"/>
 ```
+
+Required for headless checkout:
+```
+<extension dir="${HYBRIS_BIN_DIR}/custom/adyen-hybris/adyenv6core"/>
+<extension dir="${HYBRIS_BIN_DIR}/custom/adyen-hybris/adyencheckoutaddonapi"/>
+<extension dir="${HYBRIS_BIN_DIR}/custom/adyen-hybris/adyenv6backoffice"/>
+```
+
+Required for headless checkout api with example React SPA checkout:
+```
+<extension dir="${HYBRIS_BIN_DIR}/custom/adyen-hybris/adyenv6core"/>
+<extension dir="${HYBRIS_BIN_DIR}/custom/adyen-hybris/adyencheckoutaddonapi"/>
+<extension dir="${HYBRIS_BIN_DIR}/custom/adyen-hybris/adyencheckoutaddonspa"/>
+<extension dir="${HYBRIS_BIN_DIR}/custom/adyen-hybris/adyenv6backoffice"/>
+```
+
+#### Notifications
+
 Required for the notifications:
 ```
 <extension dir="${HYBRIS_BIN_DIR}/custom/adyen-hybris/adyenv6notification"/>
 ```
 
+Required for the event driven notifications:
+```
+<extension dir="${HYBRIS_BIN_DIR}/custom/adyen-hybris/adyenv6notificationv2"/>
+```
+
+#### Order management
+
 Additionally, required when using yacceleratorordermanagement (b2c_acc_oms recipe for 6.x and b2c_b2b_acc_oms recipe for 1905) :
 ```
 <extension dir="${HYBRIS_BIN_DIR}/custom/adyen-hybris/adyenv6ordermanagement"/>
 ```
 
+#### Fulfilment
+
 Additionally, required when using yacceleratorfulfilment (b2c_acc recipe for 6.x and b2c_acc_plus for 1905):
 ```
 <extension dir="${HYBRIS_BIN_DIR}/custom/adyen-hybris/adyenv6fulfilmentprocess"/>

adyencheckoutaddonapi/.gitignore

@@ -0,0 +1,39 @@
+eclipsebin/
+.settings/
+.externalToolBuilders/
+.springBeans
+.idea/
+*/platformhome.properties
+*/.pmd
+**.iml
+
+##################
+# Custom Ignores #
+##################
+
+*/.project
+.settings
+.classpath
+*.class
+*/bin/*
+*/target/*
+
+########################
+# Java generated files #
+########################
+*.class
+*.war
+*.ear
+
+##############################
+# hybris Ant generated files #
+##############################
+gensrc/**
+*/build.xml
+extensioninfo.xsd
+hmc.xsd
+platformhome.properties
+*-testclasses.xml
+beans.xsd
+items.xsd
+classes/**

adyencheckoutaddonapi/acceleratoraddon/web/src/com/adyen/commerce/constants/AdyencheckoutaddonapiWebConstants.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2019 SAP SE or an SAP affiliate company. All rights reserved.
+ */
+package com.adyen.commerce.constants;
+
+/**
+ * Global class for all Adyenv6b2ccheckoutaddonv2 web constants. You can add global constants for your extension into this class.
+ */
+public final class AdyencheckoutaddonapiWebConstants
+{
+	private AdyencheckoutaddonapiWebConstants()
+	{
+		//empty to avoid instantiating this constant class
+	}
+
+	public static final String ADYEN_CHECKOUT_API_PREFIX = "/api/checkout";
+	public static final String ADYEN_CHECKOUT_PAGE_PREFIX = "/checkout/multi";
+	public static final String ADYEN_CHECKOUT_ORDER_CONFIRMATION = "/adyen/order-confirmation";
+	public static final String AUTHORISE_3D_SECURE_PAYMENT_URL = "/authorise-3d-adyen-response";
+
+	public static final String CART_PREFIX = "/cart";
+
+}

adyencheckoutaddonapi/acceleratoraddon/web/src/com/adyen/commerce/controllers/api/Adyen3DSResponseController.java

@@ -0,0 +1,109 @@
+package com.adyen.commerce.controllers.api;
+
+import com.adyen.model.checkout.PaymentCompletionDetails;
+import com.adyen.model.checkout.PaymentDetailsRequest;
+import com.adyen.model.checkout.PaymentDetailsResponse;
+import com.adyen.v6.exceptions.AdyenNonAuthorizedPaymentException;
+import com.adyen.v6.facades.AdyenCheckoutFacade;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import de.hybris.platform.acceleratorstorefrontcommons.annotations.RequireHardLogIn;
+import de.hybris.platform.commercefacades.order.data.OrderData;
+import de.hybris.platform.order.InvalidCartException;
+import de.hybris.platform.order.exceptions.CalculationException;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Type;
+import java.util.Collections;
+import java.util.Map;
+
+import static com.adyen.commerce.constants.AdyencheckoutaddonapiWebConstants.*;
+import static com.adyen.commerce.util.ErrorMessageUtil.getErrorMessageByRefusalReason;
+import static com.adyen.model.checkout.PaymentDetailsResponse.*;
+import static com.adyen.model.checkout.PaymentDetailsResponse.ResultCodeEnum.REFUSED;
+import static com.adyen.v6.facades.impl.DefaultAdyenCheckoutFacade.DETAILS;
+import static de.hybris.platform.acceleratorstorefrontcommons.controllers.AbstractController.REDIRECT_PREFIX;
+
+@Controller
+@RequestMapping(value = ADYEN_CHECKOUT_API_PREFIX)
+public class Adyen3DSResponseController {
+    private static final Logger LOGGER = Logger.getLogger(Adyen3DSResponseController.class);
+    private static final String REDIRECT_RESULT = "redirectResult";
+    private static final String PAYLOAD = "payload";
+    private static final String NON_AUTHORIZED_ERROR = "Handling AdyenNonAuthorizedPaymentException. Checking PaymentResponse.";
+    private static final String CHECKOUT_ERROR_AUTHORIZATION_FAILED = "checkout.error.authorization.failed";
+    private static final String REDIRECTING_TO_CART_PAGE = "Redirecting to cart page...";
+    private static final String ORDER_CONFIRMATION_URL = ADYEN_CHECKOUT_PAGE_PREFIX + ADYEN_CHECKOUT_ORDER_CONFIRMATION;
+
+
+    @Resource(name = "adyenCheckoutFacade")
+    private AdyenCheckoutFacade adyenCheckoutFacade;
+
+    @GetMapping(value = AUTHORISE_3D_SECURE_PAYMENT_URL)
+    @RequireHardLogIn
+    public String authorise3DSGetPayment(final HttpServletRequest request) {
+        String redirectResult = request.getParameter(REDIRECT_RESULT);
+        PaymentDetailsRequest paymentDetailsRequest = new PaymentDetailsRequest();
+        if (redirectResult != null && !redirectResult.isEmpty()) {
+            PaymentCompletionDetails details = new PaymentCompletionDetails();
+            details.setRedirectResult(redirectResult);
+            paymentDetailsRequest.details(details);
+        } else {
+            String payload = request.getParameter(PAYLOAD);
+            if (payload != null && !payload.isEmpty()) {
+                PaymentCompletionDetails details = new PaymentCompletionDetails();
+                details.setPayload(payload);
+                paymentDetailsRequest.details(details);
+            }
+        }
+        return authorise3DSPayment(paymentDetailsRequest);
+    }
+
+
+    @PostMapping(value = AUTHORISE_3D_SECURE_PAYMENT_URL)
+    @RequireHardLogIn
+    public String authorise3DSPostPayment(@RequestBody PaymentDetailsRequest detailsRequest) {
+        return authorise3DSPayment(detailsRequest);
+    }
+
+    public String authorise3DSPayment(final PaymentDetailsRequest details) {
+        LOGGER.info("3DS authorization");
+        try {
+            OrderData orderData = adyenCheckoutFacade.handle3DSResponse(details);
+            LOGGER.debug("Redirecting to confirmation");
+
+            return REDIRECT_PREFIX + ORDER_CONFIRMATION_URL + '/' + orderData.getCode();
+
+        } catch (AdyenNonAuthorizedPaymentException e) {
+            LOGGER.debug(NON_AUTHORIZED_ERROR);
+            String errorMessage = CHECKOUT_ERROR_AUTHORIZATION_FAILED;
+            PaymentDetailsResponse response = e.getPaymentsDetailsResponse();
+            if (response != null) {
+                if (REFUSED.equals(response.getResultCode())) {
+                    LOGGER.info("PaymentResponse " + response.getPspReference() + " is REFUSED: " + response);
+                    errorMessage = getErrorMessageByRefusalReason(response.getRefusalReason());
+                }
+                if (ResultCodeEnum.ERROR.equals(response.getResultCode())) {
+                    LOGGER.error("Payment " + response.getPspReference() + " result is error, reason:  "
+                            + response.getRefusalReason());
+                }
+            }
+//implement in 3ds error handling           return redirectToSelectPaymentMethodWithError(errorMessage);
+        } catch (CalculationException | InvalidCartException e) {
+            LOGGER.warn(e.getMessage(), e);
+        } catch (Exception e) {
+            LOGGER.error(ExceptionUtils.getStackTrace(e));
+        }
+
+        LOGGER.warn(REDIRECTING_TO_CART_PAGE);
+        return REDIRECT_PREFIX + CART_PREFIX;
+    }
+}

adyencheckoutaddonapi/acceleratoraddon/web/src/com/adyen/commerce/controllers/api/AdyenAddressController.java

@@ -0,0 +1,141 @@
+package com.adyen.commerce.controllers.api;
+
+import de.hybris.platform.acceleratorstorefrontcommons.annotations.RequireHardLogIn;
+import de.hybris.platform.acceleratorstorefrontcommons.forms.AddressForm;
+import de.hybris.platform.acceleratorstorefrontcommons.forms.validation.AddressValidator;
+import de.hybris.platform.acceleratorstorefrontcommons.util.AddressDataUtil;
+import de.hybris.platform.commercefacades.address.AddressVerificationFacade;
+import de.hybris.platform.commercefacades.order.CheckoutFacade;
+import de.hybris.platform.commercefacades.user.UserFacade;
+import de.hybris.platform.commercefacades.user.data.AddressData;
+import de.hybris.platform.commerceservices.address.AddressVerificationDecision;
+import de.hybris.platform.commerceservices.strategies.CheckoutCustomerStrategy;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.BeanPropertyBindingResult;
+import org.springframework.validation.Errors;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Objects;
+
+@Controller
+@RequestMapping(value = "/api/account")
+public class AdyenAddressController {
+
+    @Autowired
+    private UserFacade userFacade;
+
+    @Autowired
+    private AddressVerificationFacade addressVerificationFacade;
+
+    @Resource(name = "addressValidator")
+    private AddressValidator addressValidator;
+
+    @Resource(name = "addressDataUtil")
+    private AddressDataUtil addressDataUtil;
+
+    @Autowired
+    private CheckoutFacade checkoutFacade;
+
+    @Resource(name = "checkoutCustomerStrategy")
+    private CheckoutCustomerStrategy checkoutCustomerStrategy;
+
+    @RequireHardLogIn
+    @GetMapping(value = "/delivery-address", produces = "application/json")
+    public ResponseEntity<List<AddressData>> getAllDeliveryAddresses() {
+        List<AddressData> addressDataList = userFacade.getAddressBook();
+
+        return ResponseEntity.status(HttpStatus.OK).body(addressDataList);
+    }
+
+    @RequireHardLogIn
+    @PostMapping(value = "/delivery-address")
+    public ResponseEntity<AddressData> addDeliveryAddress(@RequestBody AddressForm addressForm) {
+        final Errors errors = new BeanPropertyBindingResult(addressForm, "address");
+        addressValidator.validate(addressForm, errors);
+        if (errors.hasErrors()) {
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).build();
+        }
+
+        AddressData addressData = addressDataUtil.convertToAddressData(addressForm);
+
+        processAddressVisibilityAndDefault(addressForm, addressData);
+
+        if (addressVerificationFacade.verifyAddressData(addressData).getDecision().equals(AddressVerificationDecision.ACCEPT)) {
+            addressData.setVisibleInAddressBook(true);
+            userFacade.addAddress(addressData);
+
+            final AddressData previousSelectedAddress = checkoutFacade.getCheckoutCart().getDeliveryAddress();
+            // Set the new address as the selected checkout delivery address
+            checkoutFacade.setDeliveryAddress(addressData);
+            if (previousSelectedAddress != null && !previousSelectedAddress.isVisibleInAddressBook()) { // temporary address should be removed
+                userFacade.removeAddress(previousSelectedAddress);
+            }
+
+            // Set the new address as the selected checkout delivery address
+            checkoutFacade.setDeliveryAddress(addressData);
+
+            return ResponseEntity.status(HttpStatus.CREATED).build();
+        } else {
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).build();
+        }
+    }
+
+    @RequireHardLogIn
+    @PutMapping(value = "/delivery-address")
+    public ResponseEntity<AddressData> updateDeliveryAddress(@RequestBody AddressForm addressForm) {
+        final Errors errors = new BeanPropertyBindingResult(addressForm, "address");
+        addressValidator.validate(addressForm, errors);
+        if (errors.hasErrors()) {
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).build();
+        }
+
+        AddressData addressData = addressDataUtil.convertToAddressData(addressForm);
+
+
+        if (addressVerificationFacade.verifyAddressData(addressData).getDecision().equals(AddressVerificationDecision.ACCEPT)) {
+            if (userFacade.getAddressBook().stream().anyMatch(ad -> Objects.equals(ad.getId(), addressData.getId()))) {
+                addressData.setVisibleInAddressBook(true);
+                userFacade.editAddress(addressData);
+
+                return ResponseEntity.status(HttpStatus.OK).build();
+            } else {
+                return ResponseEntity.status(HttpStatus.BAD_REQUEST).build();
+            }
+        } else {
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).build();
+        }
+    }
+
+    @RequireHardLogIn
+    @DeleteMapping(value = "/delivery-address/{addressId}")
+    public ResponseEntity<HttpStatus> removeDeliveryAddress(@PathVariable String addressId) {
+        if (userFacade.getAddressBook().stream().anyMatch(ad -> Objects.equals(ad.getId(), addressId))) {
+            AddressData addressData = userFacade.getAddressForCode(addressId);
+
+            userFacade.removeAddress(addressData);
+            addressData.setVisibleInAddressBook(false);
+
+            return ResponseEntity.status(HttpStatus.NO_CONTENT).build();
+        } else {
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).build();
+        }
+    }
+
+    private void processAddressVisibilityAndDefault(final AddressForm addressForm, final AddressData newAddress) {
+        if (addressForm.getSaveInAddressBook() != null) {
+            newAddress.setVisibleInAddressBook(addressForm.getSaveInAddressBook().booleanValue());
+            if (addressForm.getSaveInAddressBook().booleanValue() && CollectionUtils.isEmpty(userFacade.getAddressBook())) {
+                newAddress.setDefaultAddress(true);
+            }
+        } else if (checkoutCustomerStrategy.isAnonymousCheckout()) {
+            newAddress.setDefaultAddress(true);
+            newAddress.setVisibleInAddressBook(true);
+        }
+    }
+}