Modifications based on code review

 - remove generation time
 - add checkout sdk live and test version
 - cvc is not required (e.g. at recurring)

Gateway/Request/CcAuthorizationDataBuilder.php

@@ -84,8 +84,9 @@ class CcAuthorizationDataBuilder implements BuilderInterface
 			$request['paymentMethod']['holderName'] = $holderName;
 		}
 
-		// The encrypted security code is required in both cc and oneclick
-		$request['paymentMethod']['encryptedSecurityCode'] = $payment->getAdditionalInformation(AdyenCcDataAssignObserver::SECURITY_CODE);
+		if ($securityCode = $payment->getAdditionalInformation(AdyenCcDataAssignObserver::SECURITY_CODE)) {
+			$request['paymentMethod']['encryptedSecurityCode'] = $securityCode;
+		}
 
 		// Remove from additional data
 		$payment->unsAdditionalInformation(AdyenCcDataAssignObserver::CREDIT_CARD_NUMBER);

Helper/Data.php

@@ -35,7 +35,8 @@ class Data extends AbstractHelper
     const LIVE = 'live';
     const CHECKOUT_CONTEXT_URL_LIVE = 'https://checkoutshopper-live.adyen.com/checkoutshopper/';
 	const CHECKOUT_CONTEXT_URL_TEST = 'https://checkoutshopper-test.adyen.com/checkoutshopper/';
-	const CHECKOUT_COMPONENT_JS = 'https://checkoutshopper-beta.adyen.com/checkoutshopper/sdk/2.0.0-beta.4/adyen.js';
+	const CHECKOUT_COMPONENT_JS_LIVE = 'https://checkoutshopper-live.adyen.com/checkoutshopper/sdk/2.0.0-beta.4/adyen.js';
+	const CHECKOUT_COMPONENT_JS_TEST = 'https://checkoutshopper-test.adyen.com/checkoutshopper/sdk/2.0.0-beta.4/adyen.js';
 
     /**
      * @var \Magento\Framework\Encryption\EncryptorInterface
@@ -1286,9 +1287,14 @@ class Data extends AbstractHelper
 	}
 
 	/**
+	 * @param int|null $storeId
 	 * @return string
 	 */
-	public function getCheckoutCardComponentJs() {
-		return self::CHECKOUT_COMPONENT_JS;
+	public function getCheckoutCardComponentJs($storeId = null) {
+		if ($this->isDemoMode($storeId)) {
+			return self::CHECKOUT_COMPONENT_JS_TEST;
+		}
+
+		return self::CHECKOUT_COMPONENT_JS_LIVE;
 	}
 }

Model/Ui/AdyenCcConfigProvider.php

@@ -140,7 +140,6 @@ class AdyenCcConfigProvider implements ConfigProviderInterface
 
 		$config['payment']['adyenCc']['locale'] = $this->_adyenHelper->getStoreLocale($this->storeManager->getStore()->getId());
 
-        $config['payment']['adyenCc']['generationTime'] = date("c");
         $config['payment']['adyenCc']['canCreateBillingAgreement'] = $canCreateBillingAgreement;
         $config['payment']['adyenCc']['icons'] = $this->getIcons();
 

Model/Ui/AdyenGenericConfigProvider.php

@@ -33,13 +33,20 @@ class AdyenGenericConfigProvider implements ConfigProviderInterface
      */
     protected $_adyenHelper;
 
+	/**
+	 * @var \Magento\Store\Model\StoreManagerInterface
+	 */
+	protected $storeManager;
+
     /**
      * AdyenGenericConfigProvider constructor.
      *
      * @param \Adyen\Payment\Helper\Data $adyenHelper
      */
