fixes #17 #18 AbstractAuthentication, fix Password constructor and add Rsa password capability

kakawait · kakawait · commit 7872e75e5f44 · 2014-03-02T13:22:11.000+01:00
diff --git a/src/Jumper/Communicator/Authentication/AbstractAuthentication.php b/src/Jumper/Communicator/Authentication/AbstractAuthentication.php
@@ -0,0 +1,26 @@
+<?php
+
+
+namespace Jumper\Communicator\Authentication;
+
+/**
+ * Class AbstractAuthentication
+ *
+ * @package Jumper\Communicator\Authentication
+ * @author  Thibaud Leprêtre
+ * @license MIT
+ */
+abstract class AbstractAuthentication
+{
+    protected $user;
+
+    public function __construct($user)
+    {
+        $this->user = $user;
+    }
+
+    public function getUser()
+    {
+        return $this->user;
+    }
+} 
diff --git a/src/Jumper/Communicator/Authentication/None.php b/src/Jumper/Communicator/Authentication/None.php
@@ -11,16 +11,15 @@
  * @author  Thibaud Leprêtre
  * @license MIT
  */
-class None implements Authentication
+class None extends AbstractAuthentication implements Authentication
 {
+
     /**
-     * @var string user
+     * @param string $user
      */
-    private $user;
-
     public function __construct($user)
     {
-        $this->user = $user;
+        parent::__construct($user);
     }
 
     /**
@@ -31,11 +30,4 @@ public function getAuthentication()
         return null;
     }
 
-    /**
-     * @return string user
-     */
-    public function getUser()
-    {
-        return $this->user;
-    }
 }
diff --git a/src/Jumper/Communicator/Authentication/Password.php b/src/Jumper/Communicator/Authentication/Password.php
@@ -11,42 +11,30 @@
  * @author  Thibaud Leprêtre
  * @license MIT
  */
-class Password implements Authentication
+class Password extends AbstractAuthentication implements Authentication
 {
 
-    /**
-     * @var string user
-     */
-    private $user;
-
     /**
      * @var string password
      */
     private $password;
 
     /**
      * @param string $user
-     * @param $password
+     * @param string $password
      */
-    public function _construct($user, $password)
+    public function __construct($user, $password)
     {
-        $this->user = $user;
+        parent::__construct($user);
         $this->password = $password;
     }
 
     /**
-     * @return mixed
+     * @return string
      */
     public function getAuthentication()
     {
         return $this->password;
     }
 
-    /**
-     * @return mixed
-     */
-    public function getUser()
-    {
-        return $this->user;
-    }
 }
diff --git a/src/Jumper/Communicator/Authentication/Rsa.php b/src/Jumper/Communicator/Authentication/Rsa.php
@@ -12,14 +12,9 @@
  * @author  Thibaud Leprêtre
  * @license MIT
  */
-class Rsa implements Authentication
+class Rsa extends AbstractAuthentication implements Authentication
 {
 
-    /**
-     * @var string user
-     */
-    private $user;
-
     /**
      * @var string rsa key path
      */
@@ -37,7 +32,7 @@ class Rsa implements Authentication
      */
     public function __construct($user, $key, $password = null)
     {
-        $this->user = $user;
+        parent::__construct($user);
         $this->key = $key;
         $this->password = $password;
     }
@@ -49,14 +44,10 @@ public function getAuthentication()
     {
         $key = new RsaKey();
         $key->loadKey(file_get_contents($this->key));
+        if (!isNull($this->password)) {
+            $key->setPassword($this->password);
+        }
         return $key;
     }
 
-    /**
-     * @return string user
-     */
-    public function getUser()
-    {
-        return $this->user;
-    }
 }
