Switch out Unity.Plastic json for an internal compact library

kirre-bylund · kirre-bylund · commit 9bba7b3db211 · 2023-04-28T10:27:52.000+02:00
Based on https://github.com/smourier/ZeroDepJson with some minor changes (added support for creating specialized serialization options and recovering from snake case to camel case differences) Left to do: Fix string obfuscation and remove usage of "Indented" json formatting that does nothing
diff --git a/Runtime/Client/LootLockerBaseServerAPI.cs b/Runtime/Client/LootLockerBaseServerAPI.cs
@@ -2,14 +2,10 @@
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Networking;
-//using Newtonsoft.Json;
-using Unity.Plastic.Newtonsoft.Json;
 using System;
 using System.Text;
 using System.Net;
 using LootLocker.Requests;
-//using Newtonsoft.Json.Linq;
-using Unity.Plastic.Newtonsoft.Json.Linq;
 
 namespace LootLocker.LootLockerEnums
 {
@@ -366,13 +362,15 @@ public ObfuscationDetails(string key, char replacementChar = '*', int visibleCha
             new ObfuscationDetails("token")
         };
 
+        //TODO: Fix this json usage
         private static string ObfuscateJsonStringForLogging(string json)
         {
-            if (string.IsNullOrEmpty(json))
+            return json;
+            /*if (string.IsNullOrEmpty(json))
             {
                 return json;
             }
-
+            
             JObject jsonObject;
             try
             {
@@ -432,7 +430,7 @@ private static string ObfuscateJsonStringForLogging(string json)
                 }
             }
 
-            return LootLockerJson.SerializeObject(jsonObject);
+            return LootLockerJson.SerializeObject(jsonObject);*/
         }
 
         string BuildURL(string endpoint, Dictionary<string, string> queryParams = null)
diff --git a/Runtime/Client/LootLockerServerRequest.cs b/Runtime/Client/LootLockerServerRequest.cs
@@ -1,24 +1,22 @@
 using System.Collections.Generic;
 using UnityEngine;
 using System;
-using Unity.Plastic.Newtonsoft.Json;
 using LootLocker.LootLockerEnums;
-using Unity.Plastic.Newtonsoft.Json.Serialization;
+using LootLocker.ZeroDepJson;
 #if UNITY_EDITOR
 using UnityEditor;
 #endif
 
-
-// using LootLocker.Admin;
-// using LootLocker.Admin.Requests;
-
 //this is common between user and admin
 namespace LootLocker
 {
 
     public static class LootLockerJsonSettings
     {
-        public static readonly JsonSerializerSettings Default = new JsonSerializerSettings
+        public static readonly JsonOptions Default = new JsonOptions(JsonSerializationOptions.Default & ~JsonSerializationOptions.SkipGetOnly);
+
+        public static readonly JsonOptions Indented = new JsonOptions(JsonSerializationOptions.Default & ~JsonSerializationOptions.SkipGetOnly, "\t");
+        /*public static readonly JsonSerializerSettings Default = new JsonSerializerSettings
         {
             ContractResolver = new DefaultContractResolver { NamingStrategy = new SnakeCaseNamingStrategy() },
             Formatting = Formatting.None
@@ -27,20 +25,29 @@ public static class LootLockerJsonSettings
         {
             ContractResolver = new DefaultContractResolver { NamingStrategy = new SnakeCaseNamingStrategy() },
             Formatting = Formatting.None
-        };
+        };*/
     }
 
     public static class LootLockerJson
     {
-        public static string SerializeObject(object obj, JsonSerializerSettings settings = null)
+        public static string SerializeObject(object obj, JsonOptions options = null)
+        {
+            return Json.Serialize(obj, options ?? LootLockerJsonSettings.Default);
+        }
+
+        public static T DeserializeObject<T>(string json, JsonOptions options = null)
+        {
+            return Json.Deserialize<T>(json, options ?? LootLockerJsonSettings.Default);
+        }
+        /*public static string SerializeObject(object obj, JsonSerializerSettings settings = null)
         {
             return JsonConvert.SerializeObject(obj, settings ?? LootLockerJsonSettings.Default);
         }
 
         public static T DeserializeObject<T>(string json, JsonSerializerSettings settings = null)
         {
             return JsonConvert.DeserializeObject<T>(json, settings ?? LootLockerJsonSettings.Default);
-        }
+        }*/
     }
 
     [System.Serializable]
@@ -96,13 +103,13 @@ public class LootLockerResponse
         /// </summary>
         public string EventId;
 
-        public static void Deserialize<T>(Action<T> onComplete, LootLockerResponse serverResponse, JsonSerializerSettings settings = null)
+        public static void Deserialize<T>(Action<T> onComplete, LootLockerResponse serverResponse, JsonOptions options = null)
             where T : LootLockerResponse, new()
         {
-            onComplete?.Invoke(Deserialize<T>(serverResponse, settings));
+            onComplete?.Invoke(Deserialize<T>(serverResponse, options));
         }
 
-        public static T Deserialize<T>(LootLockerResponse serverResponse, JsonSerializerSettings settings = null)
+        public static T Deserialize<T>(LootLockerResponse serverResponse, JsonOptions options = null)
             where T : LootLockerResponse, new() 
         {
             if (serverResponse == null)
@@ -114,7 +121,7 @@ public static T Deserialize<T>(LootLockerResponse serverResponse, JsonSerializer
                 return new T() { success = false, Error = serverResponse.Error, statusCode = serverResponse.statusCode };
             }
 
-            var response = LootLockerJson.DeserializeObject<T>(serverResponse.text, settings ?? LootLockerJsonSettings.Default) ?? new T();
+            var response = LootLockerJson.DeserializeObject<T>(serverResponse.text, options ?? LootLockerJsonSettings.Default) ?? new T();
 
             response.text = serverResponse.text;
             response.success = serverResponse.success;
diff --git a/Runtime/Game/Requests/AssetRequest.cs b/Runtime/Game/Requests/AssetRequest.cs
@@ -1,10 +1,5 @@
-﻿//using Newtonsoft.Json;
-using Unity.Plastic.Newtonsoft.Json;
-using System;
-using System.Collections;
+﻿using System;
 using System.Collections.Generic;
-using UnityEngine;
-using LootLocker;
 using LootLocker.Requests;
 using System.Linq;
 
diff --git a/Runtime/Game/Requests/CrashesRequest.cs b/Runtime/Game/Requests/CrashesRequest.cs
@@ -1,10 +1,5 @@
-﻿//using Newtonsoft.Json;
-using Unity.Plastic.Newtonsoft.Json;
-using System;
-using System.Collections;
+﻿using System;
 using System.Collections.Generic;
-using UnityEngine;
-using LootLocker;
 using LootLocker.Requests;
 
 
diff --git a/Runtime/Game/Requests/LootLockerSessionRequest.cs b/Runtime/Game/Requests/LootLockerSessionRequest.cs
@@ -9,7 +9,7 @@ public class LootLockerSessionRequest : LootLockerGetRequest
     {
         public string game_key => LootLockerConfig.current.apiKey?.ToString();
         public string platform => CurrentPlatform.GetString();
-        public string player_identifier { get; private set; }
+        public string player_identifier { get; set; }
         public string game_version => LootLockerConfig.current.game_version;
 
         public LootLockerSessionRequest(string player_identifier)
@@ -117,7 +117,7 @@ public class LootLockerLevel_Thresholds
     public class LootLockerNintendoSwitchSessionRequest : LootLockerGetRequest
     {
         public string game_key => LootLockerConfig.current.apiKey?.ToString();
-        public string nsa_id_token { get; private set; }
+        public string nsa_id_token { get; set; }
         public string game_version => LootLockerConfig.current.game_version;
 
         public LootLockerNintendoSwitchSessionRequest(string nsa_id_token)
@@ -130,7 +130,7 @@ public LootLockerNintendoSwitchSessionRequest(string nsa_id_token)
     public class LootLockerEpicSessionRequest : LootLockerGetRequest
     {
         public string game_key => LootLockerConfig.current.apiKey?.ToString();
-        public string id_token { get; private set; }
+        public string id_token { get; set; }
         public string game_version => LootLockerConfig.current.game_version;
 
         public LootLockerEpicSessionRequest(string id_token)
@@ -143,7 +143,7 @@ public LootLockerEpicSessionRequest(string id_token)
     public class LootLockerEpicRefreshSessionRequest : LootLockerGetRequest
     {
         public string game_key => LootLockerConfig.current.apiKey?.ToString();
-        public string refresh_token { get; private set; }
+        public string refresh_token { get; set; }
         public string game_version => LootLockerConfig.current.game_version;
 
         public LootLockerEpicRefreshSessionRequest(string refresh_token)
@@ -155,7 +155,7 @@ public LootLockerEpicRefreshSessionRequest(string refresh_token)
     public class LootLockerXboxOneSessionRequest : LootLockerGetRequest
     {
         public string game_key => LootLockerConfig.current.apiKey?.ToString();
-        public string xbox_user_token { get; private set; }
+        public string xbox_user_token { get; set; }
         public string game_version => LootLockerConfig.current.game_version;
 
         public LootLockerXboxOneSessionRequest(string xbox_user_token)
@@ -167,7 +167,7 @@ public LootLockerXboxOneSessionRequest(string xbox_user_token)
     public class LootLockerGoogleSignInSessionRequest : LootLockerGetRequest
     {
         public string game_key => LootLockerConfig.current.apiKey?.ToString();
-        public string id_token { get; private set; }
+        public string id_token { get; set; }
         public string game_version => LootLockerConfig.current.game_version;
 
         public LootLockerGoogleSignInSessionRequest(string id_token)
@@ -179,7 +179,7 @@ public LootLockerGoogleSignInSessionRequest(string id_token)
     public class LootLockerGoogleRefreshSessionRequest : LootLockerGetRequest
     {
         public string game_key => LootLockerConfig.current.apiKey?.ToString();
-        public string refresh_token { get; private set; }
+        public string refresh_token { get; set; }
         public string game_version => LootLockerConfig.current.game_version;
 
         public LootLockerGoogleRefreshSessionRequest(string refresh_token)
@@ -191,7 +191,7 @@ public LootLockerGoogleRefreshSessionRequest(string refresh_token)
     public class LootLockerAppleSignInSessionRequest : LootLockerGetRequest
     {
         public string game_key => LootLockerConfig.current.apiKey?.ToString();
-        public string apple_authorization_code { get; private set; }
+        public string apple_authorization_code { get; set; }
         public string game_version => LootLockerConfig.current.game_version;
 
         public LootLockerAppleSignInSessionRequest(string apple_authorization_code)
@@ -203,7 +203,7 @@ public LootLockerAppleSignInSessionRequest(string apple_authorization_code)
     public class LootLockerAppleRefreshSessionRequest : LootLockerGetRequest
     {
         public string game_key => LootLockerConfig.current.apiKey?.ToString();
-        public string refresh_token { get; private set; }
+        public string refresh_token { get; set; }
         public string game_version => LootLockerConfig.current.game_version;
 
         public LootLockerAppleRefreshSessionRequest(string refresh_token)
diff --git a/Runtime/Game/Requests/MapsRequest.cs b/Runtime/Game/Requests/MapsRequest.cs
@@ -1,11 +1,5 @@
-﻿using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using LootLocker.Requests;
-using LootLocker;
+﻿using LootLocker.Requests;
 using System;
-//using Newtonsoft.Json;
-using Unity.Plastic.Newtonsoft.Json;
 
 namespace LootLocker.Requests
 {
diff --git a/Runtime/Game/Requests/MessagesRequest.cs b/Runtime/Game/Requests/MessagesRequest.cs
@@ -1,10 +1,4 @@
-﻿using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using LootLocker;
-using LootLocker.Requests;
-//using Newtonsoft.Json;
-using Unity.Plastic.Newtonsoft.Json;
+﻿using LootLocker.Requests;
 using System;
 
 namespace LootLocker.Requests
diff --git a/Runtime/Game/Requests/PlayerRequest.cs b/Runtime/Game/Requests/PlayerRequest.cs
@@ -1,6 +1,6 @@
 using System;
 using LootLocker.Requests;
-using Unity.Plastic.Newtonsoft.Json;
+using LootLocker.ZeroDepJson;
 
 namespace LootLocker.Requests
 {
@@ -203,7 +203,7 @@ public class LootLockerPlayerFile : LootLockerResponse
         public string name { get; set; }
         public int size { get; set; }
         public string purpose { get; set; }
-        [JsonProperty("public")]
+        [Json(Name = "public")]
         public bool is_public { get; set; }
         public string url { get; set; }
         public DateTime url_expires_at { get; set; }
diff --git a/Runtime/Libraries.meta b/Runtime/Libraries.meta
diff --git a/Runtime/Libraries/ZeroDepJson.cs b/Runtime/Libraries/ZeroDepJson.cs
diff --git a/Runtime/Libraries/ZeroDepJson.cs.meta b/Runtime/Libraries/ZeroDepJson.cs.meta

Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,10 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using UnityEngine;`
`4`	`4`	`using UnityEngine.Networking;`
`5`		`-//using Newtonsoft.Json;`
`6`		`-using Unity.Plastic.Newtonsoft.Json;`
`7`	`5`	`using System;`
`8`	`6`	`using System.Text;`
`9`	`7`	`using System.Net;`
`10`	`8`	`using LootLocker.Requests;`
`11`		`-//using Newtonsoft.Json.Linq;`
`12`		`-using Unity.Plastic.Newtonsoft.Json.Linq;`
`13`	`9`
`14`	`10`	`namespace LootLocker.LootLockerEnums`
`15`	`11`	`{`
`@@ -366,13 +362,15 @@ public ObfuscationDetails(string key, char replacementChar = '*', int visibleCha`
`366`	`362`	`new ObfuscationDetails("token")`
`367`	`363`	`};`
`368`	`364`
	`365`	`+ //TODO: Fix this json usage`
`369`	`366`	`private static string ObfuscateJsonStringForLogging(string json)`
`370`	`367`	`{`
`371`		`- if (string.IsNullOrEmpty(json))`
	`368`	`+ return json;`
	`369`	`+ /*if (string.IsNullOrEmpty(json))`
`372`	`370`	`{`
`373`	`371`	`return json;`
`374`	`372`	`}`
`375`		`-`
	`373`	`+`
`376`	`374`	`JObject jsonObject;`
`377`	`375`	`try`
`378`	`376`	`{`
`@@ -432,7 +430,7 @@ private static string ObfuscateJsonStringForLogging(string json)`
`432`	`430`	`}`
`433`	`431`	`}`
`434`	`432`
`435`		`- return LootLockerJson.SerializeObject(jsonObject);`
	`433`	`+ return LootLockerJson.SerializeObject(jsonObject);*/`
`436`	`434`	`}`
`437`	`435`
`438`	`436`	`string BuildURL(string endpoint, Dictionary<string, string> queryParams = null)`