AD-50 add user login

Adyen · Nov 17, 2023 · 252290e · 252290e
1 parent fda88e4
commit 252290e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/...don/web/src/com/adyen/v6/controllers/checkout/AdyenApplePayExpressCheckoutController.java b/...don/web/src/com/adyen/v6/controllers/checkout/AdyenApplePayExpressCheckoutController.java
@@ -4,7 +4,8 @@
 import com.adyen.v6.facades.AdyenExpressCheckoutFacade;
 import com.adyen.v6.request.ApplePayExpressCartRequest;
 import com.adyen.v6.request.ApplePayExpressPDPRequest;
-import de.hybris.platform.acceleratorstorefrontcommons.security.GUIDCookieStrategy;
+import de.hybris.platform.acceleratorstorefrontcommons.security.AutoLoginStrategy;
+import de.hybris.platform.servicelayer.user.UserService;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -15,28 +16,30 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 @Controller
 public class AdyenApplePayExpressCheckoutController {
     private static final Logger LOG = Logger.getLogger(AdyenApplePayExpressCheckoutController.class);
 
-    @Resource(name = "guidCookieStrategy")
-    private GUIDCookieStrategy guidCookieStrategy;
-
     @Autowired
     private AdyenExpressCheckoutFacade adyenExpressCheckoutFacade;
 
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private AutoLoginStrategy autoLoginStrategy;
+
     @PostMapping("/expressCheckout/applePayPDP")
     public ResponseEntity applePayExpressPDP(final HttpServletRequest request, final HttpServletResponse response, @RequestBody ApplePayExpressPDPRequest applePayExpressPDPRequest) throws Exception {
 
         PaymentsResponse paymentsResponse = adyenExpressCheckoutFacade.expressPDPCheckout(applePayExpressPDPRequest.getAddressData(), applePayExpressPDPRequest.getProductCode(),
                 applePayExpressPDPRequest.getAdyenApplePayMerchantIdentifier(), applePayExpressPDPRequest.getAdyenApplePayMerchantName(),
                 applePayExpressPDPRequest.getApplePayToken(), request);
 
-        guidCookieStrategy.setCookie(request, response);
+        autoLoginStrategy.login(userService.getCurrentUser().getUid(), null, request, response);
 
         return new ResponseEntity<>(paymentsResponse, HttpStatus.OK);
     }
@@ -48,7 +51,7 @@ public ResponseEntity cartExpressCheckout(final HttpServletRequest request, fina
                 applePayExpressCartRequest.getAdyenApplePayMerchantIdentifier(), applePayExpressCartRequest.getAdyenApplePayMerchantName(),
                 applePayExpressCartRequest.getApplePayToken(), request);
 
-        guidCookieStrategy.setCookie(request, response);
+        autoLoginStrategy.login(userService.getCurrentUser().getUid(), null, request, response);
 
         return new ResponseEntity<>(paymentsResponse, HttpStatus.OK);
     }

diff --git a/adyenv6core/resources/adyenv6core-spring.xml b/adyenv6core/resources/adyenv6core-spring.xml
@@ -511,6 +511,5 @@
         <property name="adyenCheckoutFacade" ref="adyenCheckoutFacade"/>
         <property name="cartConverter" ref="cartConverter"/>
         <property name="userService" ref="userService"/>
-        <property name="sessionService" ref="sessionService"/>
     </bean>
 </beans>
diff --git a/adyenv6core/src/com/adyen/v6/facades/impl/DefaultAdyenExpressCheckoutFacade.java b/adyenv6core/src/com/adyen/v6/facades/impl/DefaultAdyenExpressCheckoutFacade.java
@@ -28,7 +28,6 @@
 import de.hybris.platform.servicelayer.dto.converter.Converter;
 import de.hybris.platform.servicelayer.i18n.CommonI18NService;
 import de.hybris.platform.servicelayer.model.ModelService;
-import de.hybris.platform.servicelayer.session.SessionService;
 import de.hybris.platform.servicelayer.user.UserService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -60,7 +59,6 @@ public class DefaultAdyenExpressCheckoutFacade implements AdyenExpressCheckoutFa
     private ZoneDeliveryModeService zoneDeliveryModeService;
     private AdyenCheckoutFacade adyenCheckoutFacade;
     private UserService userService;
-    private SessionService sessionService;
     private Converter<AddressData, AddressModel> addressReverseConverter;
     private Converter<CartModel, CartData> cartConverter;
 
@@ -74,7 +72,6 @@ public PaymentsResponse expressPDPCheckout(AddressData addressData, String produ
 
         CustomerModel user = createGuestCustomer(addressData.getEmail());
         userService.setCurrentUser(user);
-        sessionService.setAttribute("anonymous_checkout", Boolean.TRUE);
 
         CartModel cart = createCartForExpressCheckout(user);
 
@@ -133,7 +130,6 @@ public PaymentsResponse expressCartCheckout(AddressData addressData, String merc
         CustomerModel user = createGuestCustomer(addressData.getEmail());
         userService.setCurrentUser(user);
         cartService.changeCurrentCartUser(user);
-        sessionService.setAttribute("anonymous_checkout", Boolean.TRUE);
 
         CartModel cart = cartService.getSessionCart();
         AddressModel addressModel = addressReverseConverter.convert(addressData);
@@ -293,8 +289,4 @@ public void setCartConverter(Converter<CartModel, CartData> cartConverter) {
     public void setUserService(UserService userService) {
         this.userService = userService;
     }
-
-    public void setSessionService(SessionService sessionService) {
-        this.sessionService = sessionService;
-    }
 }