Support Apple Pay Web Registration

* Update Moyasar form

* Remove AP section from admin panel

* Add AP web reg

* Change AP label

* Update Moyasar form 1.5.6

* Remove ApplePay folder

* Remove validateApplePayMerchant method

Author: Sundus Abdullah

Moyasar/Mysr/Controller/ApplePay/Validate.php

@@ -367,91 +367,17 @@ public function fetchMoyasarPayment($paymentId)
         return @json_decode($this->_curl->getBody(), true);
     }
 
-    public function getMerchantCertificatePath()
-    {
-        return $this->getFilePath('payment/moyasar_apple_pay/validate_merchant_cert');
-    }
-
-    public function getMerchantCertificateKeyPath()
-    {
-        return $this->getFilePath('payment/moyasar_apple_pay/validate_merchant_pk');
-    }
-
-    protected function getFilePath($key)
-    {
-        $varDir = $this->directoryList->getPath(DirectoryList::VAR_DIR);
-        $moyasarUploadDir = 'moyasar/applepay/certificates';
-        $path = $this->scopeConfig->getValue($key, ScopeInterface::SCOPE_STORE);
-
-        return "$varDir/$moyasarUploadDir/$path";
-    }
-
-    public function getMerchantCertificateKeyPassword()
-    {
-        $password = $this->scopeConfig->getValue('payment/moyasar_apple_pay/validate_merchant_pk_password', ScopeInterface::SCOPE_STORE);
-
-        if (!is_string($password)) {
-            return '';
-        }
-
-        return $password;
-    }
-
-    public function getMerchantApplePayIdentifier()
-    {
-        return $this->scopeConfig->getValue('payment/moyasar_apple_pay/merchant_id', ScopeInterface::SCOPE_STORE);
-    }
-
     protected function getCurrentStoreName()
     {
         return $this->storeManager->getStore()->getName();
     }
-
-    protected function getInitiativeContext()
+ 
+    public function getInitiativeContext()
     {
         $baseUrl = $this->storeManager->getStore()->getBaseUrl();
         if (preg_match('/^.+:\/\/([A-Za-z0-9\-\.]+)\/?.*$/', $baseUrl, $matches) !== 1) {
-            return $this->getMerchantApplePayIdentifier();
         }
 
         return $matches[1];
     }
-
-    public function validateApplePayMerchant($validationUrl)
-    {
-        if (!$validationUrl) {
-            return null;
-        }
-
-        $body = [
-            'merchantIdentifier' => $this->getMerchantApplePayIdentifier(),
-            'displayName' => $this->getCurrentStoreName(),
-            'initiative' => 'web',
-            'initiativeContext' => $this->getInitiativeContext()
-        ];
-
-        $this->_curl->setOptions([
-            CURLOPT_SSL_VERIFYPEER => true,
-            CURLOPT_SSLCERT => $this->getMerchantCertificatePath(),
-            CURLOPT_SSLKEY => $this->getMerchantCertificateKeyPath(),
-            CURLOPT_SSLKEYPASSWD => $this->getMerchantCertificateKeyPassword(),
-            CURLOPT_RETURNTRANSFER => true
-        ]);
-
-        try {
-            $this->_curl->post($validationUrl, json_encode($body));
-        } catch (Exception $e) {
-            $this->_logger->warning('Could not validate merchant with Apple, error: ' . $e->getMessage());
-            return null;
-        }
-
-        if ($this->_curl->getStatus() > 299) {
-            $this->_logger->warning('Error while trying to validate merchant ' . $this->_curl->getStatus(), [
-                'response' => @json_decode($this->_curl->getBody(), true)
-            ]);
-            return null;
-        }
-
-        return @json_decode($this->_curl->getBody());
-    }
 }

Moyasar/Mysr/Helper/MoyasarHelper.php

