Skip to content
This repository was archived by the owner on Oct 28, 2021. It is now read-only.

Commit b43682e

Browse files
jforselljforsell
committed
Merge remote-tracking branch 'upstream/develop' into json-subtypes
2 parents 4c0aed7 + a3cbb1e commit b43682e

File tree

12 files changed

+28
-21
lines changed

12 files changed

+28
-21
lines changed

‎src/SymphonyOSS.RestApiClient/Api/AgentApi/AttachmentsApi.cs

+5-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ namespace SymphonyOSS.RestApiClient.Api.AgentApi
3333
/// </summary>
3434
public class AttachmentsApi
3535
{
36-
private readonly Generated.OpenApi.AgentApi.Api.AttachmentsApi _attachmentsApi;
36+
private readonly Generated.OpenApi.AgentApi.Api.IAttachmentsApi _attachmentsApi;
37+
38+
private readonly Configuration _configuration;
3739

3840
private readonly IAuthTokens _authTokens;
3941

@@ -50,6 +52,7 @@ public class AttachmentsApi
5052
public AttachmentsApi(IAuthTokens authTokens, Configuration configuration, IApiExecutor apiExecutor)
5153
{
5254
_attachmentsApi = new Generated.OpenApi.AgentApi.Api.AttachmentsApi(configuration);
55+
_configuration = configuration;
5356
_authTokens = authTokens;
5457
_apiExecutor = apiExecutor;
5558
}
@@ -88,7 +91,7 @@ private AttachmentInfo UploadAttachment(string sid, string filename, Stream file
8891
request.AddHeader("keyManagerToken", _authTokens.KeyManagerToken);
8992
request.AddFile("file", file.ReadAsBytes(), filename, "application/octet-stream");
9093

91-
var apiClient = _attachmentsApi.Configuration.ApiClient;
94+
var apiClient = _configuration.ApiClient;
9295
var response = apiClient.RestClient.Execute(request);
9396
return (AttachmentInfo)apiClient.Deserialize(response, typeof(AttachmentInfo));
9497
}

‎src/SymphonyOSS.RestApiClient/Api/AgentApi/DatafeedApi.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ namespace SymphonyOSS.RestApiClient.Api.AgentApi
3333
/// </summary>
3434
public class DatafeedApi
3535
{
36-
private readonly Generated.OpenApi.AgentApi.Api.DatafeedApi _datafeedApi;
36+
private readonly Generated.OpenApi.AgentApi.Api.IDatafeedApi _datafeedApi;
3737

3838
private readonly IAuthTokens _authTokens;
3939

‎src/SymphonyOSS.RestApiClient/Api/AgentApi/MessagesApi.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace SymphonyOSS.RestApiClient.Api.AgentApi
2828
/// </summary>
2929
public class MessagesApi
3030
{
31-
private readonly Generated.OpenApi.AgentApi.Api.MessagesApi _messagesApi;
31+
private readonly Generated.OpenApi.AgentApi.Api.IMessagesApi _messagesApi;
3232

3333
private readonly IAuthTokens _authTokens;
3434

‎src/SymphonyOSS.RestApiClient/Api/PodApi/MessageSuppressionApi.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace SymphonyOSS.RestApiClient.Api.PodApi
2828
/// </summary>
2929
public class MessageSuppressionApi
3030
{
31-
private readonly Generated.OpenApi.PodApi.Api.MessageSuppressionApi _messageSuppressionApi;
31+
private readonly Generated.OpenApi.PodApi.Api.IMessageSuppressionApi _messageSuppressionApi;
3232

3333
private readonly IAuthTokens _authTokens;
3434

‎src/SymphonyOSS.RestApiClient/Api/PodApi/PresenceApi.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace SymphonyOSS.RestApiClient.Api.PodApi
2828
/// </summary>
2929
public class PresenceApi
3030
{
31-
private readonly Generated.OpenApi.PodApi.Api.PresenceApi _presenceApi;
31+
private readonly Generated.OpenApi.PodApi.Api.IPresenceApi _presenceApi;
3232

3333
private readonly IAuthTokens _authTokens;
3434

‎src/SymphonyOSS.RestApiClient/Api/PodApi/SessionApi.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace SymphonyOSS.RestApiClient.Api.PodApi
2828
/// </summary>
2929
public class SessionApi
3030
{
31-
private readonly Generated.OpenApi.PodApi.Api.SessionApi _sessionApi;
31+
private readonly Generated.OpenApi.PodApi.Api.ISessionApi _sessionApi;
3232

3333
private readonly IAuthTokens _authTokens;
3434

‎src/SymphonyOSS.RestApiClient/Api/PodApi/StreamsApi.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace SymphonyOSS.RestApiClient.Api.PodApi
2828
/// </summary>
2929
public class StreamsApi
3030
{
31-
private readonly Generated.OpenApi.PodApi.Api.StreamsApi _streamsApi;
31+
private readonly Generated.OpenApi.PodApi.Api.IStreamsApi _streamsApi;
3232

3333
private readonly IAuthTokens _authTokens;
3434

‎src/SymphonyOSS.RestApiClient/Api/PodApi/SystemApi.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace SymphonyOSS.RestApiClient.Api.PodApi
2828
/// </summary>
2929
public class SystemApi
3030
{
31-
private readonly Generated.OpenApi.PodApi.Api.SystemApi _systemApi;
31+
private readonly Generated.OpenApi.PodApi.Api.ISystemApi _systemApi;
3232

3333
private readonly IAuthTokens _authTokens;
3434

‎src/SymphonyOSS.RestApiClient/Api/PodApi/UsersApi.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace SymphonyOSS.RestApiClient.Api.PodApi
2828
/// </summary>
2929
public class UsersApi
3030
{
31-
private readonly Generated.OpenApi.PodApi.Api.UsersApi _usersApi;
31+
private readonly Generated.OpenApi.PodApi.Api.IUsersApi _usersApi;
3232

3333
private readonly IAuthTokens _authTokens;
3434

‎src/SymphonyOSS.RestApiClient/Authentication/ISessionManager.cs

+4
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,15 @@
1717

1818
namespace SymphonyOSS.RestApiClient.Authentication
1919
{
20+
using System.Security.Cryptography.X509Certificates;
21+
2022
/// <summary>
2123
/// Adds logic for generating authentication tokens.
2224
/// </summary>
2325
public interface ISessionManager : IAuthTokens
2426
{
27+
X509Certificate2 Certificate { get; }
28+
2529
void GenerateTokens();
2630
}
2731
}

‎src/SymphonyOSS.RestApiClient/Factories/AgentApiFactory.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public AgentApiFactory(string baseUrl)
4444
/// <param name="apiExecutor">The executor, if none is provided <see cref="RetryStrategyApiExecutor"/>
4545
/// with a <see cref="RefreshTokensRetryStrategy"/> will be used.</param>
4646
/// <returns>The AttachmentsApi instance.</returns>
47-
public AttachmentsApi CreateAttachmentsApi(SessionManager sessionManager, IApiExecutor apiExecutor = null)
47+
public AttachmentsApi CreateAttachmentsApi(ISessionManager sessionManager, IApiExecutor apiExecutor = null)
4848
{
4949
return Create<AttachmentsApi>(sessionManager, apiExecutor);
5050
}
@@ -57,7 +57,7 @@ public AttachmentsApi CreateAttachmentsApi(SessionManager sessionManager, IApiEx
5757
/// <param name="apiExecutor">The executor, if none is provided <see cref="RetryStrategyApiExecutor"/>
5858
/// with a <see cref="RefreshTokensRetryStrategy"/> will be used.</param>
5959
/// <returns>The DatafeedApi instance.</returns>
60-
public DatafeedApi CreateDatafeedApi(SessionManager sessionManager, IApiExecutor apiExecutor = null)
60+
public DatafeedApi CreateDatafeedApi(ISessionManager sessionManager, IApiExecutor apiExecutor = null)
6161
{
6262
return Create<DatafeedApi>(sessionManager, apiExecutor);
6363
}
@@ -70,12 +70,12 @@ public DatafeedApi CreateDatafeedApi(SessionManager sessionManager, IApiExecutor
7070
/// <param name="apiExecutor">The executor, if none is provided <see cref="RetryStrategyApiExecutor"/>
7171
/// with a <see cref="RefreshTokensRetryStrategy"/> will be used.</param>
7272
/// <returns>The MessagesApi instance.</returns>
73-
public MessagesApi CreateMessagesApi(SessionManager sessionManager, IApiExecutor apiExecutor = null)
73+
public MessagesApi CreateMessagesApi(ISessionManager sessionManager, IApiExecutor apiExecutor = null)
7474
{
7575
return Create<MessagesApi>(sessionManager, apiExecutor);
7676
}
7777

78-
private T Create<T>(SessionManager sessionManager, IApiExecutor apiExecutor = null)
78+
private T Create<T>(ISessionManager sessionManager, IApiExecutor apiExecutor = null)
7979
{
8080
var apiClient = new ApiClient(_baseUrl)
8181
{

‎src/SymphonyOSS.RestApiClient/Factories/PodApiFactory.cs

+7-7
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public PodApiFactory(string baseUrl)
4444
/// <param name="apiExecutor">The executor, if none is provided <see cref="RetryStrategyApiExecutor"/>
4545
/// with a <see cref="RefreshTokensRetryStrategy"/> will be used.</param>
4646
/// <returns>The MessageSuppressionApi instance.</returns>
47-
public MessageSuppressionApi CreateMessageSuppressionApi(SessionManager sessionManager, IApiExecutor apiExecutor = null)
47+
public MessageSuppressionApi CreateMessageSuppressionApi(ISessionManager sessionManager, IApiExecutor apiExecutor = null)
4848
{
4949
return Create<MessageSuppressionApi>(sessionManager, apiExecutor);
5050
}
@@ -57,7 +57,7 @@ public MessageSuppressionApi CreateMessageSuppressionApi(SessionManager sessionM
5757
/// <param name="apiExecutor">The executor, if none is provided <see cref="RetryStrategyApiExecutor"/>
5858
/// with a <see cref="RefreshTokensRetryStrategy"/> will be used.</param>
5959
/// <returns>The PresenceApi instance.</returns>
60-
public PresenceApi CreatePresenceApi(SessionManager sessionManager, IApiExecutor apiExecutor = null)
60+
public PresenceApi CreatePresenceApi(ISessionManager sessionManager, IApiExecutor apiExecutor = null)
6161
{
6262
return Create<PresenceApi>(sessionManager, apiExecutor);
6363
}
@@ -83,7 +83,7 @@ public SecurityApi CreateSecurityApi(SessionManager sessionManager, IApiExecutor
8383
/// <param name="apiExecutor">The executor, if none is provided <see cref="RetryStrategyApiExecutor"/>
8484
/// with a <see cref="RefreshTokensRetryStrategy"/> will be used.</param>
8585
/// <returns>The SessionApi instance.</returns>
86-
public SessionApi CreateSessionApi(SessionManager sessionManager, IApiExecutor apiExecutor = null)
86+
public SessionApi CreateSessionApi(ISessionManager sessionManager, IApiExecutor apiExecutor = null)
8787
{
8888
return Create<SessionApi>(sessionManager, apiExecutor);
8989
}
@@ -96,7 +96,7 @@ public SessionApi CreateSessionApi(SessionManager sessionManager, IApiExecutor a
9696
/// <param name="apiExecutor">The executor, if none is provided <see cref="RetryStrategyApiExecutor"/>
9797
/// with a <see cref="RefreshTokensRetryStrategy"/> will be used.</param>
9898
/// <returns>The StreamsApi instance.</returns>
99-
public StreamsApi CreateStreamsApi(SessionManager sessionManager, IApiExecutor apiExecutor = null)
99+
public StreamsApi CreateStreamsApi(ISessionManager sessionManager, IApiExecutor apiExecutor = null)
100100
{
101101
return Create<StreamsApi>(sessionManager, apiExecutor);
102102
}
@@ -109,7 +109,7 @@ public StreamsApi CreateStreamsApi(SessionManager sessionManager, IApiExecutor a
109109
/// <param name="apiExecutor">The executor, if none is provided <see cref="RetryStrategyApiExecutor"/>
110110
/// with a <see cref="RefreshTokensRetryStrategy"/> will be used.</param>
111111
/// <returns>The SystemApi instance.</returns>
112-
public SystemApi CreateSystemApi(SessionManager sessionManager, IApiExecutor apiExecutor = null)
112+
public SystemApi CreateSystemApi(ISessionManager sessionManager, IApiExecutor apiExecutor = null)
113113
{
114114
return Create<SystemApi>(sessionManager, apiExecutor);
115115
}
@@ -122,12 +122,12 @@ public SystemApi CreateSystemApi(SessionManager sessionManager, IApiExecutor api
122122
/// <param name="apiExecutor">The executor, if none is provided <see cref="RetryStrategyApiExecutor"/>
123123
/// with a <see cref="RefreshTokensRetryStrategy"/> will be used.</param>
124124
/// <returns>The UsersApi instance.</returns>
125-
public UsersApi CreateUsersApi(SessionManager sessionManager, IApiExecutor apiExecutor = null)
125+
public UsersApi CreateUsersApi(ISessionManager sessionManager, IApiExecutor apiExecutor = null)
126126
{
127127
return Create<UsersApi>(sessionManager, apiExecutor);
128128
}
129129

130-
private T Create<T>(SessionManager sessionManager, IApiExecutor apiExecutor = null)
130+
private T Create<T>(ISessionManager sessionManager, IApiExecutor apiExecutor = null)
131131
{
132132
var apiClient = new ApiClient(_baseUrl)
133133
{

0 commit comments

Comments
 (0)