Added pos gateway.

vuongxuongminh · vuongxuongminh · commit 24b109264baf · 2019-06-25T13:01:34.000+07:00
diff --git a/src/AllInOneGateway.php b/src/AllInOneGateway.php
@@ -34,9 +34,7 @@ public function getName(): string
     }
 
     /**
-     * Create complete purchase request.
-     *
-     * @param  array  $options
+     * {@inheritdoc}
      * @return \Omnipay\Common\Message\RequestInterface|CompletePurchaseRequest
      */
     public function completePurchase(array $options = []): CompletePurchaseRequest
@@ -45,7 +43,7 @@ public function completePurchase(array $options = []): CompletePurchaseRequest
     }
 
     /**
-     * Create complete purchase notification request.
+     * Tạo request notification gửi từ MoMo.
      *
      * @param  array  $options
      * @return \Omnipay\Common\Message\RequestInterface|NotificationRequest
@@ -85,7 +83,8 @@ public function refund(array $options = [])
     }
 
     /**
-     * {@inheritdoc}
+     * Tạo yêu cầu truy vấn thông tin hoàn tiền đến MoMo.
+     *
      * @return \Omnipay\Common\Message\RequestInterface|QueryRefundRequest
      */
     public function queryRefund(array $options = [])
diff --git a/src/Concerns/PosParameters.php b/src/Concerns/PosParameters.php
@@ -20,8 +20,18 @@ trait PosParameters
      *
      * @param  string  $key
      */
-    public function setPublicKey($key): void
+    public function setPublicKey(string $key): void
     {
         $this->setParameter('publicKey', $key);
     }
+
+    /**
+     * Thiết lập pos version.
+     *
+     * @param  string  $version
+     */
+    public function setVersion(string $version): void
+    {
+        $this->setParameter('version', $version);
+    }
 }
diff --git a/src/Message/AbstractHashRequest.php b/src/Message/AbstractHashRequest.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * @link https://github.com/phpviet/omnipay-momo
+ * @copyright (c) PHP Viet
+ * @license [MIT](http://www.opensource.org/licenses/MIT)
+ */
+
+namespace Omnipay\MoMo\Message;
+
+use Omnipay\Common\Message\AbstractRequest;
+
+/**
+ * @author Vuong Minh <vuongxuongminh@gmail.com>
+ * @since 1.0.0
+ */
+abstract class AbstractHashRequest extends AbstractRequest
+{
+    use Concerns\RequestHash;
+    use Concerns\RequestEndpoint;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getData(): array
+    {
+        $parameters = $this->getParameters();
+        call_user_func_array([$this, 'validate'], $this->getHashParameters());
+        $parameters['hash'] = $this->generateHash();
+        unset($parameters['secretKey'], $parameters['testMode'], $parameters['publicKey']);
+
+        return $parameters;
+    }
+}
diff --git a/src/Message/AbstractResponse.php b/src/Message/AbstractResponse.php
@@ -7,7 +7,6 @@
 
 namespace Omnipay\MoMo\Message;
 
-use Omnipay\Common\Message\RequestInterface;
 use Omnipay\Common\Message\AbstractResponse as BaseAbstractResponse;
 
 /**
@@ -17,31 +16,24 @@
 abstract class AbstractResponse extends BaseAbstractResponse
 {
     use Concerns\ResponseProperties;
-    use Concerns\ResponseSignatureValidation;
 
     /**
-     * Khởi tạo đối tượng Response.
+     * Trả về trạng thái do MoMo phản hồi.
      *
-     * @param  \Omnipay\Common\Message\RequestInterface  $request
-     * @param $data
-     * @throws \Omnipay\Common\Exception\InvalidResponseException
+     * @return bool
      */
-    public function __construct(RequestInterface $request, $data)
+    public function isSuccessful(): bool
     {
-        parent::__construct($request, $data);
-
-        if ('0' === $this->getCode()) {
-            $this->validateSignature();
-        }
+        return '0' === $this->getCode();
     }
 
     /**
-     * Trả về trạng thái do MoMo phản hồi.
+     * Trả về thông báo từ MoMo.
      *
-     * @return bool
+     * @return null|string
      */
-    public function isSuccessful(): bool
+    public function getMessage(): ?string
     {
-        return '0' === $this->getCode();
+        return $this->data['message'] ?? null;
     }
 }
diff --git a/src/Message/AbstractSignatureRequest.php b/src/Message/AbstractSignatureRequest.php
@@ -7,20 +7,19 @@
 
 namespace Omnipay\MoMo\Message;
 