@@ -67,7 +67,8 @@ public function getConfig()
                 'payment_url' => $this->moyasarHelper->buildMoyasarUrl('payments'),
                 'country' => $this->scopeConfig->getValue('general/country/default'),
                 'store_name' => $this->storeManager->getStore()->getName(),
-                'methods' => $this->moyasarHelper->methodEnabled()
+                'methods' => $this->moyasarHelper->methodEnabled(),
+                'domain_name' => $this->moyasarHelper->getInitiativeContext()
             ]           
         ];
 	}

Moyasar/Mysr/Model/PaymentConfigProvider.php

@@ -56,35 +56,6 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
             </group>
-
-
-            <!-- Apple Pay -->
-            <group id="moyasar_apple_pay" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="3" translate="label">
-                <label>Apple Pay Configuration</label>
-        
-                <field id="merchant_id" translate="label" type="text" sortOrder="30" showInDefault="1"
-                       showInWebsite="1" showInStore="0">
-                    <label>Apple Pay Merchant ID</label>
-                    <comment>Used for initiating Apple Pay Sessions</comment>
-                </field>
-                <field id="validate_merchant_cert" translate="label" type="Magento\Framework\Data\Form\Element\File" sortOrder="39" showInDefault="1" showInWebsite="0" >
-                    <label>Validation Certificate</label>
-                    <backend_model>Moyasar\Mysr\Model\Config\ApplePayCertificateFile</backend_model>
-                    <upload_dir config="system" scope_info="1">moyasar/applepay/certificates</upload_dir>
-                    <comment>Used for initiating Apple Pay Sessions</comment>
-                </field>
-                <field id="validate_merchant_pk" translate="label" type="Magento\Framework\Data\Form\Element\File" sortOrder="40" showInDefault="1" showInWebsite="0" >
-                    <label>Certificate Private Key</label>
-                    <backend_model>Moyasar\Mysr\Model\Config\ApplePayCertificateFile</backend_model>
-                    <upload_dir config="system" scope_info="1">moyasar/applepay/certificates</upload_dir>
-                    <comment>Used for initiating Apple Pay Sessions</comment>
-                </field>
-                <field id="validate_merchant_pk_password" translate="label" type="text" sortOrder="30" showInDefault="1"
-                       showInWebsite="1" showInStore="0">
-                    <label>Private Key Password</label>
-                    <comment>Used for initiating Apple Pay Sessions, Only set if there is a password for your private key</comment>
-                </field>
-            </group>
         </section>
     </system>
 </config>

Moyasar/Mysr/etc/adminhtml/system.xml

@@ -18,14 +18,6 @@
 				<stc_pay>0</stc_pay>
 				<apple_pay>0</apple_pay>
 			</moyasar_online_payment>
-
-			<moyasar_apple_pay>
-				<active>0</active>
-				<model>Moyasar\Mysr\Model\Payment\MoyasarApplePay</model>
-				<order_status>pending_payment</order_status>
-				<title>Apple Pay</title>
-				<sort_order>0</sort_order>
-			</moyasar_apple_pay>
 		</payment>
 	</default>
 </config>

Moyasar/Mysr/etc/config.xml

@@ -56,8 +56,8 @@ define(
                     on_completed: this.onCompleted.bind(this),
                     on_failure: this.onFailure.bind(this),
                     apple_pay: {
-                        label: this.getStoreName(),
-                        validate_merchant_url: this.getValidationUrl(),
+                        label: this.getDomain(),
+                        validate_merchant_url: 'https://api.moyasar.com/v1/applepay/initiate',
                         country: this.getCountry()
                     },
                 });
@@ -88,6 +88,9 @@ define(
             getApiKey: function () {
                 return window.checkoutConfig.moyasar_online_payment.api_key;
             },
+            getDomain: function () {
+                return window.checkoutConfig.moyasar_online_payment.domain_name;
+            },
             getAmount: function () {
                 return parseFloat(quote.totals()['base_grand_total']).toFixed(2);
             },