SL-219 Saving cards

.github/workflows/deploy.yml

@@ -15,7 +15,6 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: '5.6'
-
       - name: Run composer install
         run: |
           composer install --no-dev --optimize-autoloader --classmap-authoritative

.github/workflows/release.yml

@@ -16,11 +16,10 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: '5.6'
-
       - name: Run composer install
         run: |
           composer install --no-dev --optimize-autoloader --classmap-authoritative
-          composer dump-autoload --no-dev --optimize --classmap-authoritative
+          composer dump-autoload --no-dev --optimize --classmap-authoritative    
 
       - name: build
         # IF YOU EDIT THIS, DON'T FORGET TO EDIT deploy.yml

.gitignore

@@ -4,6 +4,5 @@
 composer.lock
 .php_cs.cache
 tests/.env
-/node_modules
-var/cache/*
-!var/cache/index.php
+/var
+/node_modules

changelog.md

@@ -156,9 +156,4 @@
 - BO : Added order creation after authorization functionality
 
 - ## [1.2.1] - *
-- FO : Increased compatibility with PrestaShop 1.6
-
-- ## [1.2.2] - *
-- FO : Confirmation email after order authorization fix
-- BO : Order confirmation email setting removed 
-- BO : Security improvements
+- FO : Increased compatibility with PrestaShop 1.6

composer.json

@@ -21,13 +21,6 @@
             "php": "5.6"
         }
     },
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/Invertus/lock.git",
-            "no-api": true
-        }
-    ],
     "require": {
         "vlucas/phpdotenv": "^3.6",
         "symfony/expression-language": "^3.4",
@@ -36,8 +29,7 @@
         "symfony/filesystem": "^3.4",
         "apimatic/unirest-php": "^2.3",
         "symfony/yaml": "^3.4",
-        "league/container": "2.5.0",
-        "invertus/lock": "^1.0.0"
+        "league/container": "2.5.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "*",

controllers/admin/AdminSaferPayOfficialSettingsController.php

@@ -322,6 +322,13 @@ public function initOptions()
                     'title' => $this->module->l('Email sending'),
                     'icon' => 'icon-settings',
                     'fields' => [
+                        SaferPayConfig::SAFERPAY_SEND_ORDER_CONFIRMATION => [
+                            'title' => $this->l('Send order confirmation email'),
+                            'desc' => $this->l('Send order confirmation email before payment is executed'),
+                            'validation' => 'isBool',
+                            'cast' => 'intval',
+                            'type' => 'bool',
+                        ],
                         SaferPayConfig::SAFERPAY_ALLOW_SAFERPAY_SEND_CUSTOMER_MAIL => [
                             'title' => $this->l('Send an email from Saferpay on payment completion'),
                             'desc' => $this->l('With this setting enabled an email from the Saferpay system will be sent to the customer'),

controllers/front/notify.php

@@ -64,34 +64,6 @@ public function postProcess()
             die($this->module->l('Error. Insecure cart', self::FILENAME));
         }
 
-        $lockResult = $this->applyLock(sprintf(
-            '%s-%s',
-            $cartId,
-            $secureKey
-        ));
-
-        if (!$lockResult->isSuccessful()) {
-            die($this->module->l('Lock already exist', self::FILENAME));
-        }
-
-        if ($cart->orderExists()) {
-            if (method_exists('Order', 'getIdByCartId')) {
-                $orderId = Order::getIdByCartId($cartId);
-            } else {
-                // For PrestaShop 1.6 use the alternative method
-                $orderId = Order::getOrderByCartId($cartId);
-            }
-
-            $order = new Order($orderId);
-
-            $saferPayAuthorizedStatus = (int) Configuration::get(\Invertus\SaferPay\Config\SaferPayConfig::SAFERPAY_PAYMENT_AUTHORIZED);
-            $saferPayCapturedStatus = (int) Configuration::get(\Invertus\SaferPay\Config\SaferPayConfig::SAFERPAY_PAYMENT_COMPLETED);
-
-            if ((int) $order->current_state === $saferPayAuthorizedStatus || (int) $order->current_state === $saferPayCapturedStatus) {
-                die($this->module->l('Order already created', self::FILENAME));
-            }
-        }
-
         try {
             $assertResponseBody = $this->assertTransaction($cartId);
 

controllers/front/return.php

@@ -61,61 +61,13 @@ public function postProcess()
             ]));
         }
 
-        $lockResult = $this->applyLock(
-            sprintf(
-                '%s-%s',
-                $cartId,
-                $secureKey
-            )
-        );
-
-        if (!$lockResult->isSuccessful()) {
-            $this->redirectWithNotifications($this->context->link->getModuleLink(
-                $this->module->name,
-                ControllerName::FAIL,
-                [
-                    'cartId' => $cartId,
-                    'secureKey' => $secureKey,
-                    'moduleId' => $moduleId,
-                ]
-            ));
-        }
-
         if ($cart->secure_key !== $secureKey) {
             $this->ajaxDie(json_encode([
                 'error_type' => 'unknown_error',
                 'error_text' => $this->module->l('An unknown error error occurred. Please contact support', self::FILENAME),
             ]));
         }
 
-        if ($cart->orderExists()) {
-            if (method_exists('Order', 'getIdByCartId')) {
-                $orderId = Order::getIdByCartId($cartId);
-            } else {
-                // For PrestaShop 1.6 use the alternative method
-                $orderId = Order::getOrderByCartId($cartId);
-            }
-
-            $order = new Order($orderId);
-
-            $saferPayAuthorizedStatus = (int) Configuration::get(\Invertus\SaferPay\Config\SaferPayConfig::SAFERPAY_PAYMENT_AUTHORIZED);
-            $saferPayCapturedStatus = (int) Configuration::get(\Invertus\SaferPay\Config\SaferPayConfig::SAFERPAY_PAYMENT_COMPLETED);
-
-            if ((int) $order->current_state === $saferPayAuthorizedStatus || (int) $order->current_state === $saferPayCapturedStatus) {
-                Tools::redirect($this->context->link->getModuleLink(
-                    $this->module->name,
-                    $this->getSuccessControllerName($isBusinessLicence, $fieldToken),
-                    [
-                        'cartId' => $cartId,
-                        'orderId' => $orderId,
-                        'moduleId' => $moduleId,
-                        'secureKey' => $secureKey,
-                        'selectedCard' => $selectedCard,
-                    ]
-                ));
-            }
-        }
-
         try {
             if ($isBusinessLicence) {
                 $response = $this->executeTransaction((int) $cartId, (int) $selectedCard);

controllers/front/successIFrame.php

@@ -62,37 +62,6 @@ public function postProcess()
 
             $this->redirectWithNotifications($this->getOrderLink());
         }
-
-        try {
-            Tools::redirect($this->getOrderConfirmationLink($cartId, $moduleId, $orderId, $secureKey));
-        } catch (Exception $e) {
-            PrestaShopLogger::addLog(
-                sprintf(
-                    '%s has caught an error: %s',
-                    __CLASS__,
-                    $e->getMessage()
-                ),
-                1,
-                null,
-                null,
-                null,
-                true
-            );
-
-            Tools::redirect(
-                $this->context->link->getModuleLink(
-                    $this->module->name,
-                    ControllerName::FAIL_IFRAME,
-                    [
-                        'cartId' => $cartId,
-                        'secureKey' => $secureKey,
-                        'orderId' => $orderId,
-                        \Invertus\SaferPay\Config\SaferPayConfig::IS_BUSINESS_LICENCE => true,
-                    ],
-                    true
-                )
-            );
-        }
     }
 
     public function initContent()

saferpayofficial.php

@@ -21,8 +21,6 @@
  *@license   SIX Payment Services
  */
 
