Improved architecture

src/Adapters/Contract/Credential.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace HankIT\ConsoleAccess\Adapters\Contract;
+
+interface Credential
+{
+    public function get();
+}

src/Adapters/SshAdapter/Adapter.php

@@ -3,6 +3,7 @@
 namespace HankIT\ConsoleAccess\Adapters\SshAdapter;
 
 use Closure;
+use HankIT\ConsoleAccess\Adapters\Contract\Credential;
 use HankIT\ConsoleAccess\Exceptions\ConnectionNotPossibleException;
 use HankIT\ConsoleAccess\Exceptions\PublicKeyMismatchException;
 use HankIT\ConsoleAccess\Interfaces\AdapterInterface;
@@ -14,20 +15,26 @@ class Adapter implements AdapterInterface
 
     protected string $username;
 
+    protected Credential  $credential;
+
     protected ?string $publicKey;
 
     protected ?string $output = null;
 
+    protected bool $initialLogin = false;
+
     public function __construct(
         SSH2 $connection,
         string $username,
+        Credential $credential,
         ?string $publicKey = null
-    )
-    {
+    ){
         $this->connection = $connection;
 
         $this->username = $username;
 
+        $this->credential = $credential;
+
         $this->publicKey = $publicKey;
     }
 
@@ -41,26 +48,18 @@ public function getServerPublicHostKey(): string
         return $this->connection->getServerPublicHostKey();
     }
 
