Add bearer authentication support

Author: injectives

driver/src/main/java/org/neo4j/driver/AuthTokens.java

@@ -24,13 +24,13 @@
 import org.neo4j.driver.internal.security.InternalAuthToken;
 
 import static java.util.Collections.singletonMap;
+import static org.neo4j.driver.Values.value;
 import static org.neo4j.driver.internal.security.InternalAuthToken.CREDENTIALS_KEY;
 import static org.neo4j.driver.internal.security.InternalAuthToken.PARAMETERS_KEY;
 import static org.neo4j.driver.internal.security.InternalAuthToken.PRINCIPAL_KEY;
 import static org.neo4j.driver.internal.security.InternalAuthToken.REALM_KEY;
 import static org.neo4j.driver.internal.security.InternalAuthToken.SCHEME_KEY;
 import static org.neo4j.driver.internal.util.Iterables.newHashMapWithSize;
-import static org.neo4j.driver.Values.value;
 
 /**
  * This is a listing of the various methods of authentication supported by this
@@ -79,13 +79,32 @@ public static AuthToken basic( String username, String password, String realm )
         return new InternalAuthToken( map );
     }
 
+    /**
+     * The bearer authentication scheme, using a base64 encoded token.
+     *
+     * @param token base64 encoded token
+     * @return an authentication token that can be used to connect to Neo4j
+     * @throws NullPointerException when token is {@code null}
+     * @see GraphDatabase#driver(String, AuthToken)
+     */
+    public static AuthToken bearer( String token )
+    {
+        Objects.requireNonNull( token, "Token can't be null" );
+
+        Map<String,Value> map = newHashMapWithSize( 2 );
+        map.put( SCHEME_KEY, value( "bearer" ) );
+        map.put( CREDENTIALS_KEY, value( token ) );
+        return new InternalAuthToken( map );
+    }
+
     /**
      * The kerberos authentication scheme, using a base64 encoded ticket
+     *
      * @param base64EncodedTicket a base64 encoded service ticket
      * @return an authentication token that can be used to connect to Neo4j
+     * @throws NullPointerException when ticket is {@code null}
      * @see GraphDatabase#driver(String, AuthToken)
      * @since 1.3
-     * @throws NullPointerException when ticket is {@code null}
      */
     public static AuthToken kerberos( String base64EncodedTicket )
     {

driver/src/test/java/org/neo4j/driver/AuthTokensTest.java

@@ -23,9 +23,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.neo4j.driver.AuthToken;
-import org.neo4j.driver.AuthTokens;
-import org.neo4j.driver.Value;
 import org.neo4j.driver.internal.security.InternalAuthToken;
 import org.neo4j.driver.internal.value.ListValue;
 import org.neo4j.driver.internal.value.MapValue;
@@ -103,6 +100,22 @@ void customAuthParameters()
         assertThat( map.get( "parameters" ), equalTo( (Value) new MapValue( expectedParameters ) ) );
     }
 
+    @Test
+    void shouldSupportBearerAuth()
+    {
+        // GIVEN
+        String tokenStr = "token";
+
+        // WHEN
+        InternalAuthToken token = (InternalAuthToken) AuthTokens.bearer( tokenStr );
+
+        // THEN
+        Map<String,Value> map = token.toMap();
+        assertThat( map.size(), equalTo( 2 ) );
+        assertThat( map.get( "scheme" ), equalTo( new StringValue( "bearer" ) ) );
+        assertThat( map.get( "credentials" ), equalTo( new StringValue( tokenStr ) ) );
+    }
+
     @Test
     void basicKerberosAuthWithRealm()
     {
@@ -141,6 +154,13 @@ void shouldAllowBasicAuthTokenWithNullRealm()
         assertEquals( "password", map.get( "credentials" ).asString() );
     }
 
+    @Test
+    void shouldNotAllowBearerAuthTokenWithNullToken()
+    {
+        NullPointerException e = assertThrows( NullPointerException.class, () -> AuthTokens.bearer( null ) );
+        assertEquals( "Token can't be null", e.getMessage() );
+    }
+
     @Test
     void shouldNotAllowKerberosAuthTokenWithNullTicket()
     {

testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewDriver.java

@@ -74,6 +74,9 @@ public TestkitResponse process( TestkitState testkitState )
                                           data.authorizationToken.getTokens().get( "credentials" ),
                                           data.authorizationToken.getTokens().get( "realm" ) );
             break;
+        case "bearer":
+            authToken = AuthTokens.bearer( data.authorizationToken.getTokens().get( "credentials" ) );
+            break;
         default:
             return BackendError.builder()
                                .data( BackendError