Merge pull request #29 from LootLocker/fix/refactors

Fix/refactors
Fix a mapping bug when LootLockerLevel_Thresholds next property is returned as null from the server

Author: kristijan-ujevic

Runtime/Client/LootLockerServerRequest.cs

@@ -23,7 +23,7 @@ public enum LootLockerHTTPMethod
         CREATE = 5,
         OPTIONS = 6,
         PATCH = 7,
-        UPLOAD = 8 
+        UPLOAD = 8
     }
 
     /// <summary>
@@ -32,34 +32,66 @@ public enum LootLockerHTTPMethod
     [System.Serializable]
     public class LootLockerResponse
     {
-
         /// <summary>
         /// TRUE if http error OR server returns an error status
         /// </summary>
         public bool hasError;
+
         /// <summary>
         /// HTTP Status Code
         /// </summary>
         public int statusCode;
+
         /// <summary>
         /// Raw text response from the server
         /// <para>If hasError = true, this will contain the error message.</para>
         /// </summary>
         public string text;
+
         public bool success;
 
 
         public string Error;
+
         /// <summary>
         /// A texture downloaded in the webrequest, if applicable, otherwise this will be null.
         /// </summary>
         public Texture2D texture;
+
         /// <summary>
         /// inheritdoc added this because unity main thread excuting style cut the calling stack and make the event orphant seealso calling multiple events 
         /// of the same type makes use unable to identify each one
         /// </summary>
         public string EventId;
 
+        public static void Serialize<T>(Action<T> onComplete, LootLockerResponse serverResponse)
+            where T : LootLockerResponse
+        {
+            if (!string.IsNullOrEmpty(serverResponse.Error)) return;
+
+            var response = JsonConvert.DeserializeObject<T>(serverResponse.text);
+
+            response.text = serverResponse.text;
+            response.success = serverResponse.success;
+            response.Error = serverResponse.Error;
+            response.statusCode = serverResponse.statusCode;
+            onComplete?.Invoke(response);
+        }
+
+        public static T Serialize<T>(LootLockerResponse serverResponse)
+            where T : LootLockerResponse
+        {
+            if (!string.IsNullOrEmpty(serverResponse.Error)) return null;
+
+            var response = JsonConvert.DeserializeObject<T>(serverResponse.text);
+
+            response.text = serverResponse.text;
+            response.success = serverResponse.success;
+            response.Error = serverResponse.Error;
+            response.statusCode = serverResponse.statusCode;
+
+            return response;
+        }
     }
 
     /// <summary>
@@ -70,7 +102,7 @@ public class LootLockerResponseFactory
         /// <summary>
         /// Construct an error response to send to the client.
         /// </summary>
