Merge pull request #10 from segsalerty2013/dev

Allow use of optional proxy address for network call to OPay server.
segsalerty2013 · Jun 6, 2020 · 1c7aa1d · 1c7aa1d
2 parents 0d9fb9f + ae47097
commit 1c7aa1d
Showing 1 changed file with 23 additions and 12 deletions.
diff --git a/src/MerchantCashier.php b/src/MerchantCashier.php
@@ -23,13 +23,24 @@ class MerchantCashier
     private $publicKey;
     private $privateKey;
 
-    public function __construct(string $environmentBaseUrl, string $pbKey, string $pvKey, string $merchantId) {
+    private $proxyAddress;
+
+    public function __construct(string $environmentBaseUrl, string $pbKey, string $pvKey,
+                                string $merchantId, ?array $proxyAddress = null) {
         $this->merchantId = $merchantId;
         $this->publicKey = $pbKey;
         $this->privateKey = $pvKey;
         $this->networkClient = new Client([
             'base_uri'=> $environmentBaseUrl
         ]);
+        $this->proxyAddress = $proxyAddress;
+    }
+
+    private function buildRequestOptions(array $options) : array {
+        if ($this->proxyAddress) {
+            $options[RequestOptions::PROXY] = $this->proxyAddress;
+        }
+        return $options;
     }
 
     public final function order(OrderRequest $order) : void {
@@ -45,37 +56,37 @@ public final function orderClose(OrderCloseRequest $orderClose) : void {
     }
 
     public final function getOrderApiResult() : ?OrderResponse {
-        $response = $this->networkClient->post('/api/v3/cashier/initialize', [
-                RequestOptions::JSON=> $this->orderData,
-                RequestOptions::HEADERS=> [
-                    'Authorization'=> 'Bearer '.$this->publicKey,
-                    'MerchantId'=> $this->merchantId
-                ]
-            ]);
+        $response = $this->networkClient->post('/api/v3/cashier/initialize', $this->buildRequestOptions([
+            RequestOptions::JSON=> $this->orderData,
+            RequestOptions::HEADERS=> [
+                'Authorization'=> 'Bearer '.$this->publicKey,
+                'MerchantId'=> $this->merchantId
+            ]
+        ]));
         return OrderResponse::cast(new OrderResponse(), json_decode($response->getBody()->getContents(), false));
     }
 
     public final function getOrderStatusApiResult() : ?OrderResponse {
         $_signature = hash_hmac('sha512', json_encode($this->orderStatusData) , $this->privateKey);
-        $response = $this->networkClient->post("/api/v3/cashier/status", [
+        $response = $this->networkClient->post("/api/v3/cashier/status",$this->buildRequestOptions([
             RequestOptions::JSON=> $this->orderStatusData,
             RequestOptions::HEADERS=> [
                 'Authorization'=> 'Bearer '.$_signature,
                 'MerchantId'=> $this->merchantId
             ]
-        ]);
+        ]));
         return OrderResponse::cast(new OrderResponse(), json_decode($response->getBody()->getContents(), false));
     }
 
     public final function getOrderCloseApiResult() : ?OrderResponse {
         $_signature = hash_hmac('sha512', json_encode($this->orderCloseData) , $this->privateKey);
-        $response = $this->networkClient->post("/api/v3/cashier/close", [
+        $response = $this->networkClient->post("/api/v3/cashier/close", $this->buildRequestOptions([
             RequestOptions::JSON=> $this->orderCloseData,
             RequestOptions::HEADERS=> [
                 'Authorization'=> 'Bearer '.$_signature,
                 'MerchantId'=> $this->merchantId
             ]
-        ]);
+        ]));
         return OrderResponse::cast(new OrderResponse(), json_decode($response->getBody()->getContents(), false));
     }