Make secure form mandatory (#493)

* Made secure form mandatory. * Fix failing test.
omise · Oct 17, 2024 · d3125f2 · d3125f2
1 parent b66bcd6
commit d3125f2
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 408 deletions.
diff --git a/Block/Adminhtml/System/Config/CardFormCustomization/SecureFormBannerMessage.php b/Block/Adminhtml/System/Config/CardFormCustomization/SecureFormBannerMessage.php
diff --git a/Gateway/Request/PaymentDataBuilder.php b/Gateway/Request/PaymentDataBuilder.php
@@ -111,10 +111,6 @@ public function build(array $buildSubject)
             $requestBody[self::ZERO_INTEREST_INSTALLMENTS] = true;
         }
 
-        if (Cc::CODE === $method->getMethod()) {
-            $requestBody[self::METADATA]['secure_form_enabled'] = $this->ccConfig->getSecureForm();
-        }
-
         if (Installment::CODE === $method->getMethod()) {
             $card = $method->getAdditionalInformation(InstallmentDataAssignObserver::CARD);
             if ($card !== null) {

diff --git a/Model/Config/Cc.php b/Model/Config/Cc.php
@@ -26,9 +26,4 @@ public function getCardTheme()
     {
         return $this->getValue('card_form_theme', self::CODE);
     }
-
-    public function getSecureForm()
-    {
-        return $this->getValue('secure_form', self::CODE);
-    }
 }
diff --git a/Model/Source/SecureForm.php b/Model/Source/SecureForm.php
diff --git a/Model/Ui/CcConfigProvider.php b/Model/Ui/CcConfigProvider.php
@@ -56,7 +56,6 @@ public function getConfig()
                     'isCustomerLoggedIn' => $this->customer->isLoggedIn(),
                     'cards'              => $this->getCards(),
                     'locale'             => $this->omiseCcConfig->getStoreLocale(),
-                    'secureForm'         => $this->omiseCcConfig->getSecureForm(),
                     'formDesign'         => $theme->getFormDesign($selectedTheme, $customDesign),
                     'theme'              => $selectedTheme
                 ],

diff --git a/Test/Unit/PaymentDataBuilderTest.php b/Test/Unit/PaymentDataBuilderTest.php
@@ -131,7 +131,6 @@ public function buildDataProvider()
                     'order_id' => 123,
                     'store_id' => 1,
                     'store_name' => 'opn-store',
-                    'secure_form_enabled' => true
                 ],
             ],
             [

diff --git a/Test/Unit/SecureFormBannerMessageTest.php b/Test/Unit/SecureFormBannerMessageTest.php
diff --git a/etc/adminhtml/di.xml b/etc/adminhtml/di.xml
@@ -8,12 +8,4 @@
     <type name="\Magento\Config\Model\Config">
         <plugin name="admin_system_config_save_plugin" type="Omise\Payment\Plugin\ConfigSectionPaymentPlugin" sortOrder="1" />
     </type>
-
-    <type name="Magento\Framework\Notification\MessageList">
-       <arguments>
-           <argument name="messages" xsi:type="array">
-               <item name="opnPaymentsSecureFormBannerMessage" xsi:type="string">Omise\Payment\Block\Adminhtml\System\Config\CardFormCustomization\SecureFormBannerMessage</item>
-           </argument>
-       </arguments>
-   </type>
 </config>
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -85,21 +85,10 @@
                         <comment>This controls the title which the user sees during checkout.</comment>
                         <config_path>payment/omise_cc/title</config_path>
                     </field>
-                    <field id="secure_form" translate="label" type="select" sortOrder="111" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Secure Form</label>
-                        <config_path>payment/omise_cc/secure_form</config_path>
-                        <source_model>Omise\Payment\Model\Source\SecureForm</source_model>
-                        <comment>
-                            <![CDATA[Try the new secure form to accept card payments. The new form features additional controls to ensure PCI-DSS compliance. Using this form will be <b>mandatory</b> in a future release.]]>
-                        </comment>
-                    </field>
                     <field id="card_form_theme" translate="label comment" type="select" sortOrder="112" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Secure Form Theme</label>
                         <config_path>payment/omise_cc/card_form_theme</config_path>
                         <source_model>Omise\Payment\Model\Source\CardFormTheme</source_model>
-                        <depends>
-                            <field id="secure_form">yes</field>
-                        </depends>
                         <comment>
                             <![CDATA[Credit/debit card secure form design on checkout page. <a style="cursor:pointer" onclick="cardFormCustomization.showModal()"><b>Click here</b></a> for more secure card form customization.]]>
                         </comment>

diff --git a/etc/config.xml b/etc/config.xml
@@ -28,7 +28,6 @@
                 <can_refund_partial_per_invoice>1</can_refund_partial_per_invoice>
                 <can_refund>1</can_refund>
                 <payment_action>authorize</payment_action>
-                <secure_form>no</secure_form>
                 <card_form_theme>light</card_form_theme>
                 <card_form_theme_config></card_form_theme_config>
             </omise_cc>

diff --git a/view/frontend/web/js/view/payment/method-renderer/omise-cc-method.js b/view/frontend/web/js/view/payment/method-renderer/omise-cc-method.js
@@ -83,9 +83,7 @@ define(
                         'omiseSaveCard',
                         'omiseCardError'
                     ])