-    public function __construct(\Adyen\Payment\Helper\Data $adyenHelper) {
+    public function __construct(\Adyen\Payment\Helper\Data $adyenHelper,
+		\Magento\Store\Model\StoreManagerInterface $storeManager) {
         $this->_adyenHelper = $adyenHelper;
+		$this->storeManager = $storeManager;
     }
     /**
      * Define foreach payment methods the RedirectUrl
@@ -58,7 +65,7 @@ class AdyenGenericConfigProvider implements ConfigProviderInterface
             $config['payment']['adyen']['showLogo'] = false;
         }
 
-		$config['payment']['checkoutCardComponentSource'] = $this->_adyenHelper->getCheckoutCardComponentJs();
+		$config['payment']['checkoutCardComponentSource'] = $this->_adyenHelper->getCheckoutCardComponentJs($this->storeManager->getStore()->getId());
 
         return $config;
     }

Model/Ui/AdyenOneclickConfigProvider.php

@@ -143,9 +143,6 @@ class AdyenOneclickConfigProvider implements ConfigProviderInterface
             $canCreateBillingAgreement = true;
         }
 
-        // Commented out otherwise would break the checkoutsince the getLibrarySource is removed
-        //$config['payment'] ['adyenOneclick']['librarySource'] = $this->_adyenHelper->getLibrarySource();
-        $config['payment']['adyenOneclick']['generationTime'] = date("c");
         $config['payment']['adyenOneclick']['canCreateBillingAgreement'] = $canCreateBillingAgreement;
 
         $recurringContractType = $this->_getRecurringContractType();

view/adminhtml/templates/form/cc.phtml

@@ -112,10 +112,6 @@ echo $code; ?>"
                 <?php endforeach ?>
             </select>
 
-
-            <input type="hidden" id="<?php echo $code ?>_encrypted_form_expiry_generationtime"
-                   value="<?php echo date("c"); ?>" data-encrypted-name="generationtime"/>
-
         </div>
     </div>
 

view/frontend/web/js/view/payment/adyen-methods.js

@@ -68,8 +68,7 @@ define(
                 this._super();
 
                 // include checkout card component javascript
-                var checkoutCardComponentScriptTag = document.getElementById('AdyenCheckoutCardComponentScript');
-                checkoutCardComponentScriptTag = document.createElement('script');
+                var checkoutCardComponentScriptTag = document.createElement('script');
                 checkoutCardComponentScriptTag.id = "AdyenCheckoutCardComponentScript";
                 checkoutCardComponentScriptTag.src = self.getCheckoutCardComponentSource();
                 checkoutCardComponentScriptTag.type = "text/javascript";

view/frontend/web/js/view/payment/method-renderer/adyen-cc-method.js

@@ -158,7 +158,7 @@ define(
             /**
              * Builds the payment details part of the payment information reqeust
              *
-             * @returns {{method: *, additional_data: {cc_type: *, number: *, cvc, expiryMonth: *, expiryYear: *, holderName: *, generationtime: *, store_cc: *, number_of_installments: *}}}
+             * @returns {{method: *, additional_data: {cc_type: *, number: *, cvc, expiryMonth: *, expiryYear: *, holderName: *, store_cc: *, number_of_installments: *}}}
              */
             getData: function () {
                 return {
@@ -170,7 +170,6 @@ define(
                         'expiryMonth': this.expiryMonth(),
                         'expiryYear': this.expiryYear(),
                         'holderName': this.creditCardOwner(),
-                        'generationtime': this.getGenerationTime(),
                         'store_cc': this.setStoreCc(),
                         'number_of_installments': this.installment()
                     }
@@ -327,9 +326,6 @@ define(
             getPlaceOrderUrl: function () {
                 return window.checkoutConfig.payment.iframe.placeOrderUrl[this.getCode()];
             },
-            getGenerationTime: function () {
-                return window.checkoutConfig.payment.adyenCc.generationTime;
-            },
             canCreateBillingAgreement: function () {
                 if (customer.isLoggedIn()) {
                     return window.checkoutConfig.payment.adyenCc.canCreateBillingAgreement;

view/frontend/web/js/view/payment/method-renderer/adyen-oneclick-method.js

@@ -234,7 +234,7 @@ define(
                         /**
                          * Builds the payment details part of the payment information reqeust
                          *
-                         * @returns {{method: *, additional_data: {variant: *, recurring_detail_reference: *, number_of_installments: *, cvc: (string|*), expiryMonth: *, expiryYear: *, generationtime: *}}}
+                         * @returns {{method: *, additional_data: {variant: *, recurring_detail_reference: *, number_of_installments: *, cvc: (string|*), expiryMonth: *, expiryYear: *}}}
                          */
                         getData: function () {
                             var self = this;
@@ -247,8 +247,7 @@ define(
                                     number_of_installments: numberOfInstallments(),
                                     cvc: self.encryptedCreditCardVerificationNumber,
                                     expiryMonth: self.creditCardExpMonth(),
-                                    expiryYear: self.creditCardExpYear(),
-                                    generationtime: self.getGenerationTime()
+                                    expiryYear: self.creditCardExpYear()
                                 }
                             };
                         },
@@ -289,9 +288,6 @@ define(
                         getLoadingContext: function () {
                             return window.checkoutConfig.payment.adyenOneclick.checkoutUrl;
                         },
-                        getGenerationTime: function () {
-                            return window.checkoutConfig.payment.adyenCc.generationTime;
-                        },
                         hasVerification: function () {
                             return window.checkoutConfig.payment.adyenOneclick.hasCustomerInteraction;
                         },

view/frontend/web/template/payment/cc-form.html

@@ -172,15 +172,6 @@
 
                 <!-- /ko -->
 
-
-                <input type="hidden"
-                       name="payment[generationtime]"
-                       class="input-text"
-                       value=""
-                       data-encrypted-name="generationtime"
-                       data-bind="attr: {id: getCode() + '_generationtime', 'data-container': getCode() + '-generationtime'},
-                           value: getGenerationTime()"
-                />
             </fieldset>
         </form>