worked around aura free bug

Author: transistive

src/Bolt/BoltConnectionPool.php

@@ -94,7 +94,7 @@ public function acquire(
 
     public function canConnect(UriInterface $uri, AuthenticateInterface $authenticate): bool
     {
-        $bolt = BoltFactory::fromVariables($uri, null, null, $authenticate, $this->driverConfig);
+        $bolt = BoltFactory::fromVariables($uri, $authenticate, $this->driverConfig);
 
         try {
             $bolt->build();
@@ -108,9 +108,12 @@ public function canConnect(UriInterface $uri, AuthenticateInterface $authenticat
     /**
      * @throws \ReflectionException
      */
-    private function getConnection(UriInterface $connectingTo, AuthenticateInterface $authenticate, SessionConfiguration $config): BoltConnection
-    {
-        $factory = BoltFactory::fromVariables($connectingTo, null, null, $authenticate, $this->driverConfig);
+    private function getConnection(
+        UriInterface $connectingTo,
+        AuthenticateInterface $authenticate,
+        SessionConfiguration $config
+    ): BoltConnection {
+        $factory = BoltFactory::fromVariables($connectingTo, $authenticate, $this->driverConfig);
         [$bolt, $response] = $factory->build();
 
         return new BoltConnection(

src/Bolt/SslConfigurator.php

@@ -11,18 +11,16 @@
 
 namespace Laudis\Neo4j\Bolt;
 
-use function count;
 use function explode;
 use const FILTER_VALIDATE_IP;
 use function filter_var;
 use Laudis\Neo4j\Databags\DriverConfiguration;
 use Laudis\Neo4j\Enum\SslMode;
-use Laudis\Neo4j\Neo4j\RoutingTable;
 use Psr\Http\Message\UriInterface;
 
 final class SslConfigurator
 {
-    public function configure(UriInterface $uri, UriInterface $server, ?RoutingTable $table, DriverConfiguration $config): ?array
+    public function configure(UriInterface $uri, DriverConfiguration $config): ?array
     {
         $sslMode = $config->getSslConfiguration()->getMode();
         $sslConfig = '';
@@ -37,14 +35,6 @@ public function configure(UriInterface $uri, UriInterface $server, ?RoutingTable
         }
 
         if (str_starts_with($sslConfig, 's')) {
-            // We have to pass a different host when working with ssl on aura.
-            // There is a strange behaviour where if we pass the uri host on a single
-            // instance aura deployment, we need to pass the original uri for the
-            // ssl configuration to be valid.
-            if ($table && count($table->getWithRole()) > 1) {
-                return $this->enableSsl($server->getHost(), $sslConfig, $config);
-            }
-
             return $this->enableSsl($uri->getHost(), $sslConfig, $config);
         }
 

src/BoltFactory.php

@@ -23,7 +23,6 @@
 use Laudis\Neo4j\Databags\DriverConfiguration;
 use Laudis\Neo4j\Databags\TransactionConfiguration;
 use Laudis\Neo4j\Exception\Neo4jException;
-use Laudis\Neo4j\Neo4j\RoutingTable;
 use Psr\Http\Message\UriInterface;
 use RuntimeException;
 
@@ -87,22 +86,19 @@ public function getConnection(): IConnection
 
     public static function fromVariables(
         UriInterface $uri,
-        ?UriInterface $server,
-        ?RoutingTable $table,
         AuthenticateInterface $authenticate,
         DriverConfiguration $config
     ): self {
-        $connectingTo = $server ?? $uri;
-        $socket = new StreamSocket($uri->getHost(), $connectingTo->getPort() ?? 7687, TransactionConfiguration::DEFAULT_TIMEOUT);
+        $socket = new StreamSocket($uri->getHost(), $uri->getPort() ?? 7687, TransactionConfiguration::DEFAULT_TIMEOUT);
 
-        self::configureSsl($uri, $connectingTo, $socket, $table, $config);
+        self::configureSsl($uri, $socket, $config);
 
         return new self(new Bolt($socket), $authenticate, $config->getUserAgent(), $socket);
     }
 
-    private static function configureSsl(UriInterface $uri, UriInterface $server, StreamSocket $socket, ?RoutingTable $table, DriverConfiguration $config): void
+    private static function configureSsl(UriInterface $uri, StreamSocket $socket, DriverConfiguration $config): void
     {
-        $options = (new SslConfigurator())->configure($uri, $server, $table, $config);
+        $options = (new SslConfigurator())->configure($uri, $config);
 
         if ($options !== null) {
             $socket->setSslContextOptions($options);

src/Neo4j/Neo4jConnectionPool.php

@@ -14,6 +14,7 @@
 namespace Laudis\Neo4j\Neo4j;
 
 use function array_slice;
+use function array_unique;
 use Bolt\protocol\V3;
 use Bolt\protocol\V4;
 use Bolt\protocol\V4_3;
@@ -78,7 +79,7 @@ public function acquire(
             $connection->close();
         }
 
-        $server = $this->getNextServer($table, $config->getAccessMode());
+        $server = $this->getNextServer($table, $config->getAccessMode()) ?? $uri;
 
         $authenticate = Authenticate::fromUrl($uri);
 
@@ -92,8 +93,13 @@ public function acquire(
     /**
      * @throws Exception
      */
-    private function getNextServer(RoutingTable $table, AccessMode $mode): Uri
+    private function getNextServer(RoutingTable $table, AccessMode $mode): ?Uri
     {
+        $servers = array_unique($table->getWithRole());
+        if (count($servers) === 1) {
+            return null;
+        }
+
         if (AccessMode::WRITE() === $mode) {
             $servers = $table->getWithRole(RoutingRoles::LEADER());
         } else {

tests/Unit/SslConfiguratorTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /*
  * This file is part of the Laudis Neo4j package.
  *
@@ -40,7 +42,7 @@ public function testDisablePeerVerification(): void
             );
 
         $uri = Uri::create('');
-        $array = $this->configurator->configure($uri, $uri, null, $config);
+        $array = $this->configurator->configure($uri, $config);
 
         self::assertNotNull($array);
         self::assertArrayHasKey('verify_peer', $array);
@@ -58,7 +60,7 @@ public function testEnablePeerVerification(): void
             );
 
         $uri = Uri::create('');
-        $array = $this->configurator->configure($uri, $uri, null, $config);
+        $array = $this->configurator->configure($uri, $config);
 
         self::assertNotNull($array);
         self::assertArrayHasKey('verify_peer', $array);
@@ -76,7 +78,7 @@ public function testSelfSigned(): void
             );
 
         $uri = Uri::create('');
-        $array = $this->configurator->configure($uri, $uri, null, $config);
+        $array = $this->configurator->configure($uri, $config);
 
         self::assertNotNull($array);
         self::assertArrayHasKey('allow_self_signed', $array);
@@ -93,7 +95,7 @@ public function testFromUriNull(): void
             );
 
         $uri = Uri::create('neo4j://localhost');
-        $array = $this->configurator->configure($uri, $uri, null, $config);
+        $array = $this->configurator->configure($uri, $config);
 
         self::assertNull($array);
     }
@@ -107,7 +109,7 @@ public function testFromUri(): void
             );
 
         $uri = Uri::create('neo4j+s://localhost');
-        $array = $this->configurator->configure($uri, $uri, null, $config);
+        $array = $this->configurator->configure($uri, $config);
 
         self::assertNotNull($array);
         self::assertArrayHasKey('verify_peer', $array);