Skip to content

Commit f66c1cf

Browse files
recca0120recca0120
committed
refactor
1 parent 72da487 commit f66c1cf

12 files changed

+242
-191
lines changed

‎src/Message/AbstractRequest.php‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,31 @@
33
namespace Omnipay\NewebPay\Message;
44

55
use Omnipay\Common\Message\AbstractRequest as BaseAbstractRequest;
6+
use Psr\Http\Message\ResponseInterface;
67

78
/**
89
* Abstract Request
910
*/
1011
abstract class AbstractRequest extends BaseAbstractRequest
1112
{
13+
/**
14+
* @param ResponseInterface|string $response
15+
* @return array
16+
*/
17+
protected function decodeResponse($response)
18+
{
19+
$responseText = ! $response instanceof ResponseInterface
20+
? $response
21+
: trim((string) $response->getBody());
22+
23+
$data = json_decode($responseText, true);
24+
if (json_last_error() === JSON_ERROR_NONE) {
25+
$result = array_merge(['Status' => $data['Status'], 'Message' => $data['Message']], $data['Result']);
26+
} else {
27+
$result = [];
28+
parse_str($responseText, $result);
29+
}
30+
31+
return $result;
32+
}
1233
}

‎src/Message/CompletePurchaseRequest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ public function getData()
1616
{
1717
$data = $this->httpRequest->request->all();
1818
$tradeSha = $this->tradeSha($data['TradeInfo']);
19-
$data['Result'] = $this->decrypt($data['TradeInfo']);
2019
if (! hash_equals($tradeSha, $data['TradeSha'])) {
2120
throw new InvalidResponseException('Incorrect TradeSha');
2221
}
2322

24-
return $data;
23+
return $this->decodeResponse($this->decrypt($data['TradeInfo']));
2524
}
2625

2726
public function sendData($data)
2827
{
28+
2929
return $this->response = new CompletePurchaseResponse($this, $data);
3030
}
3131
}

‎src/Message/CompletePurchaseResponse.php‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public function isSuccessful(): bool
1111

1212
public function getMessage()
1313
{
14-
return $this->data['Result']['Message'];
14+
return $this->data['Message'];
1515
}
1616

1717
public function getCode()
@@ -21,15 +21,11 @@ public function getCode()
2121

2222
public function getTransactionReference()
2323
{
24-
return array_key_exists('Result', $this->data['Result'])
25-
? $this->data['Result']['Result']['TradeNo']
26-
: $this->data['Result']['TradeNo'];
24+
return $this->data['TradeNo'];
2725
}
2826

2927
public function getTransactionId()
3028
{
31-
return array_key_exists('Result', $this->data['Result'])
32-
? $this->data['Result']['Result']['MerchantOrderNo']
33-
: $this->data['Result']['MerchantOrderNo'];
29+
return $this->data['MerchantOrderNo'];
3430
}
3531
}

‎src/Message/FetchTransactionRequest.php‎

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,11 @@ public function getGateway()
4444

4545
/**
4646
* @throws InvalidRequestException
47+
* @throws InvalidResponseException
4748
*/
4849
public function getData()
4950
{
50-
$data = array_filter([
51+
$postData = array_filter([
5152
'MerchantID' => $this->getMerchantID(),
5253
'Version' => $this->getVersion() ?: '1.3',
5354
'RespondType' => $this->getRespondType(),
@@ -59,37 +60,23 @@ public function getData()
5960
return $value !== null && $value !== '';
6061
});
6162

62-
$data['CheckValue'] = $this->checkValue($data);
63-
64-
return $data;
65-
}
63+
$postData['CheckValue'] = $this->checkValue($postData);
6664

67-
/**
68-
* @throws InvalidResponseException
69-
*/
70-
public function sendData($data)
71-
{
7265
$response = $this->httpClient->request('POST', $this->getEndpoint(), [
7366
'Content-Type' => 'application/x-www-form-urlencoded',
74-
], http_build_query($data));
75-
76-
$body = trim((string) $response->getBody());
77-
$result = json_decode($body, true);
67+
], http_build_query($postData));
7868

79-
if (json_last_error() === JSON_ERROR_NONE) {
69+
$decode = $this->decodeResponse($response);
8070

81-
if (! hash_equals($result['Result']['CheckCode'], $this->checkCode($result['Result']))) {
82-
throw new InvalidResponseException('Incorrect CheckCode');
83-
}
84-
} else {
85-
$result = [];
86-
parse_str($body, $result);
87-
88-
if (! hash_equals($result['CheckCode'], $this->checkCode($result))) {
89-
throw new InvalidResponseException('Incorrect CheckCode');
90-
}
71+
if (! hash_equals($decode['CheckCode'], $this->checkCode($decode))) {
72+
throw new InvalidResponseException('Incorrect CheckCode');
9173
}
9274

93-
return $this->response = new FetchTransactionResponse($this, $result);
75+
return $decode;
76+
}
77+
78+
public function sendData($data)
79+
{
80+
return $this->response = new FetchTransactionResponse($this, $data);
9481
}
9582
}

