finish authentication

Author: transistive

phpunit.xml.dist

@@ -15,6 +15,6 @@
         </testsuite>
     </testsuites>
     <php>
-        <env name="CONNECTION" value="neo4j://neo4j:testtest@localhost" />
+        <env name="CONNECTION" value="neo4j://neo4j:testtest@localhost:11687" />
     </php>
 </phpunit>

src/Authentication/BasicAuth.php

@@ -15,10 +15,13 @@
 
 use function base64_encode;
 
-use Bolt\helpers\Auth;
-use Bolt\protocol\Response;
+use Bolt\enum\Signature;
 use Bolt\protocol\V4_4;
 use Bolt\protocol\V5;
+use Bolt\protocol\V5_1;
+use Bolt\protocol\V5_2;
+use Bolt\protocol\V5_3;
+use Bolt\protocol\V5_4;
 use Exception;
 use Laudis\Neo4j\Contracts\AuthenticateInterface;
 use Laudis\Neo4j\Exception\Neo4jException;
@@ -57,15 +60,34 @@ public function authenticateHttp(RequestInterface $request, UriInterface $uri, s
     /**
      * @throws Exception
      */
-    public function authenticateBolt(V4_4|V5 $bolt, string $userAgent): array
+    public function authenticateBolt(V4_4|V5|V5_1|V5_2|V5_3|V5_4 $protocol, string $userAgent): array
     {
-        $response = $bolt->hello(Auth::basic($this->username, $this->password, $userAgent));
-        if ($response->getSignature() === Response::SIGNATURE_FAILURE) {
+        if (method_exists($protocol, 'logon')) {
+            $response = $protocol->hello(['user_agent' => $userAgent])->getResponse();
+            if ($response->signature === Signature::FAILURE) {
+                throw Neo4jException::fromBoltResponse($response);
+            }
+
+            $response = $protocol->logon([
+                'scheme' => 'basic',
+                'principal' => $this->username,
+                'credentials' => $this->password,
+            ])->getResponse();
+        } else {
+            $response = $protocol->hello([
+                'user_agent' => $userAgent,
+                'scheme' => 'basic',
+                'principal' => $this->username,
+                'credentials' => $this->password,
+            ])->getResponse();
+        }
+
+        if ($response->signature === Signature::FAILURE) {
             throw Neo4jException::fromBoltResponse($response);
         }
 
         /** @var array{server: string, connection_id: string, hints: list} */
-        return $response->getContent();
+        return $response->content;
     }
 
     public function toString(UriInterface $uri): string

src/Authentication/KerberosAuth.php

@@ -50,9 +50,9 @@ public function authenticateHttp(RequestInterface $request, UriInterface $uri, s
             ->withHeader('User-Agent', $userAgent);
     }
 
-    public function authenticateBolt(V4_4|V5 $bolt, string $userAgent): array
+    public function authenticateBolt(V4_4|V5 $protocol, string $userAgent): array
     {
-        $response = $bolt->hello(Auth::kerberos($this->token, $userAgent));
+        $response = $protocol->hello(Auth::kerberos($this->token, $userAgent));
         if ($response->getSignature() === Response::SIGNATURE_FAILURE) {
             throw Neo4jException::fromBoltResponse($response);
         }

src/Authentication/NoAuth.php

@@ -42,9 +42,9 @@ public function authenticateHttp(RequestInterface $request, UriInterface $uri, s
         return $request->withHeader('User-Agent', $userAgent);
     }
 
-    public function authenticateBolt(V4_4|V5 $bolt, string $userAgent): array
+    public function authenticateBolt(V4_4|V5 $protocol, string $userAgent): array
     {
-        $response = $bolt->hello(Auth::none($userAgent));
+        $response = $protocol->hello(Auth::none($userAgent));
         if ($response->getSignature() === Response::SIGNATURE_FAILURE) {
             throw Neo4jException::fromBoltResponse($response);
         }

src/Authentication/OpenIDConnectAuth.php

@@ -47,9 +47,9 @@ public function authenticateHttp(RequestInterface $request, UriInterface $uri, s
             ->withHeader('User-Agent', $userAgent);
     }
 
-    public function authenticateBolt(V4_4|V5 $bolt, string $userAgent): array
+    public function authenticateBolt(V4_4|V5 $protocol, string $userAgent): array
     {
-        $response = $bolt->hello(Auth::bearer($this->token, $userAgent));
+        $response = $protocol->hello(Auth::bearer($this->token, $userAgent));
         if ($response->getSignature() === Response::SIGNATURE_FAILURE) {
             throw Neo4jException::fromBoltResponse($response);
         }

src/Contracts/AuthenticateInterface.php

@@ -15,6 +15,10 @@
 
 use Bolt\protocol\V4_4;
 use Bolt\protocol\V5;
+use Bolt\protocol\V5_1;
+use Bolt\protocol\V5_2;
+use Bolt\protocol\V5_3;
+use Bolt\protocol\V5_4;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\UriInterface;
 
@@ -32,7 +36,7 @@ public function authenticateHttp(RequestInterface $request, UriInterface $uri, s
      *
      * @return array{server: string, connection_id: string, hints: list}
      */
-    public function authenticateBolt(V4_4|V5 $bolt, string $userAgent): array;
+    public function authenticateBolt(V4_4|V5|V5_1|V5_2|V5_3|V5_4 $protocol, string $userAgent): array;
 
     /**
      * Returns a string representation of the authentication.