-    public function loginPassword(string $password): void
+    public function run(string $command, Closure $live = null): void
     {
-        if (! is_null($this->publicKey) && $this->getServerPublicHostKey() !== $this->publicKey) {
-            throw new PublicKeyMismatchException('Public key mismatch');
-        }
+        if (! $this->initialLogin) {
+            $this->login();
 
-        $this->login($password);
-    }
-
-    public function loginKey(Key $key): void
-    {
-        if (! is_null($this->publicKey) && $this->getServerPublicHostKey() !== $this->publicKey) {
-            throw new PublicKeyMismatchException('Public key mismatch');
+            $this->initialLogin = true;
         }
 
-        $this->login($key->get());
-    }
+        if (! $this->connection->ping()) {
+            throw new ConnectionNotPossibleException('Ping failed');
+        }
 
-    public function run(string $command, Closure $live = null): void
-    {
         $this->output = $this->connection->exec($command, $live);
     }
 
@@ -73,10 +72,14 @@ public function getExitStatus(): int
     {
         return $this->connection->getExitStatus();
     }
-    
-    protected function login($auth): void
+
+    protected function login(): void
     {
-        if (! $this->connection->login($this->username, $auth)) {
+        if (! is_null($this->publicKey) && $this->getServerPublicHostKey() !== $this->publicKey) {
+            throw new PublicKeyMismatchException('Public key mismatch');
+        }
+
+        if (! $this->connection->login($this->username, $this->credential->get())) {
             throw new ConnectionNotPossibleException('Not connected');
         }
     }

src/Adapters/SshAdapter/Key.php

@@ -2,10 +2,11 @@
 
 namespace HankIT\ConsoleAccess\Adapters\SshAdapter;
 
+use HankIT\ConsoleAccess\Adapters\Contract\Credential;
 use phpseclib3\Crypt\Common\AsymmetricKey;
 use phpseclib3\Crypt\PublicKeyLoader;
 
-class Key
+class Key implements Credential
 {
     protected AsymmetricKey $key;
 

src/Adapters/SshAdapter/Password.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace HankIT\ConsoleAccess\Adapters\SshAdapter;
+
+use HankIT\ConsoleAccess\Adapters\Contract\Credential;
+
+class Password implements Credential
+{
+    protected string $password;
+
+    public function __construct(string $password)
+    {
+        $this->password = $password;
+    }
+
+    public function get(): string
+    {
+        return $this->password;
+    }
+}

tests/Adapters/SshAdapter/AdapterTest.php

@@ -4,9 +4,8 @@
 
 use Hamcrest\Core\IsEqual;
 use HankIT\ConsoleAccess\Adapters\SshAdapter\Adapter;
-use HankIT\ConsoleAccess\Adapters\SshAdapter\Key;
+use HankIT\ConsoleAccess\Adapters\SshAdapter\Password;
 use Mockery;
-use phpseclib3\Crypt\EC;
 use phpseclib3\Net\SSH2;
 use Tests\TestCase;
 
@@ -21,7 +20,7 @@ public function it_gets_the_connection_status()
 
         $sshMock->shouldReceive('isConnected')->once()->andReturn(true);
 
-        $adapter = new Adapter($sshMock, $this->fake()->userName);
+        $adapter = new Adapter($sshMock, $this->fake()->userName, new Password('test'));
 
         $this->assertTrue($adapter->available());
     }
@@ -35,73 +34,36 @@ public function it_gets_the_server_public_key()
 
         $sshMock->shouldReceive('getServerPublicHostKey')->once()->andReturn($content = $this->fake()->randomHtml);
 
-        $adapter = new Adapter($sshMock, $this->fake()->userName);
+        $adapter = new Adapter($sshMock, $this->fake()->userName, new Password('test'));
 
         $this->assertEquals($content, $adapter->getServerPublicHostKey());
     }
 
     /**
      * @test
      */
-    public function it_tests_the_password_login_without_public_key_verification()
+    public function it_authenticates_using_a_password_runs_a_command_and_verifies_the_output()
     {
         $sshMock = Mockery::mock(SSH2::class);
 
         $username = $this->fake()->userName;
         $password = $this->fake()->password;
+        $command = $this->fake()->randomHtml;
+        $output = $this->fake()->randomHtml;
 
         $sshMock->shouldReceive('login')->withArgs([
             IsEqual::equalTo($username),
             IsEqual::equalTo($password),
         ])->once()->andReturnTrue();
 
-        $adapter = new Adapter($sshMock, $username);
-
-        $adapter->loginPassword($password);
-    }
-
-    /**
-     * @test
-     */
-    public function it_tests_the_key_login_without_public_key_verification()
-    {
-        $sshMock = Mockery::mock(SSH2::class);
-
-        $username = $this->fake()->userName;
-
-        $key = "-----BEGIN OPENSSH PRIVATE KEY-----\nb3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtz\nc2gtZWQyNTUxOQAAACBILfCZGUhmIGgm+5zmcCvvDE4iYwnGx1zsVpOQ24NAjQAA\nAKCE2ZLxhNmS8QAAAAtzc2gtZWQyNTUxOQAAACBILfCZGUhmIGgm+5zmcCvvDE4i\nYwnGx1zsVpOQ24NAjQAAAEC7O4xjSTxQxZcpftnuwdei3EOXxSa1taCHQr5jtUtQ\n1Ugt8JkZSGYgaCb7nOZwK+8MTiJjCcbHXOxWk5Dbg0CNAAAAFGVkMjU1MTkta2V5\nLTIwMjIxMjIxAQIDBAUGBwgJ\n-----END OPENSSH PRIVATE KEY-----";
-
-        $sshMock->shouldReceive('login')->withArgs([
-            IsEqual::equalTo($username),
-            Mockery::on(function($arg) {
-                $this->assertInstanceOf(EC::class, $arg);
-
-                return true;
-            })
-        ])->once()->andReturnTrue();
-
-        $adapter = new Adapter($sshMock, $username);
-
-        $adapter->loginKey(new Key($key));
-    }
-
-    /**
-     * @test
-     */
-    public function it_runs_a_command_and_verifies_the_output()
-    {
-        $sshMock = Mockery::mock(SSH2::class);
-
-        $username = $this->fake()->userName;
-        $command = $this->fake()->randomHtml;
-        $output = $this->fake()->randomHtml;
-
         $sshMock->shouldReceive('exec')->withArgs([
             IsEqual::equalTo($command),
             IsEqual::equalTo(null),
         ])->once()->andReturn($output);
 
-        $adapter = new Adapter($sshMock, $username);
+        $sshMock->shouldReceive('ping')->once()->andReturnTrue();
+
+        $adapter = new Adapter($sshMock, $username, new Password($password));
 
         $adapter->run($command);
 
@@ -117,7 +79,7 @@ public function it_gets_the_exist_status()
 
         $sshMock->shouldReceive('getExitStatus')->once()->andReturn(0);
 
-        $adapter = new Adapter($sshMock, $this->fake()->userName);
+        $adapter = new Adapter($sshMock, $this->fake()->userName, new Password('test'));
 
         $this->assertEquals(0, $adapter->getExitStatus());
     }