Skip to content

Develop #27

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

Merged
vmalinovskiy merged 2 commits into from
Mar 16, 2016
Merged

Develop #27

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36f212f
vmalinovskiy - fixed bug with proxy
vmalinovskiy Mar 15, 2016
dbbe5ae
vmalinovskiy - proxy code refactoring
vmalinovskiy Mar 15, 2016
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
16 changes: 8 additions & 8 deletions src/CallfireApiClient/RestApiClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class RestApiClient
private readonly Logger Logger = new Logger();
private readonly ISerializer JsonSerializer;
private readonly IDeserializer JsonDeserializer;
private static KeyValueConfigurationCollection clientConfig;
private static KeyValueConfigurationCollection ClientConfig;

/// <summary>
/// RestSharp client configured to query Callfire API
Expand All @@ -50,7 +50,7 @@ public class RestApiClient
/// loads client configuration
/// </summary>
static RestApiClient() {
clientConfig = loadAppSettings();
ClientConfig = LoadAppSettings();
}

/// <summary>
Expand All @@ -59,7 +59,7 @@ static RestApiClient() {
/// <value>configuration properties collection</value>
public static KeyValueConfigurationCollection getClientConfig()
{
return clientConfig;
return ClientConfig;
}

/// <summary>
Expand All @@ -70,7 +70,7 @@ public static KeyValueConfigurationCollection getClientConfig()
/// </param>
public RestApiClient(IAuthenticator authenticator)
{
ApiBasePath = clientConfig[ClientConstants.CONFIG_API_BASE_PATH].Value;
ApiBasePath = ClientConfig[ClientConstants.CONFIG_API_BASE_PATH].Value;
JsonSerializer = new CallfireJsonConverter();
JsonDeserializer = JsonSerializer as IDeserializer;

Expand All @@ -80,8 +80,8 @@ public RestApiClient(IAuthenticator authenticator)
RestClient.AddHandler("application/json", JsonDeserializer);


String proxyAddress = clientConfig[ClientConstants.PROXY_ADDRESS_PROPERTY] != null ? clientConfig[ClientConstants.PROXY_ADDRESS_PROPERTY].Value : null;
String proxyCredentials = clientConfig[ClientConstants.PROXY_CREDENTIALS_PROPERTY] != null ? clientConfig[ClientConstants.PROXY_CREDENTIALS_PROPERTY].Value : null;
String proxyAddress = ClientConfig[ClientConstants.PROXY_ADDRESS_PROPERTY]?.Value;
String proxyCredentials = ClientConfig[ClientConstants.PROXY_CREDENTIALS_PROPERTY]?.Value;

if (!String.IsNullOrEmpty(proxyAddress))
{
Expand All @@ -96,7 +96,7 @@ public RestApiClient(IAuthenticator authenticator)
{
if (parsedCredentials.Length > 1)
{
proxy.Credentials = new NetworkCredential(parsedCredentials[0], parsedCredentials[0]);
proxy.Credentials = new NetworkCredential(parsedCredentials[0], parsedCredentials[1]);
}
else
{
Expand All @@ -112,7 +112,7 @@ public RestApiClient(IAuthenticator authenticator)
/// <summary>
/// Loads client's app settings config section
/// </summary>
public static KeyValueConfigurationCollection loadAppSettings()
public static KeyValueConfigurationCollection LoadAppSettings()
{
var path = typeof(RestApiClient).Assembly.Location;
var config = ConfigurationManager.OpenExeConfiguration(path);
Expand Down