Skip to content

Allow control of HttpMessageHandler lifetime. #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davidathompson wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow control of HttpMessageHandler lifetime. #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Intacct.SDK.Tests/OfflineClientTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public async Task ExecuteTest()
SenderId = "testsender",
SenderPassword = "testsendpass",
SessionId = "testsession..",
MockHandler = mockHandler,
HttpMessageHandler = mockHandler,
};

RequestConfig requestConfig = new RequestConfig()
Expand Down Expand Up @@ -100,7 +100,7 @@ public async Task ExecuteBatchTest()
SenderId = "testsender",
SenderPassword = "testsendpass",
SessionId = "testsession..",
MockHandler = mockHandler,
HttpMessageHandler = mockHandler,
};

RequestConfig requestConfig = new RequestConfig()
Expand Down
8 changes: 4 additions & 4 deletions Intacct.SDK.Tests/OnlineClientTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public async Task ExecuteTest()
SenderId = "testsender",
SenderPassword = "testsendpass",
SessionId = "testsession..",
MockHandler = mockHandler,
HttpMessageHandler = mockHandler,
};

OnlineClient client = new OnlineClient(clientConfig);
Expand Down Expand Up @@ -140,7 +140,7 @@ public async Task ExecuteResultExceptionTest()
SenderId = "testsender",
SenderPassword = "testsendpass",
SessionId = "testsession..",
MockHandler = mockHandler,
HttpMessageHandler = mockHandler,
};

OnlineClient client = new OnlineClient(clientConfig);
Expand Down Expand Up @@ -223,7 +223,7 @@ public async Task ExecuteBatchTransactionResultExceptionTest()
SenderId = "testsender",
SenderPassword = "testsendpass",
SessionId = "testsession..",
MockHandler = mockHandler,
HttpMessageHandler = mockHandler,
};

RequestConfig requestConfig = new RequestConfig()
Expand Down Expand Up @@ -303,7 +303,7 @@ public async Task LoggerTest()
SenderId = "testsender",
SenderPassword = "testsendpass",
SessionId = "testsession..",
MockHandler = mockHandler,
HttpMessageHandler = mockHandler,
// Logger = LogManager.GetLogger(guid),
};

Expand Down
12 changes: 6 additions & 6 deletions Intacct.SDK.Tests/SessionProviderTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public async Task FromLoginCredentialsTest()
CompanyId = "testcompany",
UserId = "testuser",
UserPassword = "testpass",
MockHandler = mockHandler,
HttpMessageHandler = mockHandler,
};

ClientConfig sessionCreds = await SessionProvider.Factory(config);
Expand Down Expand Up @@ -134,7 +134,7 @@ public async Task FromLoginCredentialsWithEntityTest()
EntityId= "testentity",
UserId = "testuser",
UserPassword = "testpass",
MockHandler = mockHandler,
HttpMessageHandler = mockHandler,
};

ClientConfig sessionCreds = await SessionProvider.Factory(config);
Expand Down Expand Up @@ -198,7 +198,7 @@ public async Task FromSessionCredentialsTest()
SenderPassword = "pass123!",
SessionId = "fAkESesSiOnId..",
EndpointUrl = "https://unittest.intacct.com/ia/xml/xmlgw.phtml",
MockHandler = mockHandler,
HttpMessageHandler = mockHandler,
};

ClientConfig sessionCreds = await SessionProvider.Factory(config);
Expand Down Expand Up @@ -262,7 +262,7 @@ public async Task FromTopLevelSessionCredentialsWithEntityOverrideTest()
SenderPassword = "pass123!",
SessionId = "fAkESesSiOnId..",
EndpointUrl = "https://unittest.intacct.com/ia/xml/xmlgw.phtml",
MockHandler = mockHandler,
HttpMessageHandler = mockHandler,
EntityId = "testentity",
};

Expand Down Expand Up @@ -327,7 +327,7 @@ public async Task FromPrivateEntitySessionCredentialsWithDifferentEntityOverride
SenderPassword = "pass123!",
SessionId = "EntityAsession..",
EndpointUrl = "https://unittest.intacct.com/ia/xml/xmlgw.phtml",
MockHandler = mockHandler,
HttpMessageHandler = mockHandler,
EntityId = "entityB",
};

Expand Down Expand Up @@ -393,7 +393,7 @@ public async Task FromSessionCredentialsUsingEnvironmentSenderTest()
{
SessionId = "fAkESesSiOnId..",
EndpointUrl = "https://unittest.intacct.com/ia/xml/xmlgw.phtml",
MockHandler = mockHandler,
HttpMessageHandler = mockHandler,
};