‎src/Message/FetchTransactionResponse.php‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ public function isCancelled()
1616

1717
public function getCode()
1818
{
19-
return array_key_exists('Result', $this->data)
20-
? $this->data['Result']['TradeStatus']
21-
: $this->data['TradeStatus'];
19+
return $this->data['TradeStatus'];
2220
}
2321

2422
public function getMessage()
@@ -36,15 +34,11 @@ public function getMessage()
3634

3735
public function getTransactionReference()
3836
{
39-
return array_key_exists('Result', $this->data)
40-
? $this->data['Result']['TradeNo']
41-
: $this->data['TradeNo'];
37+
return $this->data['TradeNo'];
4238
}
4339

4440
public function getTransactionId()
4541
{
46-
return array_key_exists('Result', $this->data)
47-
? $this->data['Result']['MerchantOrderNo']
48-
: $this->data['MerchantOrderNo'];
42+
return $this->data['MerchantOrderNo'];
4943
}
5044
}

‎src/Message/VoidRequest.php‎

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Omnipay\NewebPay\Message;
44

5+
use Omnipay\Common\Exception\InvalidRequestException;
56
use Omnipay\Common\Exception\InvalidResponseException;
67
use Omnipay\NewebPay\Traits\HasDefaults;
78

@@ -60,9 +61,13 @@ public function getIndexType()
6061
return $this->getParameter('IndexType') ?: 1;
6162
}
6263

