diff --git a/Agent/Services/ScriptExecutor.cs b/Agent/Services/ScriptExecutor.cs index 1e983fd8..ccd3bc36 100644 --- a/Agent/Services/ScriptExecutor.cs +++ b/Agent/Services/ScriptExecutor.cs @@ -48,7 +48,7 @@ public class ScriptExecutor : IScriptExecutor result.InputType = ScriptInputType.Api; result.SenderUserName = senderUsername; - await SendResultsToApi(result, authToken); + _ = await SendResultsToApi(result, authToken); await hubConnection.SendAsync("ScriptResultViaApi", requestID); } catch (Exception ex) @@ -78,7 +78,7 @@ public class ScriptExecutor : IScriptExecutor { return; } - await hubConnection.SendAsync("ScriptResult", responseResult.ID); + await hubConnection.SendAsync("ScriptResult", responseResult.Id); } catch (Exception ex) { @@ -143,7 +143,7 @@ public class ScriptExecutor : IScriptExecutor result.InputType = scriptInputType; result.SavedScriptId = savedScriptId; - var responseResult = await SendResultsToApi(result, expiringToken); + _ = await SendResultsToApi(result, expiringToken); } catch (Exception ex) { @@ -196,7 +196,7 @@ public class ScriptExecutor : IScriptExecutor } throw new InvalidOperationException($"Unknown shell type: {shell}"); } - private async Task SendResultsToApi(object result, string expiringToken) + private async Task SendResultsToApi(object result, string expiringToken) { var targetURL = _configService.GetConnectionInfo().Host + $"/API/ScriptResults"; @@ -212,6 +212,6 @@ public class ScriptExecutor : IScriptExecutor } var content = await response.Content.ReadAsStringAsync(); - return JsonSerializer.Deserialize(content, JsonSerializerHelper.CaseInsensitiveOptions); + return JsonSerializer.Deserialize(content, JsonSerializerHelper.CaseInsensitiveOptions); } } \ No newline at end of file diff --git a/Server/API/ScriptResultsController.cs b/Server/API/ScriptResultsController.cs index b47a5eb7..8936763f 100644 --- a/Server/API/ScriptResultsController.cs +++ b/Server/API/ScriptResultsController.cs @@ -54,7 +54,7 @@ public class ScriptResultsController : ControllerBase [HttpPost] [ServiceFilter(typeof(ExpiringTokenFilter))] - public async Task> Post([FromBody] ScriptResult result) + public async Task> Post([FromBody] ScriptResult result) { _dataService.AddOrUpdateScriptResult(result); @@ -111,6 +111,9 @@ public class ScriptResultsController : ControllerBase await _dataService.AddScriptResultToScriptRun(result.ID, result.ScriptRunId.Value); } - return result; + return new ScriptResultResponse() + { + Id = result.ID + }; } } diff --git a/Shared/Models/ScriptResultResponse.cs b/Shared/Models/ScriptResultResponse.cs new file mode 100644 index 00000000..ea6ceadd --- /dev/null +++ b/Shared/Models/ScriptResultResponse.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Remotely.Shared.Models; +public class ScriptResultResponse +{ + public required string Id { get; init; } +}