-use Omnipay\Common\Message\AbstractRequest as BaseAbstractRequest;
+use Omnipay\Common\Message\AbstractRequest;
 
 /**
  * @author Vuong Minh <vuongxuongminh@gmail.com>
  * @since 1.0.0
  */
-abstract class AbstractRequest extends BaseAbstractRequest
+abstract class AbstractSignatureRequest extends AbstractRequest
 {
     use Concerns\RequestEndpoint;
     use Concerns\RequestSignature;
 
     /**
      * {@inheritdoc}
-     * @throws \Omnipay\Common\Exception\InvalidRequestException
      */
     public function getData(): array
     {
diff --git a/src/Message/AbstractSignatureResponse.php b/src/Message/AbstractSignatureResponse.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * @link https://github.com/phpviet/omnipay-momo
+ * @copyright (c) PHP Viet
+ * @license [MIT](http://www.opensource.org/licenses/MIT)
+ */
+
+namespace Omnipay\MoMo\Message;
+
+use Omnipay\Common\Message\RequestInterface;
+
+/**
+ * @author Vuong Minh <vuongxuongminh@gmail.com>
+ * @since 1.0.0
+ */
+abstract class AbstractSignatureResponse extends AbstractResponse
+{
+    use Concerns\ResponseSignatureValidation;
+
+    /**
+     * Khởi tạo đối tượng Response.
+     *
+     * @param  \Omnipay\Common\Message\RequestInterface  $request
+     * @param $data
+     * @throws \Omnipay\Common\Exception\InvalidResponseException
+     */
+    public function __construct(RequestInterface $request, $data)
+    {
+        parent::__construct($request, $data);
+
+        if ('0' === $this->getCode()) {
+            $this->validateSignature();
+        }
+    }
+}
diff --git a/src/Message/AllInOne/AbstractSignatureRequest.php b/src/Message/AllInOne/AbstractSignatureRequest.php
@@ -8,13 +8,13 @@
 namespace Omnipay\MoMo\Message\AllInOne;
 
 use Omnipay\MoMo\Concerns\AllInOneParameters;
-use Omnipay\MoMo\Message\AbstractRequest as BaseAbstractRequest;
+use Omnipay\MoMo\Message\AbstractSignatureRequest as BaseAbstractSignatureRequest;
 
 /**
  * @author Vuong Minh <vuongxuongminh@gmail.com>
  * @since 1.0.0
  */
-abstract class AbstractRequest extends BaseAbstractRequest
+abstract class AbstractSignatureRequest extends BaseAbstractSignatureRequest
 {
     use AllInOneParameters;
 
@@ -45,8 +45,8 @@ public function sendData($data)
             'Content-Type' => 'application/json; charset=UTF-8',
         ], json_encode($data));
         $responseClass = $this->responseClass;
-        $responseData = json_decode($response->getBody()->getContents(), true);
+        $responseData = $response->getBody()->getContents();
 
-        return $this->response = new $responseClass($this, $responseData ?? []);
+        return $this->response = new $responseClass($this, json_decode($responseData, true) ?? []);
     }
 }
diff --git a/src/Message/AllInOne/AbstractSignatureResponse.php b/src/Message/AllInOne/AbstractSignatureResponse.php
@@ -7,24 +7,14 @@
 
 namespace Omnipay\MoMo\Message\AllInOne;
 
-use Omnipay\MoMo\Message\AbstractResponse as BaseAbstractResponse;
+use Omnipay\MoMo\Message\AbstractSignatureResponse as BaseAbstractSignatureResponse;
 
 /**
  * @author Vuong Minh <vuongxuongminh@gmail.com>
  * @since 1.0.0
  */
