Merge branch 'rpc-credentials'

Author: epoxa

README.md

@@ -10,7 +10,9 @@ Please note, this library is by far not completed and but can be used in product
 First you need to setup a new Electrum wallet. Follow the instructions according to your OS at the [Electrum Download Page](https://electrum.org/#download). After the successfull installation you need to set a rpcport by typing:
 ```
 electrum setconfig rpcport 7777
-``` 
+electrum setconfig rpcuser "RPC_USER_NAME"
+electrum setconfig rpcpassword "VERY_SECRET_NOT_STARTED_WITH_DIGIT"
+```
 Then we can create a default wallet, dont forget to note your generated seed, it's nescessary if you want to recover it one day:
 ```
 electrum create
@@ -58,7 +60,7 @@ $response->getVersion();
 ## Custom Client Configuration
 Every Request/Method takes a `Electrum\Client`-instance as parameter which replaces the default one. A custom instance can be usefull if you want to set custom config params like another Hostname or Port.
 ```php
-$client = new \Electrum\Client('http://127.0.0.1', 7777);
+$client = new \Electrum\Client('http://127.0.0.1', 7777, 0, 'RPC_USER_NAME', 'VERY_SECRET_NOT_STARTED_WITH_DIGIT');
 $method = new \Electrum\Request\Method\Version($client);
 
 try {
@@ -88,4 +90,4 @@ try {
         $exception->getMessage()
     ));
 }
-```
+```

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "epoxa/php-electrum-api",
+    "name": "padrio/php-electrum-api",
     "description": "PHP wrapper for Electrum JSONRPC-API",
     "type": "library",
 	"keywords": ["electrum", "bitcoin", "payment", "jsonrpc", "api"],

src/Client.php

@@ -22,6 +22,18 @@ class Client
      */
     private $port = 0;
 
+    /**
+     * JSONRPC User Name
+     * @var string
+     */
+    private $user = '';
+
+    /**
+     * JSONRPC Password
+     * @var string
+     */
+    private $pass = '';
+
     /**
      * Last Message-ID
      * @var int
@@ -32,11 +44,20 @@ class Client
      * @param string $host
      * @param int    $port
      * @param int    $id
+     * @param string $user
+     * @param string $password
      */
-    public function __construct($host = 'http://127.0.0.1', $port = 7777, $id = 0)
-    {
+    public function __construct(
+        $host = 'http://127.0.0.1',
+        $port = 7777,
+        $id = 0,
+        $user = null,
+        $password = null
+    ) {
         $this->setHost($host);
         $this->setPort($port);
+        $this->setUserName($user);
+        $this->setPassword($password);
         $this->setId($id);
     }
 
@@ -110,6 +131,13 @@ private function executeCurlRequest($request)
             CURLOPT_POST           => true,
             CURLOPT_POSTFIELDS     => $request,
         ]);
+
+        // Authorization
+        if ($this->user || $this->pass) {
+            curl_setopt($curl, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
+            curl_setopt($curl, CURLOPT_USERPWD, $this->user . ":" . $this->pass);
+        }
+
         // Execute request & convert data to array
         $response = curl_exec($curl);
 
@@ -167,6 +195,48 @@ public function setPort($port)
         return $this;
     }
 
+    /**
+     * @return string
+     */
+    public function getUserName()
+    {
+        return $this->user;
+    }
+
+    /**
+     * @param $value
+     *
+     * @return Request
+     *
+     */
+    public function setUserName($value)
+    {
+        $this->user = $value;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPassword()
+    {
+        return $this->pass;
+    }
+
+    /**
+     * @param $value
+     *
+     * @return Request
+     *
+     */
+    public function setPassword($value)
+    {
+        $this->pass = $value;
+
+        return $this;
+    }
+
     /**
      * @return int
      */
@@ -194,4 +264,4 @@ public function setId($id)
 
         return $this;
     }
-}
+}