Merge branch 'beta' of https://github.com/kielsoft/plugin-magento-2

Author: kielsoft

Controller/Payment/AbstractPaystackStandard.php

@@ -66,6 +66,12 @@ abstract class AbstractPaystackStandard extends \Magento\Framework\App\Action\Ac
      * @var \Psr\Log\LoggerInterface
      */
     protected $logger;
+    
+    /**
+     *
+     * @var \Magento\Framework\App\Request\Http 
+     */
+    protected $request;
 
     /**
      * Constructor
@@ -83,6 +89,7 @@ public function __construct(
             \Magento\Framework\Message\ManagerInterface $messageManager,
             \Pstk\Paystack\Model\Ui\ConfigProvider $configProvider,
             \Magento\Framework\Event\Manager $eventManager,
+            \Magento\Framework\App\Request\Http $request,
             \Psr\Log\LoggerInterface $logger
     ) {
         $this->resultPageFactory = $resultPageFactory;
@@ -93,6 +100,7 @@ public function __construct(
         $this->messageManager = $messageManager;
         $this->configProvider = $configProvider;
         $this->eventManager = $eventManager;
+        $this->request = $request;
         $this->logger = $logger;
 
         $this->paystack = $this->initPaystackPHP();

Controller/Payment/Callback.php

@@ -31,7 +31,7 @@ class Callback extends AbstractPaystackStandard {
      */
     public function execute() {
 
-        $reference = isset($_GET['reference']) ? $_GET['reference'] : '';
+        $reference = $this->request->get('reference');
         $message = "";
 
         if (!$reference) {

Controller/Payment/Webhook.php

@@ -33,6 +33,8 @@ public function execute() {
         // Retrieve the request's body and parse it as JSON
         $event = \Yabacon\Paystack\Event::capture();
         http_response_code(200);
+        
+        $resultFactory = $this->resultFactory->create(\Magento\Framework\Controller\ResultFactory::TYPE_RAW);
 
         /* It is a important to log all events received. Add code *
          * here to log the signature and body to db or file       */
@@ -44,7 +46,8 @@ public function execute() {
 
         if (!$owner) {
             // None of the keys matched the event's signature
-            die("auth failed");
+            $resultFactory->setContents("auth failed");
+            return $resultFactory;
         }
 
         // Do something with $event->obj
@@ -81,20 +84,23 @@ public function execute() {
                         $this->eventManager->dispatch('paystack_payment_verify_after', [
                             "paystack_order" => $order,
                         ]);
-                        die("success");
+                        
+                        $resultFactory->setContents("success");
+                        return $resultFactory;
                     }
                 }
                 break;
         }
 
-        die("failed");
+        $resultFactory->setContents("failed");
+        return $resultFactory;
     }
 
-    public function createCsrfValidationException(\Magento\Framework\App\RequestInterface $request): ?\Magento\Framework\App\Request\InvalidRequestException {
+    public function createCsrfValidationException(\Magento\Framework\App\RequestInterface $request) {
         return null;
     }
 
-    public function validateForCsrf(\Magento\Framework\App\RequestInterface $request): ?bool {
+    public function validateForCsrf(\Magento\Framework\App\RequestInterface $request) {
         return true;
     }
 

composer.json

@@ -1,6 +1,7 @@
 {
     "name": "pstk/paystack-magento2-module",
     "description": "Paystack Magento2 Module using \\Magento\\Payment\\Model\\Method\\AbstractMethod",
+    "version": "2.3.0",
     "require": {
         "yabacon/paystack-php": "2.*"
     },