ClientConfig sessionCreds = await SessionProvider.Factory(config);
Expand Down
16 changes: 8 additions & 8 deletions Intacct.SDK.Tests/Xml/RequestHandlerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public async Task MockExecuteSynchronousTest()
SenderId = "testsenderid",
SenderPassword = "pass123!",
SessionId = "testsession..",
MockHandler = mockHandler,
HttpMessageHandler = mockHandler,
};

RequestConfig requestConfig = new RequestConfig()
Expand Down Expand Up @@ -130,7 +130,7 @@ public async Task MockExecuteAsynchronousTest()
SenderId = "testsenderid",
SenderPassword = "pass123!",
SessionId = "testsession..",
MockHandler = mockHandler,
HttpMessageHandler = mockHandler,
};

RequestConfig requestConfig = new RequestConfig()
Expand Down Expand Up @@ -235,7 +235,7 @@ public async Task MockRetryTest()
SenderId = "testsenderid",
SenderPassword = "pass123!",
SessionId = "testsession..",
MockHandler = mockHandler,
HttpMessageHandler = mockHandler,
};

RequestConfig requestConfig = new RequestConfig();
Expand Down Expand Up @@ -292,7 +292,7 @@ public async Task MockDefaultRetryFailureTest()
SenderId = "testsenderid",
SenderPassword = "pass123!",
SessionId = "testsession..",
MockHandler = mockHandler,
HttpMessageHandler = mockHandler,
};

RequestConfig requestConfig = new RequestConfig();
Expand Down Expand Up @@ -345,7 +345,7 @@ public async Task Mock400LevelErrorWithXmlResponseTest()
CompanyId = "badcompany",
UserId = "baduser",
UserPassword = "badpass",
MockHandler = mockHandler,
HttpMessageHandler = mockHandler,
};

RequestConfig requestConfig = new RequestConfig();
Expand Down Expand Up @@ -382,7 +382,7 @@ public async Task MockDefaultNo524RetryTest()
SenderId = "testsenderid",
SenderPassword = "pass123!",
SessionId = "testsession..",
MockHandler = mockHandler,
HttpMessageHandler = mockHandler,
};

RequestConfig requestConfig = new RequestConfig();
Expand Down Expand Up @@ -460,7 +460,7 @@ public async Task MockExecuteWithDebugLoggerTest()
SenderId = "testsenderid",
SenderPassword = "pass123!",
SessionId = "testsession..",
MockHandler = mockHandler,
HttpMessageHandler = mockHandler,
// Logger = LogManager.GetLogger(guid),
};

Expand Down Expand Up @@ -522,7 +522,7 @@ public async Task MockExecuteOfflineWithSessionCredsTest()
SenderId = "testsenderid",
SenderPassword = "pass123!",
SessionId = "testsession..",
MockHandler = mockHandler,
HttpMessageHandler = mockHandler,
// LoggerFactory = new LogFactory(),
// Logger = LogFactory<Program> //LogManager.GetLogger(guid),
};
Expand Down
12 changes: 11 additions & 1 deletion Intacct.SDK/ClientConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
using Intacct.SDK.Xml.Request;
using Microsoft.Extensions.Logging;

using System;
using System.Net.Http;

namespace Intacct.SDK
{
public class ClientConfig
Expand Down Expand Up @@ -51,8 +54,15 @@ public class ClientConfig

public MessageFormatter LogMessageFormatter;

public MockHandler MockHandler;
public HttpMessageHandler HttpMessageHandler;

[Obsolete("Use HttpMessageHandler instead.")]
public MockHandler MockHandler
{
get { return HttpMessageHandler as MockHandler;}
set { HttpMessageHandler = value;}
}

public ClientConfig()
{
this.LogLevel = LogLevel.Debug;
Expand Down
6 changes: 3 additions & 3 deletions Intacct.SDK/Xml/RequestHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,15 @@ public async Task<OfflineResponse> ExecuteOffline(List<IFunction> content)

private HttpMessageHandler GetHttpMessageHandler()
{
if (this.ClientConfig.MockHandler != null)
if (this.ClientConfig.HttpMessageHandler != null)
{
if (this.ClientConfig.Logger != null)
{
return new LoggingHandler(this.ClientConfig.MockHandler, this.ClientConfig.Logger, this.ClientConfig.LogMessageFormatter, this.ClientConfig.LogLevel);
return new LoggingHandler(this.ClientConfig.HttpMessageHandler, this.ClientConfig.Logger, this.ClientConfig.LogMessageFormatter, this.ClientConfig.LogLevel);
}
else
{
return this.ClientConfig.MockHandler;
return this.ClientConfig.HttpMessageHandler;
}
}
else
Expand Down