64+
/**
65+
* @throws InvalidRequestException
66+
* @throws InvalidResponseException
67+
*/
6368
public function getData()
6469
{
65-
return array_filter([
70+
$postData = array_filter([
6671
'RespondType' => $this->getRespondType(),
6772
'Version' => $this->getVersion() ?: '1.0',
6873
'Amt' => (int) $this->getAmount(),
@@ -73,37 +78,25 @@ public function getData()
7378
], static function ($value) {
7479
return $value !== null && $value !== '';
7580
});
76-
}
7781

78-
/**
79-
* @throws InvalidResponseException
80-
*/
81-
public function sendData($data)
82-
{
8382
$response = $this->httpClient->request('POST', $this->getEndpoint(), [
8483
'Content-Type' => 'application/x-www-form-urlencoded',
8584
], http_build_query([
8685
'MerchantID_' => $this->getMerchantID(),
87-
'PostData_' => $this->encrypt($data),
86+
'PostData_' => $this->encrypt($postData),
8887
]));
8988

90-
$body = trim((string) $response->getBody());
91-
92-
$result = json_decode($body, true);
89+
$decode = $this->decodeResponse($response);
9390

94-
if (json_last_error() === JSON_ERROR_NONE) {
95-
if (! hash_equals($result['Result']['CheckCode'], $this->checkCode($result['Result']))) {
96-
throw new InvalidResponseException('Incorrect CheckCode');
97-
}
98-
} else {
99-
$result = [];
100-
parse_str(trim((string) $response->getBody()), $result);
101-
102-
if (! hash_equals($result['CheckCode'], $this->checkCode($result))) {
103-
throw new InvalidResponseException('Incorrect CheckCode');
104-
}
91+
if (! hash_equals($decode['CheckCode'], $this->checkCode($decode))) {
92+
throw new InvalidResponseException('Incorrect CheckCode');
10593
}
10694

107-
return $this->response = new VoidResponse($this, $result);
95+
return $decode;
96+
}
97+
98+
public function sendData($data)
99+
{
100+
return $this->response = new VoidResponse($this, $data);
108101
}
109102
}

‎src/Message/VoidResponse.php‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,11 @@ public function getMessage()
2121

2222
public function getTransactionReference()
2323
{
24-
return array_key_exists('Result', $this->data)
25-
? $this->data['Result']['TradeNo']
26-
: $this->data['TradeNo'];
24+
return $this->data['TradeNo'];
2725
}
2826

2927
public function getTransactionId()
3028
{
31-
return array_key_exists('Result', $this->data)
32-
? $this->data['Result']['MerchantOrderNo']
33-
: $this->data['MerchantOrderNo'];
29+
return $this->data['MerchantOrderNo'];
3430
}
3531
}

‎src/Traits/HasDefaults.php‎

Lines changed: 2 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
namespace Omnipay\NewebPay\Traits;
44

55
use Omnipay\Common\Exception\InvalidRequestException;
6-
use Omnipay\NewebPay\Encryptor;
76

87
trait HasDefaults
98
{
9+
use HasEncryptor;
10+
1011
/**
1112
* 藍新金流商店代號
1213
*
@@ -158,47 +159,4 @@ public function getAmt()
158159
return (int) $this->getAmount();
159160
}
160161

161-
public function encrypt(array $data)
162-
{
163-
$encryptor = new Encryptor($this->getHashKey(), $this->getHashIv());
164-
165-
return $encryptor->encrypt($data);
166-
}
167-
168-
public function decrypt(string $plainText)
169-
{
170-
$encryptor = new Encryptor($this->getHashKey(), $this->getHashIv());
171-
$result = $encryptor->decrypt($plainText);
172-
173-
$data = json_decode($result, true);
174-
if (json_last_error() === JSON_ERROR_NONE) {
175-
return $data;
176-
}
177-
178-
$data = [];
179-
parse_str($result, $data);
180-
181-
return $data;
182-
}
183-
184-
public function tradeSha($plainText)
185-
{
186-
$encryptor = new Encryptor($this->getHashKey(), $this->getHashIv());
187-
188-
return $encryptor->tradeSha($plainText);
189-
}
190-
191-
public function checkValue($data)
192-
{
193-
$encryptor = new Encryptor($this->getHashKey(), $this->getHashIv());
194-
195-
return $encryptor->checkValue($data);
196-
}
197-
198-
public function checkCode($data)
199-
{
200-
$encryptor = new Encryptor($this->getHashKey(), $this->getHashIv());
201-
202-
return $encryptor->checkCode($data);
203-
}
204162
}

‎src/Traits/HasEncryptor.php‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?php
2+
3+
namespace Omnipay\NewebPay\Traits;
4+
5+
use Omnipay\NewebPay\Encryptor;
6+
7+
trait HasEncryptor
8+
{
9+
public function encrypt(array $data)
10+
{
11+
return $this->getEncryptor()->encrypt($data);
12+
}
13+
14+
public function decrypt(string $plainText)
15+
{
16+
return $this->getEncryptor()->decrypt($plainText);
17+
}
18+
19+
public function tradeSha($plainText)
20+
{
21+
return $this->getEncryptor()->tradeSha($plainText);
22+
}
23+
24+
public function checkValue($data)
25+
{
26+
return $this->getEncryptor()->checkValue($data);
27+
}
28+
29+
public function checkCode($data)
30+
{
31+
return $this->getEncryptor()->checkCode($data);
32+
}
33+
34+
private function getEncryptor()
35+
{
36+
return new Encryptor($this->getHashKey(), $this->getHashIv());
37+
}
38+
}

0 commit comments

Comments
 (0)