diff --git a/src/DynamoMLDataPipeline/DynamoMLDataPipeline.cs b/src/DynamoMLDataPipeline/DynamoMLDataPipeline.cs index ea0f5f9e649..f3c81f2b2c2 100644 --- a/src/DynamoMLDataPipeline/DynamoMLDataPipeline.cs +++ b/src/DynamoMLDataPipeline/DynamoMLDataPipeline.cs @@ -4,6 +4,7 @@ using System.Text; using Dynamo.Logging; using Dynamo.Models; +using Dynamo.Utilities; using Greg; using Newtonsoft.Json; using Newtonsoft.Json.Linq; @@ -63,7 +64,7 @@ internal string ProductionCollectionID // Id of the user sending the post request. private string GetUserId() { - return AuthUserInfoProvider?.UserId; + return AuthUserInfoProvider?.UserId ?? string.Empty; } // Authorization token needed for the restsharp post request in this pipeline. @@ -160,9 +161,10 @@ static public string ConvertDynToBase64(string filePath) { // Read .dyn file as a string string sourceFileContent = File.ReadAllText(filePath); + string formattedSourceContent = PIIDetector.RemovePIIData(sourceFileContent); // Convert the string to a byte array (buffer) - byte[] stringBuffer = Encoding.UTF8.GetBytes(sourceFileContent); + byte[] stringBuffer = Encoding.UTF8.GetBytes(formattedSourceContent); // Compress to gzip and then convert to base64 to optimize size byte[] compressedBuffer = DataUtilities.Compress(stringBuffer); diff --git a/src/DynamoMLDataPipeline/DynamoMLDataPipeline.csproj b/src/DynamoMLDataPipeline/DynamoMLDataPipeline.csproj index a11da93f946..ee94e15110a 100644 --- a/src/DynamoMLDataPipeline/DynamoMLDataPipeline.csproj +++ b/src/DynamoMLDataPipeline/DynamoMLDataPipeline.csproj @@ -18,6 +18,10 @@ {7858fa8c-475f-4b8e-b468-1f8200778cf8} DynamoCore + + {B5F435CB-0D8A-40B1-A4F7-5ECB3CE792A9} + DynamoUtilities + diff --git a/src/DynamoUtilities/Properties/AssemblyInfo.cs b/src/DynamoUtilities/Properties/AssemblyInfo.cs index 53a438070a1..181c011d33e 100644 --- a/src/DynamoUtilities/Properties/AssemblyInfo.cs +++ b/src/DynamoUtilities/Properties/AssemblyInfo.cs @@ -22,6 +22,7 @@ [assembly: InternalsVisibleTo("ProtoScript")] [assembly: InternalsVisibleTo("ProtoCore")] [assembly: InternalsVisibleTo("DynamoApplications")] +[assembly: InternalsVisibleTo("DynamoMLDataPipeline")] [assembly: InternalsVisibleTo("DynamoCLI")] [assembly: InternalsVisibleTo("NodeDocumentationMarkdownGenerator")] [assembly: InternalsVisibleTo("DynamoUtilitiesTests")]