From 44021640b041f281d4b52e8a2995d0f5d6fe9cff Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Sun, 1 Oct 2017 18:48:01 +0200 Subject: [PATCH] Moved token conversion so doc won't fail --- FrontSocket/FrontendServices.cs | 2 +- Site/Automation/UploadFileHandler.ashx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/FrontSocket/FrontendServices.cs b/FrontSocket/FrontendServices.cs index 85952377..1b34140b 100644 --- a/FrontSocket/FrontendServices.cs +++ b/FrontSocket/FrontendServices.cs @@ -332,7 +332,7 @@ namespace Swarmops.Frontend.Socket { JObject json = new JObject(); json["MessageType"] = "ProgressUpdate"; - json["Guid"] = guid; + json["Guid"] = guid.Replace("-", "_"); // necessary to be a JS token json["Progress"] = progress; FrontendLoop.BroadcastToOrganization(organization, json); diff --git a/Site/Automation/UploadFileHandler.ashx b/Site/Automation/UploadFileHandler.ashx index 745aef1f..bc13f0b3 100644 --- a/Site/Automation/UploadFileHandler.ashx +++ b/Site/Automation/UploadFileHandler.ashx @@ -364,7 +364,7 @@ namespace Swarmops.Frontend.Automation JObject data = new JObject(); data["ServerRequest"] = "ConvertPdf"; data["PdfFiles"] = JArray.FromObject(pdfsForConversion.ToArray()); - data["Guid"] = (string) guid.Replace("-", "_"); // convert to token + data["Guid"] = (string) guid; data["PersonId"] = authData.CurrentUser.Identity; data["OrganizationId"] = authData.CurrentOrganization.Identity; socket.Send(data.ToString());