diff --git a/SpeckleCore/SpeckleApiClientApiCalls.cs b/SpeckleCore/SpeckleApiClientApiCalls.cs index 1b32e2b..4c511e8 100644 --- a/SpeckleCore/SpeckleApiClientApiCalls.cs +++ b/SpeckleCore/SpeckleApiClientApiCalls.cs @@ -25,7 +25,7 @@ public async System.Threading.Tasks.Task UserRegisterAsync( User b var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/accounts/register" ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -125,7 +125,7 @@ public async System.Threading.Tasks.Task UserLoginAsync( User body var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/accounts/login" ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -223,7 +223,7 @@ public async System.Threading.Tasks.Task UserSearchAsync( User use var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/accounts/search" ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -321,7 +321,7 @@ public async System.Threading.Tasks.Task UserGetAsync( System.Thre var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/accounts" ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -416,7 +416,7 @@ public async System.Threading.Tasks.Task UserUpdateProfileAsync( U var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/accounts" ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -518,7 +518,7 @@ public async System.Threading.Tasks.Task UserGetProfileByIdAsync( urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/accounts/{userId}" ); urlBuilder_.Replace( "{userId}", System.Uri.EscapeDataString( ConvertToString( userId, System.Globalization.CultureInfo.InvariantCulture ) ) ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -613,7 +613,7 @@ public async System.Threading.Tasks.Task ClientGetAllAsync( Syst var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/clients" ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -708,7 +708,7 @@ public async System.Threading.Tasks.Task ClientCreateAsync( AppC var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/clients" ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -810,7 +810,7 @@ public async System.Threading.Tasks.Task ClientUpdateAsync( stri urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/clients/{clientId}" ); urlBuilder_.Replace( "{clientId}", System.Uri.EscapeDataString( ConvertToString( clientId, System.Globalization.CultureInfo.InvariantCulture ) ) ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -912,7 +912,7 @@ public async System.Threading.Tasks.Task ClientGetAsync( string urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/clients/{clientId}" ); urlBuilder_.Replace( "{clientId}", System.Uri.EscapeDataString( ConvertToString( clientId, System.Globalization.CultureInfo.InvariantCulture ) ) ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -1011,7 +1011,7 @@ public async System.Threading.Tasks.Task ClientDeleteAsync( string urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/clients/{clientId}" ); urlBuilder_.Replace( "{clientId}", System.Uri.EscapeDataString( ConvertToString( clientId, System.Globalization.CultureInfo.InvariantCulture ) ) ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -1106,7 +1106,7 @@ public async System.Threading.Tasks.Task ProjectGetAllAsync( Sy var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/projects" ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -1201,7 +1201,7 @@ public async System.Threading.Tasks.Task ProjectCreateAsync( Pr var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/projects" ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -1303,7 +1303,7 @@ public async System.Threading.Tasks.Task ProjectUpdateAsync( st urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/projects/{projectId}" ); urlBuilder_.Replace( "{projectId}", System.Uri.EscapeDataString( ConvertToString( projectId, System.Globalization.CultureInfo.InvariantCulture ) ) ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -1405,7 +1405,7 @@ public async System.Threading.Tasks.Task ProjectGetAsync( strin urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/projects/{projectId}" ); urlBuilder_.Replace( "{projectId}", System.Uri.EscapeDataString( ConvertToString( projectId, System.Globalization.CultureInfo.InvariantCulture ) ) ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -1504,7 +1504,7 @@ public async System.Threading.Tasks.Task ProjectDeleteAsync( strin urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/projects/{projectId}" ); urlBuilder_.Replace( "{projectId}", System.Uri.EscapeDataString( ConvertToString( projectId, System.Globalization.CultureInfo.InvariantCulture ) ) ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -1611,7 +1611,7 @@ public async System.Threading.Tasks.Task CommentCreateAsync( Re urlBuilder_.Replace( "{resourceType}", System.Uri.EscapeDataString( ConvertToString( resourceType, System.Globalization.CultureInfo.InvariantCulture ) ) ); urlBuilder_.Replace( "{resourceId}", System.Uri.EscapeDataString( ConvertToString( resourceId, System.Globalization.CultureInfo.InvariantCulture ) ) ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -1721,7 +1721,7 @@ public async System.Threading.Tasks.Task CommentGetFromResource urlBuilder_.Replace( "{resourceType}", System.Uri.EscapeDataString( ConvertToString( resourceType, System.Globalization.CultureInfo.InvariantCulture ) ) ); urlBuilder_.Replace( "{resourceId}", System.Uri.EscapeDataString( ConvertToString( resourceId, System.Globalization.CultureInfo.InvariantCulture ) ) ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -1820,7 +1820,7 @@ public async System.Threading.Tasks.Task CommentGetAsync( strin urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/comments/{commentId}" ); urlBuilder_.Replace( "{commentId}", System.Uri.EscapeDataString( ConvertToString( commentId, System.Globalization.CultureInfo.InvariantCulture ) ) ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -1919,7 +1919,7 @@ public async System.Threading.Tasks.Task CommentUpdateAsync( strin urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/comments/{commentId}" ); urlBuilder_.Replace( "{commentId}", System.Uri.EscapeDataString( ConvertToString( commentId, System.Globalization.CultureInfo.InvariantCulture ) ) ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -2021,7 +2021,7 @@ public async System.Threading.Tasks.Task CommentDeleteAsync( strin urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/comments/{commentId}" ); urlBuilder_.Replace( "{commentId}", System.Uri.EscapeDataString( ConvertToString( commentId, System.Globalization.CultureInfo.InvariantCulture ) ) ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -2116,7 +2116,8 @@ public async System.Threading.Tasks.Task StreamsGetAllAsync( Sys var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/streams" ); - var client_ = new System.Net.Http.HttpClient(); + //var client_ = GetHttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -2211,7 +2212,7 @@ public async System.Threading.Tasks.Task StreamCreateAsync( Spec var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/streams" ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -2316,7 +2317,7 @@ public async System.Threading.Tasks.Task StreamGetAsync( string urlBuilder_.Replace( "{streamId}", System.Uri.EscapeDataString( ConvertToString( streamId, System.Globalization.CultureInfo.InvariantCulture ) ) ); if ( query != null ) urlBuilder_.Append( query ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -2415,7 +2416,7 @@ public async System.Threading.Tasks.Task StreamUpdateAsync( string urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/streams/{streamId}" ); urlBuilder_.Replace( "{streamId}", System.Uri.EscapeDataString( ConvertToString( streamId, System.Globalization.CultureInfo.InvariantCulture ) ) ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -2517,7 +2518,7 @@ public async System.Threading.Tasks.Task StreamDeleteAsync( string urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/streams/{streamId}" ); urlBuilder_.Replace( "{streamId}", System.Uri.EscapeDataString( ConvertToString( streamId, System.Globalization.CultureInfo.InvariantCulture ) ) ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -2620,7 +2621,7 @@ public async System.Threading.Tasks.Task StreamGetObjectsAsync( if ( query != null ) urlBuilder_.Append( query ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -2719,7 +2720,7 @@ public async System.Threading.Tasks.Task StreamCloneAsync( urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/streams/{streamId}/clone" ); urlBuilder_.Replace( "{streamId}", System.Uri.EscapeDataString( ConvertToString( streamId, System.Globalization.CultureInfo.InvariantCulture ) ) ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -2822,7 +2823,7 @@ public async System.Threading.Tasks.Task StreamDiffAsync( st urlBuilder_.Replace( "{streamId}", System.Uri.EscapeDataString( ConvertToString( streamId, System.Globalization.CultureInfo.InvariantCulture ) ) ); urlBuilder_.Replace( "{otherStreamId}", System.Uri.EscapeDataString( ConvertToString( otherStreamId, System.Globalization.CultureInfo.InvariantCulture ) ) ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -2917,7 +2918,7 @@ public async System.Threading.Tasks.Task ObjectCreateAsync( Syst var urlBuilder_ = new System.Text.StringBuilder(); urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/objects" ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -3019,7 +3020,7 @@ public async System.Threading.Tasks.Task ObjectUpdateAsync( stri urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/objects/{objectId}" ); urlBuilder_.Replace( "{objectId}", System.Uri.EscapeDataString( ConvertToString( objectId, System.Globalization.CultureInfo.InvariantCulture ) ) ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -3121,7 +3122,7 @@ public async System.Threading.Tasks.Task ObjectGetAsync( string urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/objects/{objectId}" ); urlBuilder_.Replace( "{objectId}", System.Uri.EscapeDataString( ConvertToString( objectId, System.Globalization.CultureInfo.InvariantCulture ) ) ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -3220,7 +3221,7 @@ public async System.Threading.Tasks.Task ObjectDeleteAsync( string urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/objects/{objectId}" ); urlBuilder_.Replace( "{objectId}", System.Uri.EscapeDataString( ConvertToString( objectId, System.Globalization.CultureInfo.InvariantCulture ) ) ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -3321,7 +3322,7 @@ public async System.Threading.Tasks.Task ObjectUpdatePropertiesAsy urlBuilder_.Append( BaseUrl != null ? BaseUrl.TrimEnd( '/' ) : "" ).Append( "/objects/{objectId}/properties" ); urlBuilder_.Replace( "{objectId}", System.Uri.EscapeDataString( ConvertToString( objectId, System.Globalization.CultureInfo.InvariantCulture ) ) ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) @@ -3408,7 +3409,7 @@ public async System.Threading.Tasks.Task ObjectGetBulkAsync( str if ( query != null ) urlBuilder_.Append( query ); - var client_ = new System.Net.Http.HttpClient(); + var client_ = GetHttpClient(); try { using ( var request_ = new System.Net.Http.HttpRequestMessage() ) diff --git a/SpeckleCore/SpeckleApiClientHead.cs b/SpeckleCore/SpeckleApiClientHead.cs index 273eac9..e66c029 100644 --- a/SpeckleCore/SpeckleApiClientHead.cs +++ b/SpeckleCore/SpeckleApiClientHead.cs @@ -10,65 +10,75 @@ namespace SpeckleCore { - [System.CodeDom.Compiler.GeneratedCode("NSwag", "11.3.3.0")] - public partial class SpeckleApiClient + [System.CodeDom.Compiler.GeneratedCode( "NSwag", "11.3.3.0" )] + public partial class SpeckleApiClient + { + private System.Lazy _settings; + private string _baseUrl = "http://localhost:8080/api"; + private string _authToken = ""; + private bool _UseGzip = true; + + public SpeckleApiClient( bool useGzip = true ) { - private System.Lazy _settings; - private string _baseUrl = "http://localhost:8080/api"; - private string _authToken = ""; - private bool _UseGzip = true; + _settings = new System.Lazy( ( ) => + { + var settings = new Newtonsoft.Json.JsonSerializerSettings(); + UpdateJsonSerializerSettings( settings ); + return settings; + } ); + UseGzip = useGzip; + } - public SpeckleApiClient(bool useGzip = true) - { - _settings = new System.Lazy(() => - { - var settings = new Newtonsoft.Json.JsonSerializerSettings(); - UpdateJsonSerializerSettings(settings); - return settings; - }); - UseGzip = useGzip; - } + public bool UseGzip + { + get { return _UseGzip; } + set { _UseGzip = value; } + } + + public string BaseUrl + { + get { return _baseUrl; } + set { _baseUrl = value; } + } - public bool UseGzip - { - get { return _UseGzip; } - set { _UseGzip = value; } - } + public string AuthToken + { + get { return _authToken; } + set { _authToken = value; } + } - public string BaseUrl - { - get { return _baseUrl; } - set { _baseUrl = value; } - } + partial void UpdateJsonSerializerSettings( Newtonsoft.Json.JsonSerializerSettings settings ); - public string AuthToken - { - get { return _authToken; } - set { _authToken = value; } - } + partial void PrepareRequest( System.Net.Http.HttpClient client, System.Net.Http.HttpRequestMessage request, string url ); - partial void UpdateJsonSerializerSettings(Newtonsoft.Json.JsonSerializerSettings settings); + partial void PrepareRequest( System.Net.Http.HttpClient client, System.Net.Http.HttpRequestMessage request, System.Text.StringBuilder urlBuilder ); - partial void PrepareRequest(System.Net.Http.HttpClient client, System.Net.Http.HttpRequestMessage request, string url); + partial void ProcessResponse( System.Net.Http.HttpClient client, System.Net.Http.HttpResponseMessage response ); - partial void PrepareRequest(System.Net.Http.HttpClient client, System.Net.Http.HttpRequestMessage request, System.Text.StringBuilder urlBuilder); + partial void ProcessResponse( HttpClient client, HttpResponseMessage response ) + { + + } - partial void ProcessResponse(System.Net.Http.HttpClient client, System.Net.Http.HttpResponseMessage response); + partial void PrepareRequest( HttpClient client, HttpRequestMessage request, string url ) + { + // Try and attach the auth token if present + if ( AuthToken != "" ) + request.Headers.Add( "Authorization", AuthToken ); - partial void PrepareRequest(HttpClient client, HttpRequestMessage request, string url) - { - if (AuthToken != "") - request.Headers.Add("Authorization", AuthToken); + // Let the server know about our aspiration to accept gzipped content. + request.Headers.Add( "Accept-Encoding", "gzip" ); - if (UseGzip && request.Method != HttpMethod.Get) - request.Content = new GzipContent(request.Content); - } + // If actually sending a payload, deflate it. + if ( UseGzip && request.Method != HttpMethod.Get ) + request.Content = new GzipContent( request.Content ); + } - private HttpClient GetHttpClient() - { - var handler = new HttpClientHandler(); - handler.AutomaticDecompression = System.Net.DecompressionMethods.GZip; - return new HttpClient(handler, true); - } + private HttpClient GetHttpClient( ) + { + var handler = new HttpClientHandler(); + handler.AutomaticDecompression = System.Net.DecompressionMethods.GZip; + return new HttpClient( handler, true ); } + } }