-                if (this.isSecureForm()) {
-                    this.openOmiseJs()
-                }
+                this.openOmiseJs()
                 return this
             },
 
@@ -95,21 +93,15 @@ define(
                 checkoutData.setSelectedPaymentMethod(this.item.method);
                 OmiseCard.destroy();
                 setTimeout(() => {
-                    if (this.isSecureForm()) {
-                        const element = document.querySelector('.omise-card-form')
-                        if(element) {
-                            this.applyOmiseJsToElement(this, element)
-                        }
+                    const element = document.querySelector('.omise-card-form')
+                    if(element) {
+                        this.applyOmiseJsToElement(this, element)
                     }
                 }, 300);
 
                 return true
             },
 
-            isSecureForm: function () {
-                return window.checkoutConfig.payment.omise_cc.secureForm === 'yes'
-            },
-
             openOmiseJs: function () {
                 ko.bindingHandlers.omiseCardForm = {
                     init: (element) => this.applyOmiseJsToElement(this, element)
@@ -287,43 +279,6 @@ define(
                 OmiseCard.requestCardToken(billingAddress)
             },
 
-            /**
-             * Generate Omise token with omise.js before proceed the placeOrder process.
-             *
-             * @return {void}
-             */
-            generateTokenWithOmiseJsAndPerformPlaceOrderAction: function () {
-                if (! this.validate()) {
-                    return false;
-                }
-
-                const self = this
-                this.startPerformingPlaceOrderAction()
-
-                let card = {
-                    number: this.omiseCardNumber(),
-                    name: this.omiseCardHolderName(),
-                    expiration_month: this.omiseCardExpirationMonth(),
-                    expiration_year: this.omiseCardExpirationYear(),
-                    security_code: this.omiseCardSecurityCode()
-                }
-                let selectedBillingAddress = quote.billingAddress()
-
-                if (self.billingAddressCountries.indexOf(selectedBillingAddress.countryId) > -1) {
-                    Object.assign(card, this.getSelectedTokenBillingAddress(selectedBillingAddress))
-                }
-
-                Omise.setPublicKey(this.getPublicKey())
-                Omise.createToken('card', card, function (statusCode, response) {
-                    if (statusCode === 200) {
-                        self.createOrder(self, {token : response.id})
-                    } else {
-                        self.omiseCardError(response.message)
-                        self.stopPerformingPlaceOrderAction()
-                    }
-                })
-            },
-
             /**
              * Hook the placeOrder function.
              * Original source: placeOrder(data, event); @ module-checkout/view/frontend/web/js/view/payment/default.js
@@ -346,36 +301,10 @@ define(
                     return true
                 }
 
-                if (this.isSecureForm()) {
-                    this.generateTokenWithEmbeddedFormAndPerformPlaceOrderAction()
-                } else {
-                    this.generateTokenWithOmiseJsAndPerformPlaceOrderAction()
-                }
-
+                this.generateTokenWithEmbeddedFormAndPerformPlaceOrderAction()
                 return true
             },
 
-            /**
-             * Hook the validate function.
-             * Original source: validate(); @ module-checkout/view/frontend/web/js/view/payment/default.js
-             *
-             * @return {boolean}
-             */
-            validate: function () {
-                let prefix = '#' + this.getCode(),
-                    fields = [
-                        'CardNumber',
-                        'CardHolderName',
-                        'CardExpirationMonth',
-                        'CardExpirationYear',
-                        'CardSecurityCode'
-                    ]
-
-
-                $(prefix + 'Form').validation()
-                return fields.map(f => $(prefix + f).valid()).every(valid => valid)
-            },
-
             processOrderWithCard: function () {
                 const self = this
                 const failHandler = this.buildFailHandler(self, 300)