-abstract class AbstractResponse extends BaseAbstractResponse
+abstract class AbstractSignatureResponse extends BaseAbstractSignatureResponse
 {
-    /**
-     * Trả về thông báo từ MoMo.
-     *
-     * @return null|string
-     */
-    public function getMessage(): ?string
-    {
-        return $this->data['message'] ?? null;
-    }
-
     /**
      * Trả về mã báo lỗi từ MoMo. Nếu là 0 thì tương đương với thành công.
      *
diff --git a/src/Message/AllInOne/IncomingResponse.php b/src/Message/AllInOne/IncomingResponse.php
@@ -11,7 +11,7 @@
  * @author Vuong Minh <vuongxuongminh@gmail.com>
  * @since 1.0.0
  */
-class IncomingResponse extends AbstractResponse
+class IncomingResponse extends AbstractSignatureResponse
 {
     /**
      * {@inheritdoc}
diff --git a/src/Message/AllInOne/PurchaseRequest.php b/src/Message/AllInOne/PurchaseRequest.php
@@ -13,7 +13,7 @@
  * @author Vuong Minh <vuongxuongminh@gmail.com>
  * @since 1.0.0
  */
-class PurchaseRequest extends AbstractRequest
+class PurchaseRequest extends AbstractSignatureRequest
 {
     /**
      * {@inheritdoc}
diff --git a/src/Message/AllInOne/PurchaseResponse.php b/src/Message/AllInOne/PurchaseResponse.php
@@ -13,7 +13,7 @@
  * @author Vuong Minh <vuongxuongminh@gmail.com>
  * @since 1.0.0
  */
-class PurchaseResponse extends AbstractResponse implements RedirectResponseInterface
+class PurchaseResponse extends AbstractSignatureResponse implements RedirectResponseInterface
 {
     /**
      * {@inheritdoc}
diff --git a/src/Message/AllInOne/QueryRefundRequest.php b/src/Message/AllInOne/QueryRefundRequest.php
@@ -13,7 +13,7 @@
  * @author Vuong Minh <vuongxuongminh@gmail.com>
  * @since 1.0.0
  */
-class QueryRefundRequest extends AbstractRequest
+class QueryRefundRequest extends AbstractSignatureRequest
 {
     /**
      * {@inheritdoc}
diff --git a/src/Message/AllInOne/QueryRefundResponse.php b/src/Message/AllInOne/QueryRefundResponse.php
@@ -11,7 +11,7 @@
  * @author Vuong Minh <vuongxuongminh@gmail.com>
  * @since 1.0.0
  */
-class QueryRefundResponse extends AbstractResponse
+class QueryRefundResponse extends AbstractSignatureResponse
 {
     /**
      * {@inheritdoc}
diff --git a/src/Message/AllInOne/QueryTransactionRequest.php b/src/Message/AllInOne/QueryTransactionRequest.php
@@ -13,7 +13,7 @@
  * @author Vuong Minh <vuongxuongminh@gmail.com>
  * @since 1.0.0
  */
-class QueryTransactionRequest extends AbstractRequest
+class QueryTransactionRequest extends AbstractSignatureRequest
 {
     /**
      * {@inheritdoc}
diff --git a/src/Message/AllInOne/QueryTransactionResponse.php b/src/Message/AllInOne/QueryTransactionResponse.php
@@ -11,7 +11,7 @@
  * @author Vuong Minh <vuongxuongminh@gmail.com>
  * @since 1.0.0
  */
-class QueryTransactionResponse extends AbstractResponse
+class QueryTransactionResponse extends AbstractSignatureResponse
 {
     /**
      * {@inheritdoc}
diff --git a/src/Message/AllInOne/RefundRequest.php b/src/Message/AllInOne/RefundRequest.php
@@ -13,7 +13,7 @@
  * @author Vuong Minh <vuongxuongminh@gmail.com>
  * @since 1.0.0
  */
-class RefundRequest extends AbstractRequest
+class RefundRequest extends AbstractSignatureRequest
 {
     /**
      * {@inheritdoc}
diff --git a/src/Message/AllInOne/RefundResponse.php b/src/Message/AllInOne/RefundResponse.php
@@ -11,7 +11,7 @@
  * @author Vuong Minh <vuongxuongminh@gmail.com>
  * @since 1.0.0
  */
-class RefundResponse extends AbstractResponse
+class RefundResponse extends AbstractSignatureResponse
 {
     /**
      * {@inheritdoc}
diff --git a/src/Message/Concerns/RequestHash.php b/src/Message/Concerns/RequestHash.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @link https://github.com/phpviet/omnipay-momo
+ * @copyright (c) PHP Viet
+ * @license [MIT](http://www.opensource.org/licenses/MIT)
+ */
+
+namespace Omnipay\MoMo\Message\Concerns;
+
+use Omnipay\MoMo\Support\RSAEncrypt;
+
+/**
+ * @author Vuong Minh <vuongxuongminh@gmail.com>
+ * @since 1.0.0
+ */
+trait RequestHash
+{
+    /**
+     * Trả về dữ liệu mã hóa theo [[getHashParameters()]].
+     *
+     * @return string
+     */
+    protected function generateHash(): string
+    {
+        $data = [];
+        $rsa = new RSAEncrypt($this->getParameter('publicKey'));
+
+        foreach ($this->getHashParameters() as $parameter) {
+            $data[$parameter] = $this->getParameter($parameter);
+        }
+
+        return $rsa->encrypt($data);
+    }
+
+    /**
+     * Trả về danh sách parameters dùng để mã hóa gửi đến MoMo.
+     *
+     * @return array
+     */
+    abstract protected function getHashParameters(): array;
+}
diff --git a/src/Message/PayConfirmRequest.php b/src/Message/PayConfirmRequest.php
diff --git a/src/Message/PayConfirmResponse.php b/src/Message/PayConfirmResponse.php
diff --git a/src/Message/Pos/PurchaseRequest.php b/src/Message/Pos/PurchaseRequest.php
diff --git a/src/Message/Pos/PurchaseResponse.php b/src/Message/Pos/PurchaseResponse.php
diff --git a/src/PosGateway.php b/src/PosGateway.php

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,18 @@ trait PosParameters`
`20`	`20`	`*`
`21`	`21`	`* @param string $key`
`22`	`22`	`*/`
`23`		`- public function setPublicKey($key): void`
	`23`	`+ public function setPublicKey(string $key): void`
`24`	`24`	`{`
`25`	`25`	`$this->setParameter('publicKey', $key);`
`26`	`26`	`}`
	`27`	`+`
	`28`	`+ /**`
	`29`	`+ * Thiết lập pos version.`
	`30`	`+ *`
	`31`	`+ * @param string $version`
	`32`	`+ */`
	`33`	`+ public function setVersion(string $version): void`
	`34`	`+ {`
	`35`	`+ $this->setParameter('version', $version);`
	`36`	`+ }`
`27`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`
`8`	`8`	`namespace Omnipay\MoMo\Message;`
`9`	`9`
`10`		`-use Omnipay\Common\Message\RequestInterface;`
`11`	`10`	`use Omnipay\Common\Message\AbstractResponse as BaseAbstractResponse;`
`12`	`11`
`13`	`12`	`/**`
`@@ -17,31 +16,24 @@`
`17`	`16`	`abstract class AbstractResponse extends BaseAbstractResponse`
`18`	`17`	`{`
`19`	`18`	`use Concerns\ResponseProperties;`
`20`		`- use Concerns\ResponseSignatureValidation;`
`21`	`19`
`22`	`20`	`/**`
`23`		`- * Khởi tạo đối tượng Response.`
	`21`	`+ * Trả về trạng thái do MoMo phản hồi.`
`24`	`22`	`*`
`25`		`- * @param \Omnipay\Common\Message\RequestInterface $request`
`26`		`- * @param $data`
`27`		`- * @throws \Omnipay\Common\Exception\InvalidResponseException`
	`23`	`+ * @return bool`
`28`	`24`	`*/`
`29`		`- public function __construct(RequestInterface $request, $data)`
	`25`	`+ public function isSuccessful(): bool`
`30`	`26`	`{`
`31`		`- parent::__construct($request, $data);`
`32`		`-`
`33`		`- if ('0' === $this->getCode()) {`
`34`		`- $this->validateSignature();`
`35`		`- }`
	`27`	`+ return '0' === $this->getCode();`
`36`	`28`	`}`
`37`	`29`
`38`	`30`	`/**`
`39`		`- * Trả về trạng thái do MoMo phản hồi.`
	`31`	`+ * Trả về thông báo từ MoMo.`
`40`	`32`	`*`
`41`		`- * @return bool`
	`33`	`+ * @return null\|string`
`42`	`34`	`*/`
`43`		`- public function isSuccessful(): bool`
	`35`	`+ public function getMessage(): ?string`
`44`	`36`	`{`
`45`		`- return '0' === $this->getCode();`
	`37`	`+ return $this->data['message'] ?? null;`
`46`	`38`	`}`
`47`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`* @author Vuong Minh <[email protected]>`
`12`	`12`	`* @since 1.0.0`
`13`	`13`	`*/`
`14`		`-class IncomingResponse extends AbstractResponse`
	`14`	`+class IncomingResponse extends AbstractSignatureResponse`
`15`	`15`	`{`
`16`	`16`	`/**`
`17`	`17`	`* {@inheritdoc}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`* @author Vuong Minh <[email protected]>`
`14`	`14`	`* @since 1.0.0`
`15`	`15`	`*/`
`16`		`-class PurchaseRequest extends AbstractRequest`
	`16`	`+class PurchaseRequest extends AbstractSignatureRequest`
`17`	`17`	`{`
`18`	`18`	`/**`
`19`	`19`	`* {@inheritdoc}`