Skip to content

Commit 7a1d600

Browse files
Re auth (#689)
* Implement Reauth --------- Co-authored-by: grant lodge <[email protected]>
1 parent 9519cf0 commit 7a1d600

File tree

137 files changed

+2954
-839
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+2954
-839
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,3 +266,6 @@ testkit/CAs/*
266266
testkit/CustomCAs/customRoot.crt
267267

268268
testkit/CustomCAs/customRoot2.crt
269+
270+
# generated docs
271+
Docs/

Neo4j.Driver/Neo4j.Driver.Tests.Integration/Direct/AuthenticationIT.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@
1919
using System.Collections.Generic;
2020
using System.Threading.Tasks;
2121
using FluentAssertions;
22+
using Neo4j.Driver.Auth;
2223
using Neo4j.Driver.IntegrationTests.Internals;
2324
using Neo4j.Driver.Internal;
25+
using Neo4j.Driver.Internal.Auth;
2426
using Xunit;
2527
using Xunit.Abstractions;
2628

@@ -67,7 +69,7 @@ public async Task ShouldCreateCustomAuthToken()
6769
oldAuthToken["principal"].As<string>(),
6870
oldAuthToken["credentials"].As<string>(),
6971
"native",
70-
"basic");
72+
AuthSchemes.Basic);
7173

7274
await VerifyConnectivity(ServerEndPoint, newAuthToken);
7375
}
@@ -80,7 +82,7 @@ public async Task ShouldCreateCustomAuthTokenWithAdditionalParameters()
8082
oldAuthToken["principal"].As<string>(),
8183
oldAuthToken["credentials"].As<string>(),
8284
"native",
83-
"basic",
85+
AuthSchemes.Basic,
8486
new Dictionary<string, object> { { "secret", 42 } });
8587

8688
await VerifyConnectivity(ServerEndPoint, newAuthToken);

Neo4j.Driver/Neo4j.Driver.Tests.Integration/Direct/CertificateTrustIT.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@
1919
using System.Net;
2020
using System.Threading.Tasks;
2121
using FluentAssertions;
22+
using Neo4j.Driver.Auth;
2223
using Neo4j.Driver.IntegrationTests.Internals;
2324
using Neo4j.Driver.Internal;
25+
using Neo4j.Driver.Internal.Auth;
2426
using Neo4j.Driver.Internal.Connector;
2527
using Neo4j.Driver.Internal.Connector.Trust;
2628
using Org.BouncyCastle.Pkcs;
@@ -167,15 +169,15 @@ private IDriver SetupWithCustomResolver(Uri overridenUri, Config config)
167169
{
168170
var connectionSettings = new ConnectionSettings(
169171
overridenUri,
170-
Server.AuthToken,
172+
AuthTokenManagers.Static(Server.AuthToken),
171173
config,
172174
new CustomHostResolver(
173175
Server.BoltUri,
174176
new SystemNetCoreHostResolver(new SystemHostResolver())));
175177

176178
var bufferSettings = new BufferSettings(config);
177179
var connectionFactory =
178-
new PooledConnectionFactory(connectionSettings, bufferSettings, config.Logger);
180+
new PooledConnectionFactory(bufferSettings, config.Logger);
179181

180182
return GraphDatabase.CreateDriver(overridenUri, config, connectionFactory, connectionSettings);
181183
}

Neo4j.Driver/Neo4j.Driver.Tests.Integration/Direct/DirectDriverTestBase.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
// limitations under the License.
1717

1818
using System;
19+
using Neo4j.Driver.Auth;
1920
using Neo4j.Driver.IntegrationTests.Internals;
2021
using Xunit;
2122
using Xunit.Abstractions;

Neo4j.Driver/Neo4j.Driver.Tests.Integration/Examples.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
using System.Diagnostics.CodeAnalysis;
2323
using System.Linq;
2424
using FluentAssertions;
25+
using Neo4j.Driver.Auth;
2526
using Neo4j.Driver.IntegrationTests.Internals;
2627
using Xunit;
2728
using Xunit.Abstractions;
@@ -317,7 +318,7 @@ public IDriver CreateDriverWithCustomizedAuth(
317318
public void TestCustomAuthExample()
318319
{
319320
// Given
320-
using var driver = CreateDriverWithCustomizedAuth(Uri, User, Password, "native", "basic", null);
321+
using var driver = CreateDriverWithCustomizedAuth(Uri, User, Password, "native", AuthSchemes.Basic, null);
321322
using var session = driver.Session();
322323
// When & Then
323324
session.Run("RETURN 1").Single()[0].As<int>().Should().Be(1);

Neo4j.Driver/Neo4j.Driver.Tests.Integration/ExamplesAsync.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ public IDriver CreateDriverWithCustomizedAuth(
415415
public async Task TestCustomAuthExample()
416416
{
417417
// Given
418-
var driver = CreateDriverWithCustomizedAuth(Uri, User, Password, "native", "basic", null);
418+
var driver = CreateDriverWithCustomizedAuth(Uri, User, Password, "native", AuthSchemes.Basic, null);
419419
await using var session = driver.AsyncSession();
420420
// When & Then
421421
var result = await session.RunAsync("RETURN 1");

Neo4j.Driver/Neo4j.Driver.Tests.Integration/Internals/Cluster/CausalCluster.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
using System.Diagnostics;
2121
using System.Linq;
2222
using System.Threading;
23+
using Neo4j.Driver.Auth;
2324

2425
namespace Neo4j.Driver.IntegrationTests.Internals;
2526

Neo4j.Driver/Neo4j.Driver.Tests.Integration/Internals/Cluster/ExistingCluster.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
using System;
1919
using Castle.Core.Internal;
20+
using Neo4j.Driver.Auth;
2021

2122
namespace Neo4j.Driver.IntegrationTests.Internals;
2223

Neo4j.Driver/Neo4j.Driver.Tests.Integration/Internals/Cluster/ICausalCluster.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
// limitations under the License.
1717

1818
using System;
19+
using Neo4j.Driver.Auth;
1920

2021
namespace Neo4j.Driver.IntegrationTests.Internals;
2122

Neo4j.Driver/Neo4j.Driver.Tests.Integration/Internals/Cluster/SingleInstance.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
using System;
1919
using System.IO;
20+
using Neo4j.Driver.Auth;
2021

2122
namespace Neo4j.Driver.IntegrationTests.Internals;
2223

0 commit comments

Comments
 (0)