Fixes from turborilla

lootlocker · Jun 19, 2024 · 5a7c534 · 5a7c534
1 parent 7bc202c
commit 5a7c534
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/Runtime/Client/LootLockerServerApi.cs b/Runtime/Client/LootLockerServerApi.cs
@@ -131,8 +131,18 @@ IEnumerator coroutine()
                         text = webRequest.downloadHandler.text
                     };
 
-                    response.errorData = LootLockerJson.DeserializeObject<LootLockerErrorData>(webRequest.downloadHandler.text);
-
+                    try 
+                    {
+                        response.errorData = LootLockerJson.DeserializeObject<LootLockerErrorData>(webRequest.downloadHandler.text);
+                    }
+                    catch (Exception)
+                    {
+                        if (webRequest.downloadHandler.text.StartsWith("<"))
+                        {
+                            LootLockerLogger.GetForLogLevel(LootLockerLogger.LogLevel.Warning)("JSON Starts with <, info: \n    statusCode: " + response.statusCode + "\n    body: " + response.text);
+                        }
+                        response.errorData = null;
+                    }
                     // Error data was not parseable, populate with what we know
                     if (response.errorData == null)
                     {
@@ -332,7 +342,7 @@ private void RefreshTokenAndCompleteCall(LootLockerServerRequest cachedRequest,
         private static bool ShouldRefreshUsingRefreshToken(LootLockerServerRequest cachedRequest)
         {
             // The failed request isn't a refresh session request but we have a refresh token stored, so try to refresh the session automatically before failing
-            return !cachedRequest.jsonPayload.Contains("refresh_token") && !string.IsNullOrEmpty(LootLockerConfig.current.refreshToken);
+            return (string.IsNullOrEmpty(cachedRequest.jsonPayload) || !cachedRequest.jsonPayload.Contains("refresh_token")) && !string.IsNullOrEmpty(LootLockerConfig.current.refreshToken);
         }
 
         private void CompleteCall(LootLockerServerRequest cachedRequest, LootLockerSessionResponse sessionRefreshResponse, Action<LootLockerResponse> onComplete)
@@ -480,4 +490,3 @@ private string GetQueryStringFromDictionary(Dictionary<string, string> queryDict
 #endregion
     }
 }
-
diff --git a/Runtime/Client/LootLockerServerRequest.cs b/Runtime/Client/LootLockerServerRequest.cs
@@ -239,6 +239,16 @@ public class LootLockerResponse
                 return new T() { success = false, errorData = serverResponse.errorData, statusCode = serverResponse.statusCode, text = serverResponse.text };
             }
 
+            /*
+             * Turborilla:
+             * Patched based on conversation with LootLocker. I suspect that some users are getting login pages for wifi or something else instead of the intended response from LootLocker servers.
+             * We have similar checks in our other projects.
+             */
+            if (serverResponse.text.StartsWith("<"))
+            {
+                LootLockerLogger.GetForLogLevel()("JSON Starts with <, info: \n    statusCode: " + serverResponse.statusCode + "\n    body: " + serverResponse.text);
+                return new T() { success = false, errorData = serverResponse.errorData, statusCode = serverResponse.statusCode };
+            }
             var response = LootLockerJson.DeserializeObject<T>(serverResponse.text, options ?? LootLockerJsonSettings.Default) ?? new T();
 
             response.text = serverResponse.text;
@@ -708,4 +718,4 @@ public void Send(System.Action<LootLockerResponse> OnServerResponse)
             LootLockerServerApi.SendRequest(this, (response) => { OnServerResponse?.Invoke(response); });
         }
     }
-}
+}
diff --git a/Runtime/Game/LootLockerObfuscator.cs b/Runtime/Game/LootLockerObfuscator.cs
@@ -179,4 +179,4 @@ public static string ObfuscateJsonStringForLogging(string json)
 #endif //LOOTLOCKER_USE_NEWTONSOFTJSON
         }
     }
-}
+}