Removed NewtonSoft.Json

Author: Its-Networking

Form/KeyAuth.cs

@@ -11,10 +11,8 @@
 using System.Collections.Generic;
 using System.Security.Cryptography.X509Certificates;
 using System.Net.Security;
-using Newtonsoft.Json;
 using System.Threading;
 using System.Runtime.CompilerServices;
-using Newtonsoft.Json.Linq;
 
 namespace KeyAuth
 {
@@ -910,22 +908,19 @@ public static void LogEvent(string content)
 
             try
             {
-                JObject jsonObject = JsonConvert.DeserializeObject<JObject>(content);
-
                 // Redact sensitive fields - Add more if you would like. 
-                RedactField(jsonObject, "sessionid");
-                RedactField(jsonObject, "ownerid");
-                RedactField(jsonObject, "app");
-                RedactField(jsonObject, "secret");
-                RedactField(jsonObject, "version");
-                RedactField(jsonObject, "fileid");
-                RedactField(jsonObject, "webhooks");
-                RedactField(jsonObject, "nonce");
-                string redactedContent = jsonObject.ToString(Newtonsoft.Json.Formatting.None);
+                content = RedactField(content, "sessionid");
+                content = RedactField(content, "ownerid");
+                content = RedactField(content, "app");
+                content = RedactField(content, "secret");
+                content = RedactField(content, "version");
+                content = RedactField(content, "fileid");
+                content = RedactField(content, "webhooks");
+                content = RedactField(content, "nonce");
 
                 using (StreamWriter writer = File.AppendText(logFilePath))
                 {
-                    writer.WriteLine($"[{DateTime.Now}] [{AppDomain.CurrentDomain.FriendlyName}] {redactedContent}");
+                    writer.WriteLine($"[{DateTime.Now}] [{AppDomain.CurrentDomain.FriendlyName}] {content}");
                 }
             }
             catch (Exception ex)
@@ -934,13 +929,12 @@ public static void LogEvent(string content)
             }
         }
 
-        private static void RedactField(JObject jsonObject, string fieldName)
+        private static string RedactField(string content, string fieldName)
         {
-            JToken token;
-            if (jsonObject.TryGetValue(fieldName, out token))
-            {
-                jsonObject[fieldName] = "REDACTED";
-            }
+            string pattern = $"\"{fieldName}\":\"[^\"]*\"";
+            string replacement = $"\"{fieldName}\":\"REDACTED\"";
+
+            return System.Text.RegularExpressions.Regex.Replace(content, pattern, replacement);
         }
 
         public static void error(string message)

Form/Loader.csproj

@@ -35,9 +35,6 @@
   <PropertyGroup />
   <PropertyGroup />
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Design" />
@@ -73,7 +70,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>