check key exists

omnipay-taiwan · Feb 26, 2024 · 3b7eb01 · 3b7eb01
1 parent 71582f7
commit 3b7eb01
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/Message/MyCash/CompletePurchaseRequest.php b/src/Message/MyCash/CompletePurchaseRequest.php
@@ -18,7 +18,7 @@ class CompletePurchaseRequest extends AbstractRequest
     public function getData()
     {
         $data = $this->httpRequest->request->all();
-        $validate = $data['Validate'];
+        $validate = array_key_exists('Validate', $data) ? $data['Validate'] : '';
 
         if ($this->makeHash($data) !== $validate) {
             throw new InvalidRequestException('Incorrect hash');

diff --git a/src/Traits/MyCash/HasMyCash.php b/src/Traits/MyCash/HasMyCash.php
@@ -52,12 +52,14 @@ public function setMerTradeID($value)
     private function makeHash(array $data)
     {
         $hasher = new Hasher($this->getHashKey(), $this->getValidateKey());
+        $lookup = ['RtnCode' => 'RtnCode', 'TradeID' => 'MerTradeID', 'UserID' => 'MerUserID', 'Money' => 'Amount'];
+        $result = [];
+        foreach ($lookup as $from => $to) {
+            if (array_key_exists($to, $data)) {
+                $result[$from] = $data[$to];
+            }
+        }
 
-        return $hasher->make([
-            'RtnCode' => $data['RtnCode'],
-            'TradeID' => $data['MerTradeID'],
-            'UserID' => $data['MerUserID'],
-            'Money' => $data['Amount'],
-        ]);
+        return $hasher->make($result);
     }
 }