-        public static T Error<T> (string errorMessage) where T : LootLockerResponse, new()
+        public static T Error<T>(string errorMessage) where T : LootLockerResponse, new()
         {
             return new T()
             {
@@ -105,20 +137,24 @@ public struct LootLockerServerRequest
         public string uploadType;
         public LootLocker.LootLockerEnums.LootLockerCallerRole adminCall;
         public WWWForm form;
+
         /// <summary>
         /// Leave this null if you don't need custom headers
         /// </summary>
         public Dictionary<string, string> extraHeaders;
+
         /// <summary>
         /// Query parameters to append to the end of the request URI
         /// <para>Example: If you include a dictionary with a key of "page" and a value of "42" (as a string) then the url would become "https: //mydomain.com/endpoint?page=42"</para>
         /// </summary>
         public Dictionary<string, string> queryParams;
+
         public int retryCount;
 
         #region Make ServerRequest and call send (3 functions)
 
-        public static void CallAPI(string endPoint, LootLockerHTTPMethod httpMethod, string body = null, Action<LootLockerResponse> onComplete = null, bool useAuthToken = true, LootLocker.LootLockerEnums.LootLockerCallerRole callerRole = LootLocker.LootLockerEnums.LootLockerCallerRole.User)
+        public static void CallAPI(string endPoint, LootLockerHTTPMethod httpMethod, string body = null, Action<LootLockerResponse> onComplete = null, bool useAuthToken = true,
+            LootLocker.LootLockerEnums.LootLockerCallerRole callerRole = LootLocker.LootLockerEnums.LootLockerCallerRole.User)
         {
 #if UNITY_EDITOR
             LootLockerSDKManager.DebugMessage("Caller Type: " + callerRole.ToString());
@@ -129,27 +165,25 @@ public static void CallAPI(string endPoint, LootLockerHTTPMethod httpMethod, str
             if (useAuthToken)
             {
                 headers = new Dictionary<string, string>();
-                headers.Add(callerRole == LootLocker.LootLockerEnums.LootLockerCallerRole.Admin ? "x-auth-token" : "x-session-token", callerRole == LootLocker.LootLockerEnums.LootLockerCallerRole.Admin ? LootLockerConfig.current.adminToken : LootLockerConfig.current.token);
+                headers.Add(callerRole == LootLocker.LootLockerEnums.LootLockerCallerRole.Admin ? "x-auth-token" : "x-session-token",
+                    callerRole == LootLocker.LootLockerEnums.LootLockerCallerRole.Admin ? LootLockerConfig.current.adminToken : LootLockerConfig.current.token);
             }
 
             if (LootLockerConfig.current != null)
                 headers.Add(LootLockerConfig.current.dateVersion.key, LootLockerConfig.current.dateVersion.value);
 
             LootLockerBaseServerAPI.I.SwitchURL(callerRole);
 
-            new LootLockerServerRequest(endPoint, httpMethod, body, headers, callerRole: callerRole).Send((response) =>
-             {
-                 onComplete?.Invoke(response);
-             });
+            new LootLockerServerRequest(endPoint, httpMethod, body, headers, callerRole: callerRole).Send((response) => { onComplete?.Invoke(response); });
         }
 
         public static void CallDomainAuthAPI(string endPoint, LootLockerHTTPMethod httpMethod, string body = null, Action<LootLockerResponse> onComplete = null)
         {
             if (LootLockerConfig.current.domainKey.ToString().Length == 0)
             {
-                #if UNITY_EDITOR
+#if UNITY_EDITOR
                 LootLockerSDKManager.DebugMessage("LootLocker domain key must be set in settings", true);
-                #endif
+#endif
                 onComplete?.Invoke(LootLockerResponseFactory.Error<LootLockerResponse>("LootLocker domain key must be set in settings"));
 
                 return;
@@ -165,13 +199,11 @@ public static void CallDomainAuthAPI(string endPoint, LootLockerHTTPMethod httpM
 
             LootLockerBaseServerAPI.I.SwitchURL(LootLockerCallerRole.Base);
 
-            new LootLockerServerRequest(endPoint, httpMethod, body, headers, callerRole: LootLockerCallerRole.Base).Send((response) =>
-            {
-                onComplete?.Invoke(response);
-            });
+            new LootLockerServerRequest(endPoint, httpMethod, body, headers, callerRole: LootLockerCallerRole.Base).Send((response) => { onComplete?.Invoke(response); });
         }
 
-        public static void UploadFile(string endPoint, LootLockerHTTPMethod httpMethod, byte[] file, string fileName = "file", string fileContentType = "text/plain", Dictionary<string, string> body = null, Action<LootLockerResponse> onComplete = null, bool useAuthToken = true, LootLocker.LootLockerEnums.LootLockerCallerRole callerRole = LootLocker.LootLockerEnums.LootLockerCallerRole.User)
+        public static void UploadFile(string endPoint, LootLockerHTTPMethod httpMethod, byte[] file, string fileName = "file", string fileContentType = "text/plain", Dictionary<string, string> body = null, Action<LootLockerResponse> onComplete = null,
+            bool useAuthToken = true, LootLocker.LootLockerEnums.LootLockerCallerRole callerRole = LootLocker.LootLockerEnums.LootLockerCallerRole.User)
         {
             Dictionary<string, string> headers = new Dictionary<string, string>();
 
@@ -180,20 +212,19 @@ public static void UploadFile(string endPoint, LootLockerHTTPMethod httpMethod,
                 headers = new Dictionary<string, string>();
 
                 headers.Add(callerRole == LootLockerCallerRole.Admin ? "x-auth-token" : "x-session-token", LootLockerConfig.current.token);
-
             }
 
             LootLockerBaseServerAPI.I.SwitchURL(callerRole);
 
-            new LootLockerServerRequest(endPoint, httpMethod, file, fileName, fileContentType, body, headers, callerRole: callerRole).Send((response) =>
-               {
-                   onComplete?.Invoke(response);
-               });
+            new LootLockerServerRequest(endPoint, httpMethod, file, fileName, fileContentType, body, headers, callerRole: callerRole).Send((response) => { onComplete?.Invoke(response); });
         }
+
         #endregion
 
         #region ServerRequest constructor
-        public LootLockerServerRequest(string endpoint, LootLockerHTTPMethod httpMethod = LootLockerHTTPMethod.GET, byte[] upload = null, string uploadName = null, string uploadType = null, Dictionary<string, string> body = null, Dictionary<string, string> extraHeaders = null, bool useAuthToken = true, LootLocker.LootLockerEnums.LootLockerCallerRole callerRole = LootLocker.LootLockerEnums.LootLockerCallerRole.User, bool isFileUpload = true)
+
+        public LootLockerServerRequest(string endpoint, LootLockerHTTPMethod httpMethod = LootLockerHTTPMethod.GET, byte[] upload = null, string uploadName = null, string uploadType = null, Dictionary<string, string> body = null,
+            Dictionary<string, string> extraHeaders = null, bool useAuthToken = true, LootLocker.LootLockerEnums.LootLockerCallerRole callerRole = LootLocker.LootLockerEnums.LootLockerCallerRole.User, bool isFileUpload = true)
         {
             this.retryCount = 0;
             this.endpoint = endpoint;
@@ -223,7 +254,8 @@ public LootLockerServerRequest(string endpoint, LootLockerHTTPMethod httpMethod
             }
         }
 
-        public LootLockerServerRequest(string endpoint, LootLockerHTTPMethod httpMethod = LootLockerHTTPMethod.GET, Dictionary<string, object> payload = null, Dictionary<string, string> extraHeaders = null, Dictionary<string, string> queryParams = null, bool useAuthToken = true, LootLocker.LootLockerEnums.LootLockerCallerRole callerRole = LootLocker.LootLockerEnums.LootLockerCallerRole.User)
+        public LootLockerServerRequest(string endpoint, LootLockerHTTPMethod httpMethod = LootLockerHTTPMethod.GET, Dictionary<string, object> payload = null, Dictionary<string, string> extraHeaders = null, Dictionary<string, string> queryParams = null,
+            bool useAuthToken = true, LootLocker.LootLockerEnums.LootLockerCallerRole callerRole = LootLocker.LootLockerEnums.LootLockerCallerRole.User)
         {
             this.retryCount = 0;
             this.endpoint = endpoint;
@@ -243,7 +275,9 @@ public LootLockerServerRequest(string endpoint, LootLockerHTTPMethod httpMethod
                 LootLockerSDKManager.DebugMessage("WARNING: Payloads should not be sent in GET, HEAD, OPTIONS, requests. Attempted to send a payload to: " + this.httpMethod.ToString() + " " + this.endpoint);
             }
         }
-        public LootLockerServerRequest(string endpoint, LootLockerHTTPMethod httpMethod = LootLockerHTTPMethod.GET, string payload = null, Dictionary<string, string> extraHeaders = null, Dictionary<string, string> queryParams = null, bool useAuthToken = true, LootLocker.LootLockerEnums.LootLockerCallerRole callerRole = LootLocker.LootLockerEnums.LootLockerCallerRole.User)
+
+        public LootLockerServerRequest(string endpoint, LootLockerHTTPMethod httpMethod = LootLockerHTTPMethod.GET, string payload = null, Dictionary<string, string> extraHeaders = null, Dictionary<string, string> queryParams = null, bool useAuthToken = true,
+            LootLocker.LootLockerEnums.LootLockerCallerRole callerRole = LootLocker.LootLockerEnums.LootLockerCallerRole.User)
         {
             this.retryCount = 0;
             this.endpoint = endpoint;
@@ -263,17 +297,15 @@ public LootLockerServerRequest(string endpoint, LootLockerHTTPMethod httpMethod
                 LootLockerSDKManager.DebugMessage("WARNING: Payloads should not be sent in GET, HEAD, OPTIONS, requests. Attempted to send a payload to: " + this.httpMethod.ToString() + " " + this.endpoint);
             }
         }
+
         #endregion
 
         /// <summary>
         /// just debug and call ServerAPI.SendRequest which takes the current ServerRequest and pass this response
         /// </summary>
         public void Send(System.Action<LootLockerResponse> OnServerResponse)
         {
-            LootLockerBaseServerAPI.I.SendRequest(this, (response) =>
-            {
-                OnServerResponse?.Invoke(response);
-            });
+            LootLockerBaseServerAPI.I.SendRequest(this, (response) => { OnServerResponse?.Invoke(response); });
         }
     }
-}
+}