Merge pull request #5 from pr0head/master

Added options <username> and <password> for http-authorization on rem…

Author: misterion

.gitignore

@@ -1,3 +1,4 @@
+.idea
 build
 vendor
 composer.lock

lib/GameNet/Jabber/RpcClient.php

@@ -71,6 +71,14 @@ class RpcClient
      * @var int
      */
     protected $timeout;
+    /**
+     * @var string
+     */
+    protected $username;
+    /**
+     * @var string
+     */
+    protected $password;
 
     public function __construct(array $options)
     {
@@ -84,8 +92,17 @@ public function __construct(array $options)
 
         $this->server = $options['server'];
         $this->host = $options['host'];
+        $this->username = isset($options['username']) ? $options['username'] : '';
+        $this->password = isset($options['password']) ? $options['password'] : '';
         $this->debug = isset($options['debug']) ? (bool)$options['debug'] : false;
         $this->timeout = isset($options['timeout']) ? (int)$options['timeout'] : 5;
+
+        if ($this->username && !$this->password) {
+            throw new \InvalidArgumentException("Password cannot be empty if username was defined");
+        }
+        if (!$this->username && $this->password) {
+            throw new \InvalidArgumentException("Username cannot be empty if password was defined");
+        }
     }
 
     /**
@@ -110,6 +127,12 @@ public function getTimeout()
 
     protected function sendRequest($command, array $params)
     {
+        if ($this->username && $this->password) {
+            $params = [
+                ['user' => $this->username, 'server' => $this->server, 'password' => $this->password], $params
+            ];
+        }
+
         $request = xmlrpc_encode_request($command, $params, ['encoding' => 'utf-8', 'escaping' => 'markup']);
 
         $ch = curl_init();
@@ -122,6 +145,7 @@ protected function sendRequest($command, array $params)
         curl_setopt($ch, CURLOPT_POST, true);
         curl_setopt($ch, CURLOPT_POSTFIELDS, $request);
         curl_setopt($ch, CURLOPT_HTTPHEADER, ['User-Agent: GameNet', 'Content-Type: text/xml']);
+
         $response = curl_exec($ch);
         curl_close($ch);
 

tests/GameNet/Jabber/RpcClientTest.php

@@ -37,8 +37,25 @@ public function testSetGetTimeout()
         $this->assertEquals(600, $client->getTimeout());
     }
 
-    private function getClient()
+    /**
+     * @dataProvider invalidCredentials
+     * @expectedException InvalidArgumentException
+     */
+    public function testInvalidCredentials($username, $password)
+    {
+        $this->getClient(['username' => $username, 'password' => $password]);
+    }
+
+    public function invalidCredentials()
+    {
+        return [
+            ['username' => 'username', 'password' => ''],
+            ['username' => '', 'password' => 'password'],
+        ];
+    }
+
+    private function getClient(array $options = [])
     {
-        return new RpcClient(['server' => 'test', 'host' => 'test']);
+        return new RpcClient(['server' => 'test', 'host' => 'test'] + $options);
     }
 }