Skip to content

Commit 4abe9dd

Browse files
author
PalashKarmaker
committed
bug fix
1 parent 872c850 commit 4abe9dd

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

Core.Arango/Core.Arango.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PackageReleaseNotes></PackageReleaseNotes>
1010
<Description>.NET driver for ArangoDB with support for database per tenant deployments</Description>
1111
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
12-
<Version>1.0.1</Version>
12+
<Version>1.0.2</Version>
1313
<Copyright>Palash Karmaker, Andreas Dominik Jung</Copyright>
1414
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1515
<PackageIcon>ArangoDB.png</PackageIcon>

Core.Arango/Transport/ArangoHttpTransport.cs

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,19 @@ namespace Core.Arango.Transport;
1717
/// </summary>
1818
public class ArangoHttpTransport(IArangoConfiguration configuration) : IArangoTransport
1919
{
20-
private readonly string _auth = SetAuth(configuration);
2120
private static HttpClient DefaultHttpClient => new();
21+
string _auth = "";
22+
/// <inheritdoc />
23+
protected string Auth
24+
{
25+
get
26+
{
27+
if (string.IsNullOrWhiteSpace(_auth) && !string.IsNullOrWhiteSpace(configuration.User) && !string.IsNullOrWhiteSpace(configuration.Password))
28+
_auth = Convert.ToBase64String(Encoding.ASCII.GetBytes($"{configuration.User}:{configuration.Password}"));
29+
return _auth;
30+
}
31+
}
32+
2233
/// <inheritdoc />
2334
public async Task<T> SendAsync<T>(HttpMethod m, string url, object body = null,
2435
string transaction = null, bool throwOnError = true, bool auth = true,
@@ -126,21 +137,15 @@ public async Task<HttpContent> SendContentAsync(HttpMethod m, string url, HttpCo
126137
/// used in requests to ArangoDB.
127138
/// </summary>
128139
/// <param name="client"></param>
129-
protected void SetBasicAuth(HttpClient client) => client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", _auth);
140+
protected void SetBasicAuth(HttpClient client) => client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", Auth);
130141

131-
static string SetAuth(IArangoConfiguration configuration)
132-
{
133-
if (string.IsNullOrWhiteSpace(configuration.User) || string.IsNullOrWhiteSpace(configuration.Password))
134-
return string.Empty;
135-
return Convert.ToBase64String(Encoding.ASCII.GetBytes($"{configuration.User}:{configuration.Password}"));
136-
}
137142
private void ApplyHeaders(string transaction, bool auth, HttpRequestMessage msg,
138143
IDictionary<string, string> headers)
139144
{
140145
msg.Headers.Add(HttpRequestHeader.KeepAlive.ToString(), "true");
141146

142-
if (auth && !string.IsNullOrWhiteSpace(_auth))
143-
msg.Headers.Add(HttpRequestHeader.Authorization.ToString(), _auth);
147+
/*if (auth && !string.IsNullOrWhiteSpace(_auth))
148+
msg.Headers.Add(HttpRequestHeader.Authorization.ToString(), _auth);*/
144149

145150
if (transaction != null)
146151
msg.Headers.Add("x-arango-trx-id", transaction);

0 commit comments

Comments
 (0)