get data from request

Author: recca0120

src/Hasher.php

@@ -34,6 +34,6 @@ public function make(array $data)
         }
         $body = substr($body, 0, -1);
 
-        return strtoupper(md5($body));
+        return strtoupper(md5((string) $body));
     }
 }

src/Message/AbstractRequest.php

@@ -27,8 +27,6 @@ protected function mergeSign(array $data)
 
     protected function makeHash(array $data)
     {
-        $hasher = new Hasher($this->getKey());
-
-        return $hasher->make($data);
+        return (new Hasher($this->getKey()))->make($data);
     }
 }

src/Message/AcceptNotificationRequest.php

@@ -15,6 +15,22 @@ public function sendData($data)
         return $this->response = new AcceptNotificationResponse($this, $data);
     }
 
+    /**
+     * @return string
+     */
+    public function getTransactionId()
+    {
+        return $this->getNotificationResponse()->getTransactionId();
+    }
+
+    /**
+     * @return string
+     */
+    public function getTransactionReference()
+    {
+        return $this->getNotificationResponse()->getTransactionReference();
+    }
+
     /**
      * @return string
      */

src/Message/CompletePurchaseRequest.php

@@ -8,96 +8,35 @@
 
 class CompletePurchaseRequest extends AbstractRequest
 {
-    use HasAmount;
-    use HasCommon;
-
-    public function getStatus()
-    {
-        return $this->getParameter('status');
-    }
-
-    public function setStatus($value)
-    {
-        return $this->setParameter('status', $value);
-    }
-
-    public function getResult()
-    {
-        return $this->getParameter('result');
-    }
-
-    public function setResult($value)
-    {
-        return $this->setParameter('result', $value);
-    }
-
-    public function getOrderdate()
-    {
-        return $this->getParameter('orderdate');
-    }
-
-    public function setOrderdate($value)
-    {
-        return $this->setParameter('orderdate', $value);
-    }
-
-    public function getAuthcode()
-    {
-        return $this->getParameter('authcode');
-    }
-
-    public function setAuthcode($value)
-    {
-        return $this->setParameter('authcode', $value);
-    }
-
-    public function getBankcard()
-    {
-        return $this->getParameter('bankcoard');
-    }
-
-    public function setBankcard($value)
-    {
-        return $this->setParameter('bankcoard', $value);
-    }
-
-    public function getPeriods()
-    {
-        return $this->getParameter('periods');
-    }
-
-    public function setPeriods($value)
-    {
-        return $this->setParameter('periods', $value);
-    }
-
     public function getData()
     {
-        return [
-            'orgno' => $this->getOrgNo(),
-            'secondtimestamp' => $this->getSecondTimestamp(),
-            'nonce_str' => $this->getNonceStr(),
-            'sign' => $this->getSign(),
-            'out_trade_no' => $this->getTransactionId(),
-            'status' => $this->getStatus(),
-            'result' => $this->getResult(),
-            'total_fee' => $this->getAmount(),
-            'orderdate' => $this->getOrderdate(),
-            'authcode' => $this->getAuthcode(),
-            'bankcard' => $this->getBankcard(),
-            'periods' => $this->getPeriods(),
-        ];
+        return $this->httpRequest->request->all();
     }
 
     /**
      * @throws InvalidRequestException
      */
     public function sendData($data)
     {
-        if ($data['sign'] !== $this->makeHash($data)) {
+        if (! hash_equals($this->httpRequest->request->get('sign', ''), $this->makeHash($data))) {
             throw new InvalidRequestException('Incorrect hash');
         }
 
         return $this->response = new CompletePurchaseResponse($this, $data);
     }
+
+    protected function makeHash(array $data)
+    {
+        $temp = [];
+        $keys = [
+            'authcode', 'bankcard', 'nonce_str', 'orderdate', 'orgno', 'out_trade_no', 'result', 'status',
+            'secondtimestamp', 'total_fee',
+        ];
+
+        foreach ($keys as $key) {
+            $temp[$key] = $data[$key];
+        }
+
+        return parent::makeHash($temp);
+    }
 }

src/Message/PurchaseRequest.php

@@ -2,7 +2,6 @@
 
 namespace Omnipay\WanPay\Message;
 
-use JsonException;
 use Omnipay\Common\Exception\InvalidRequestException;
 use Omnipay\Common\Exception\InvalidResponseException;
 use Omnipay\Common\ItemBag;
@@ -178,7 +177,7 @@ public function sendData($data)
             $body
         );
 
-        $responseData = json_decode((string) $response->getBody(), true, 512, JSON_THROW_ON_ERROR);
+        $responseData = json_decode((string) $response->getBody(), true);
 
         if ($responseData['status'] !== '900') {
             throw new InvalidResponseException($responseData['info'], $responseData['status']);

tests/GatewayTest.php

@@ -62,10 +62,11 @@ public function testCompletePurchase()
     {
         $response = 'https://member.healthchain.com.tw/MHC01SSV2TEST/Checkout/CheckOutShowResultWangPay.aspx?authcode=154566&bankcard=552199******1898&nonce_str=46444248&orgno=21001719&out_trade_no=040911560243087HRC&result=核准&secondtimestamp=1586404583&status=0000&total_fee=100&orderdate=2020-04-09 11:56:02&trxtoken=&storename=旺旺電子商務-快點付&details=固定金額 免收件地址&payername=0409&payermobile=0409&payeremail=0409&sign=7F015EB2B4674CD76C9C62090B6DF3E2';
         $parsed = parse_url($response);
-        $options = [];
-        parse_str($parsed['query'], $options);
+        $data = [];
+        parse_str($parsed['query'], $data);
 
-        $response = $this->gateway->completePurchase($options)->send();
+        $this->getHttpRequest()->request->add($data);
+        $response = $this->gateway->completePurchase()->send();
 
         self::assertTrue($response->isSuccessful());
         self::assertEquals('0000', $response->getCode());
@@ -77,10 +78,11 @@ public function testAcceptNotification()
     {
         $response = 'https://member.healthchain.com.tw/MHC01SSV2TEST/Checkout/CheckOutShowResultWangPay.aspx?authcode=154566&bankcard=552199******1898&nonce_str=46444248&orgno=21001719&out_trade_no=040911560243087HRC&result=核准&secondtimestamp=1586404583&status=0000&total_fee=100&orderdate=2020-04-09 11:56:02&trxtoken=&storename=旺旺電子商務-快點付&details=固定金額 免收件地址&payername=0409&payermobile=0409&payeremail=0409&sign=C720CD30C24DB5A372A33B90D2906C46';
         $parsed = parse_url($response);
-        $options = [];
-        parse_str($parsed['query'], $options);
+        $data = [];
+        parse_str($parsed['query'], $data);
 
-        $request = $this->gateway->acceptNotification($options);
+        $this->getHttpRequest()->request->add($data);
+        $request = $this->gateway->acceptNotification();
         self::assertEquals('核准', $request->getMessage());
         self::assertEquals(NotificationInterface::STATUS_COMPLETED, $request->getTransactionStatus());