-use Invertus\SaferPay\Config\SaferPayConfig;
-
 if (!defined('_PS_VERSION_')) {
     exit;
 }
@@ -578,55 +576,47 @@ public function hookActionEmailSendBefore($params)
         }
 
         if ($params['template'] === 'new_order') {
-            if ((int) Configuration::get(\Invertus\SaferPay\Config\SaferPayConfig::SAFERPAY_SEND_NEW_ORDER_MAIL)) {
+            if (!Configuration::get(\Invertus\SaferPay\Config\SaferPayConfig::SAFERPAY_SEND_NEW_ORDER_MAIL)) {
                 return true;
             }
-
             return false;
         }
     }
 
-    public function hookActionOrderHistoryAddAfter($params = [])
+    public function hookActionOrderStatusPostUpdate($params = [])
     {
-        /** @var OrderHistory $orderHistory */
-        $orderHistory = $params['order_history'];
-
-        if (!$orderHistory instanceof OrderHistory) {
+        if (!isset($params['newOrderStatus']) || !isset($params['id_order'])) {
             return;
         }
 
-        $idOrder = (int) $orderHistory->id_order;
-
-        $internalOrder = new Order($idOrder);
+        if ($params['newOrderStatus'] instanceof OrderState) {
+            $orderStatus = $params['newOrderStatus'];
+        } else {
+            $orderStatus = new OrderState((int) $params['newOrderStatus']);
+        }
+        $order = new Order($params['id_order']);
 
-        if (!Validate::isLoadedObject($internalOrder)) {
+        if (!Validate::isLoadedObject($orderStatus)) {
             return;
         }
 
-        $order = new Order($idOrder);
-
-        $orderStatus = new OrderState((int) $order->current_state);
-
-        if (!Validate::isLoadedObject($orderStatus)) {
+        if (!Validate::isLoadedObject($order)) {
             return;
         }
 
         /** @var \Invertus\SaferPay\Service\SaferPayMailService $mailService */
         $mailService = $this->getService(\Invertus\SaferPay\Service\SaferPayMailService::class);
 
+        $saferPayAuthorizedStatus = (int) Configuration::get(\Invertus\SaferPay\Config\SaferPayConfig::SAFERPAY_PAYMENT_AUTHORIZED);
+        if ($orderStatus->id === $saferPayAuthorizedStatus && Configuration::get(\Invertus\SaferPay\Config\SaferPayConfig::SAFERPAY_SEND_NEW_ORDER_MAIL)) {
+            $mailService->sendNewOrderMail($order, (int) $orderStatus->id);
+        }
+
         /** @var \Invertus\SaferPay\Core\Order\Verification\CanSendOrderConfirmationEmail $canSendOrderConfirmationEmail */
         $canSendOrderConfirmationEmail = $this->getService(\Invertus\SaferPay\Core\Order\Verification\CanSendOrderConfirmationEmail::class);
 
         if ($canSendOrderConfirmationEmail->verify((int) $orderStatus->id)) {
-            try {
-                $mailService->sendNewOrderMail($order, (int) $orderStatus->id);
-            } catch (\Exception $e) {
-                // emailalert module sometimes throws error which leads into failed payment issue
-            }
-
-            if ((int) \Configuration::get(SaferPayConfig::SAFERPAY_PAYMENT_AUTHORIZED) === (int) $orderStatus->id) {
-               $mailService->sendOrderConfMail($order, (int) $orderStatus->id);
-            }
+            $mailService->sendOrderConfMail($order, (int) $orderStatus->id);
         }
     }
 

src/Api/Request/AuthorizationService.php

@@ -31,6 +31,7 @@
 use Invertus\SaferPay\EntityBuilder\SaferPayAssertBuilder;
 use Invertus\SaferPay\EntityBuilder\SaferPayCardAliasBuilder;
 use Invertus\SaferPay\Exception\Api\SaferPayApiException;
+use Invertus\SaferPay\Repository\SaferPayCardAliasRepository;
 use Invertus\SaferPay\Service\Response\AssertResponseObjectCreator;
 
 if (!defined('_PS_VERSION_')) {
@@ -61,16 +62,20 @@ class AuthorizationService
      */
     private $aliasBuilder;
 
+    private $aliasRepository;
+
     public function __construct(
         ApiRequest $apiRequest,
         AssertResponseObjectCreator $assertResponseObjectCreator,
         SaferPayAssertBuilder $assertBuilder,
-        SaferPayCardAliasBuilder $aliasBuilder
+        SaferPayCardAliasBuilder $aliasBuilder,
+        SaferPayCardAliasRepository $aliasRepository
     ) {
         $this->apiRequest = $apiRequest;
         $this->assertResponseObjectCreator = $assertResponseObjectCreator;
         $this->assertBuilder = $assertBuilder;
         $this->aliasBuilder = $aliasBuilder;
+        $this->aliasRepository = $aliasRepository;
     }
 
     public function authorize(AuthorizationRequest $authorizationRequest)
@@ -103,6 +108,13 @@ public function createObjectsFromAuthorizationResponse(
         $assertBody = $this->assertResponseObjectCreator->createAssertObject($responseBody);
         $this->assertBuilder->createAssert($assertBody, $saferPayOrderId);
         $isPaymentSafe = $assertBody->getLiability()->getLiabilityShift();
+        $allSavedCards = array_column($this->aliasRepository->getSavedCardsNumbersByCustomerId($customerId), 'card_number');
+        $currentCard = $assertBody->getPaymentMeans()->getDisplayText();
+
+        if (in_array($currentCard, $allSavedCards)) {
+            return $assertBody;
+        }
+
         if ((int) $selectedCardOption === SaferPayConfig::CREDIT_CARD_OPTION_SAVE && $isPaymentSafe) {
             $this->aliasBuilder->createCardAlias($assertBody, $customerId);
         }

src/Config/SaferPayConfig.php

@@ -222,6 +222,7 @@ class SaferPayConfig
     const SAFERPAY_PAYMENT_CANCELED = 'SAFERPAY_PAYMENT_CANCELED';
     const SAFERPAY_PAYMENT_AUTHORIZATION_FAILED = 'SAFERPAY_PAYMENT_AUTHORIZATION_FAILED';
 
+    const SAFERPAY_SEND_ORDER_CONFIRMATION = 'SAFERPAY_SEND_ORDER_CONFIRMATION';
     const SAFERPAY_SEND_NEW_ORDER_MAIL = 'SAFERPAY_SEND_NEW_ORDER_MAIL';
     const SAFERPAY_ALLOW_SAFERPAY_SEND_CUSTOMER_MAIL = 'SAFERPAY_ALLOW_SAFERPAY_SEND_CUSTOMER_MAIL';
     const SAFERPAY_ORDER_CREATION_AFTER_AUTHORIZATION = 'SAFERPAY_ORDER_CREATION_AFTER_AUTHORIZATION';
@@ -338,6 +339,7 @@ public static function getDefaultConfiguration()
             RequestHeader::RETRY_INDICATOR => 0,
             SaferPayConfig::PAYMENT_BEHAVIOR => 1,
             SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D => 1,
+            SaferPayConfig::SAFERPAY_SEND_ORDER_CONFIRMATION => 1,
             SaferPayConfig::SAFERPAY_ALLOW_SAFERPAY_SEND_CUSTOMER_MAIL => 1,
             SaferPayConfig::SAFERPAY_PAYMENT_DESCRIPTION => self::SAFERPAY_PAYMENT_DESCRIPTION_DEFAULT_VALUE,
             SaferPayConfig::FIELDS_LIBRARY => self::FIELDS_LIBRARY_DEFAULT_VALUE,