Skip to content
Snippets Groups Projects
Commit 1756fd5a authored by Daniel Andrášik's avatar Daniel Andrášik
Browse files

Merge branch 'develop' into 'master'

Merge to master

See merge request digital-twin/twinzo/tdevkit!27
parents fab27446 23d69719
No related branches found
No related tags found
No related merge requests found
......@@ -13,6 +13,7 @@
private string branchGuid;
private int timeout;
private string apiKey;
private string mainApiKey;
private string version;
private string login;
private string password;
......@@ -25,6 +26,7 @@
public string BranchGuid { get => branchGuid; set => branchGuid = value; }
public int Timeout { get => timeout; set => timeout = value; }
public string ApiKey { get => apiKey; set => apiKey = value; }
public string MainApiKey { get => mainApiKey; set => mainApiKey = value; }
public string Version { get => version; set => version = value; }
public string Login { get => login; set => login = value; }
public string Password { get => password; set => password = value; }
......
......@@ -14,6 +14,7 @@
private string branchGuid;
private int timeout;
private string apiKey;
private string mainApiKey;
private string version;
private string login;
private string password;
......@@ -60,6 +61,11 @@
this.apiKey = apiKey;
return this;
}
public ConnectionOptionsBuilder MainApiKey(string mainApiKey)
{
this.mainApiKey = mainApiKey;
return this;
}
public ConnectionOptionsBuilder Version(string version)
{
......@@ -90,6 +96,7 @@
BranchGuid = this.branchGuid,
Timeout = this.timeout,
ApiKey = this.apiKey,
MainApiKey = this.mainApiKey,
Version = this.version,
Login = this.login,
Password = this.password
......
......@@ -7,8 +7,18 @@ using System.Threading.Tasks;
namespace SDK
{
public static class HttpHeaders
{
public static string BRANCH { get; } = "Branch";
public static string CLIENT { get; } = "Client";
public static string TOKEN { get; } = "Token";
public static string APIKEY { get; } = "Api-Key";
public static string MAINAPIKEY { get; } = "mApi-Key";
}
public abstract class DevkitConnector
{
protected readonly ConnectionOptions connectionOptions;
protected HttpClient httpClient;
......@@ -27,15 +37,6 @@ namespace SDK
ResetHttpClientHeaders();
}
protected void ResetHttpClientHeaders()
{
httpClient.DefaultRequestHeaders.Clear();
httpClient.DefaultRequestHeaders.Add("Client", connectionOptions.ClientGuid);
httpClient.DefaultRequestHeaders.Add("Branch", connectionOptions.BranchGuid);
httpClient.DefaultRequestHeaders.Add("Token", connectionOptions.Token);
httpClient.DefaultRequestHeaders.Add("Api-Key", connectionOptions.ApiKey);
}
#region REQUESTS
protected async Task<Type> GetRequest<Type>(string subUrl)
{
......@@ -113,5 +114,76 @@ namespace SDK
_ => throw new ServerResponseException(stringContent),
};
}
#region HEADERS
protected void ResetHttpClientHeaders()
{
httpClient.DefaultRequestHeaders.Clear();
if (connectionOptions.ClientGuid != null) SetHeader(HttpHeaders.CLIENT, connectionOptions.ClientGuid);
if (connectionOptions.BranchGuid != null) SetHeader(HttpHeaders.BRANCH, connectionOptions.BranchGuid);
if (connectionOptions.Token != null) SetHeader(HttpHeaders.TOKEN, connectionOptions.Token);
if (connectionOptions.ApiKey != null) SetHeader(HttpHeaders.APIKEY, connectionOptions.ApiKey);
if (connectionOptions.MainApiKey != null) SetHeader(HttpHeaders.MAINAPIKEY, connectionOptions.MainApiKey);
}
public void ChangeClientGuid(string value)
{
SetHeader(HttpHeaders.CLIENT, value);
}
public void ChangeClientGuid(Guid value)
{
SetHeader(HttpHeaders.CLIENT, value.ToString());
}
public void ChangeBranchGuid(string value)
{
SetHeader(HttpHeaders.BRANCH, value);
}
public void ChangeBranchGuid(Guid value)
{
SetHeader(HttpHeaders.BRANCH, value.ToString());
}
public void ChangeToken(string value)
{
SetHeader(HttpHeaders.TOKEN, value);
}
public void ChangeApiKey(string value)
{
SetHeader(HttpHeaders.APIKEY, value);
}
public void ChangeMainApiKey(string value)
{
SetHeader(HttpHeaders.MAINAPIKEY, value);
}
public void RemoveClientGuid()
{
RemoveHeader(HttpHeaders.CLIENT);
}
public void RemoveBranchGuid()
{
RemoveHeader(HttpHeaders.BRANCH);
}
public void RemoveToken()
{
RemoveHeader(HttpHeaders.TOKEN);
}
public void RemoveApiKey()
{
RemoveHeader(HttpHeaders.APIKEY);
}
public void RemoveMainApiKey()
{
RemoveHeader(HttpHeaders.MAINAPIKEY);
}
private void SetHeader(string header, string value)
{
httpClient.DefaultRequestHeaders.Add(header, value);
}
private void RemoveHeader(string header)
{
httpClient.DefaultRequestHeaders.Remove(header);
}
#endregion
}
}
......@@ -5,7 +5,7 @@
<TargetFramework>net6.0</TargetFramework>
<AssemblyVersion>2021.6.28.25</AssemblyVersion>
<FileVersion>2021.6.28.25</FileVersion>
<Version>4.8.0</Version>
<Version>4.9.0</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment