Changeset 2867007

Timestamp:

02/17/2023 02:06:41 PM (3 years ago)

Author:

paybyrd

Message:

Implement validations for webhook services

Location:

paybyrd/trunk

Files:

• README.txt (modified) (1 diff)
• languages/paybyrd-woocommerce-en_US.po (modified) (1 diff)
• languages/paybyrd-woocommerce-pt_PT.po (modified) (1 diff)
• languages/paybyrd-woocommerce.pot (modified) (1 diff)
• paybyrd-payment.php (modified) (8 diffs)

paybyrd/trunk/README.txt

@@ -5 +5 @@
 Requires at least: 4.7
 Tested up to: 5.8
-Stable tag: 2.0.0
+Stable tag: 2.4.0
 Requires PHP: 7.0
 License: GPLv2 or later

paybyrd/trunk/languages/paybyrd-woocommerce-en_US.po

@@ -1 +1 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Paybyrd Payment Plugin 2.3.0\n"
+"Project-Id-Version: Paybyrd Payment Plugin 2.4.0\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

paybyrd/trunk/languages/paybyrd-woocommerce-pt_PT.po

@@ -1 +1 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Paybyrd Payment Plugin 2.3.0\n"
+"Project-Id-Version: Paybyrd Payment Plugin 2.4.0\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

paybyrd/trunk/languages/paybyrd-woocommerce.pot

@@ -1 +1 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Paybyrd Payment Plugin 2.3.0\n"
+"Project-Id-Version: Paybyrd Payment Plugin 2.4.0\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"

paybyrd/trunk/paybyrd-payment.php

@@ -5 +5 @@
      * Author: Paybyrd
      * Author URI: https://www.paybyrd.com
-     * Version: 2.3.0
+     * Version: 2.4.0
      * Domain Path: /languages
      */
@@ -372 +372 @@
                         'result' => 'success',
                         'redirect' => add_query_arg('order', $order->get_id(),
-                        add_query_arg('key', $order_key, $this->get_return_url($order)))
+                        add_query_arg('key', $order_key, add_query_arg(array(), $wp->request)))
                     ];
                 }
@@ -467 +467 @@
         // Setup REST
         add_action('rest_api_init', 'generate_rest');
-        function validateWebhook($orderId, $privateKey, $hookUser, $hookPassword, $hookTestUser, $hookTestPassword, $testMode) {
+        function validateWebhook($orderId, $privateKey, $hookUser, $hookPassword, $hookTestUser, $hookTestPassword, $testMode, $API_URL, $paidOrderStatus) {
             global $wp;
             global $woocommerce;
@@ -481 +481 @@
             ];
 
-            $response = wp_remote_get($this->API_URL . 'api/v2/orders/' . $orderId, $args);
+            $response = wp_remote_get($API_URL . 'api/v2/orders/' . $orderId, $args);
             $response = wp_remote_retrieve_body($response);
             $response = json_decode($response, true);
@@ -492 +492 @@
             $userTestAuth = $hookTestUser . ':' . $hookTestPassword;
             $order = wc_get_order(substr($response['orderRef'], 3));
+
+            if (!$response) {
+                http_response_code(404);
+                echo "Order not found";
+                exit();
+            }
 
             // Set new Order State based on WebHook response
@@ -504 +510 @@
                         if ($testMode) {
                             $order->update_status('payment-test', __('Test Approved', 'paybyrd-woocommerce'));
+                            echo "Test order updated successfully";
                         } else {
-                            $order->update_status($this->paidOrderStatus, __('Payment successfully paid', 'paybyrd-woocommerce'));
+                            $order->update_status($paidOrderStatus, __('Payment successfully paid', 'paybyrd-woocommerce'));
+                            echo "Order updated successfully";
                         }
 
                         if (WC()->cart) {
+                            echo "Cart was empty";
                             WC()->cart->empty_cart();
                         }
+                        echo "Operation successfull";
                         break;
                     case 'Refunded':
                     case 'refunded':
                         $order->update_status('refunded', __('Payment refunded', 'paybyrd-woocommerce'));
+                        echo "Order refunded";
                         break;
                     default:
+                        echo "Order still being processed";
                         break;
                 }
@@ -532 +544 @@
                     // GET orderId from POST Webhook
                     $webhookData = json_decode(file_get_contents('php://input'), true);
+                    
+                    if (!$webhookData) {
+                        echo "No webhook data found";
+                        http_response_code(404);
+                        exit();
+                    }
+                    if (!$webhookData['orderId']) {
+                        echo "No orderId found";
+                        http_response_code(404);
+                        exit();
+                    }
 
                     return validateWebhook($webhookData['orderId'], $paybyrd->private_key, $paybyrd->hook_user, $paybyrd->hook_password, $paybyrd->hook_test_user, $paybyrd->hook_test_password, $paybyrd->testmode);
@@ -544 +567 @@
                     $response = $paybyrd->generate_hook(true);
 
+                    if (!$response) {
+                        http_response_code(400);
+                    }
+
                     echo json_encode($response);
                     exit();