fix: Handle null keys in Query Parameter Building

kirre-bylund · kirre-bylund · commit 6644502496a3 · 2025-10-31T11:18:47.000+01:00
diff --git a/Runtime/Client/EndPointClass.cs b/Runtime/Client/EndPointClass.cs
@@ -28,47 +28,47 @@ public EndPointClass(string endPoint, LootLockerHTTPMethod httpMethod, LootLocke
         public string WithPathParameter(object arg0)
         {
             try {
-                return string.Format(endPoint, WebUtility.UrlEncode(arg0.ToString()));
+                return string.Format(endPoint, WebUtility.UrlEncode(arg0?.ToString() ?? "null"));
             }
             catch (FormatException e)
             {
-                LootLockerLogger.Log($"Error formatting endpoint \"{endPoint}\" with path parameter \"{WebUtility.UrlEncode(arg0.ToString())}\": {e}", LootLockerLogger.LogLevel.Error);
+                LootLockerLogger.Log($"Error formatting endpoint \"{endPoint}\" with path parameter \"{WebUtility.UrlEncode(arg0?.ToString() ?? "null")}\": {e}", LootLockerLogger.LogLevel.Error);
                 return endPoint;
             }
         }
 
         public string WithPathParameters(object arg0, object arg1)
         {
             try {
-                return string.Format(endPoint, WebUtility.UrlEncode(arg0.ToString()), WebUtility.UrlEncode(arg1.ToString()));
+                return string.Format(endPoint, WebUtility.UrlEncode(arg0?.ToString() ?? "null"), WebUtility.UrlEncode(arg1?.ToString() ?? "null"));
             }
             catch (FormatException e)
             {
-                LootLockerLogger.Log($"Error formatting endpoint \"{endPoint}\" with path parameters \"{WebUtility.UrlEncode(arg0.ToString())}\", \"{WebUtility.UrlEncode(arg1.ToString())}\": {e}", LootLockerLogger.LogLevel.Error);
+                LootLockerLogger.Log($"Error formatting endpoint \"{endPoint}\" with path parameters \"{WebUtility.UrlEncode(arg0?.ToString() ?? "null")}\", \"{WebUtility.UrlEncode(arg1?.ToString() ?? "null")}\": {e}", LootLockerLogger.LogLevel.Error);
                 return endPoint;
             }
         }
 
         public string WithPathParameters(object arg0, object arg1, object arg2)
         {
             try {
-                return string.Format(endPoint, WebUtility.UrlEncode(arg0.ToString()), WebUtility.UrlEncode(arg1.ToString()), WebUtility.UrlEncode(arg2.ToString()));
+                return string.Format(endPoint, WebUtility.UrlEncode(arg0?.ToString() ?? "null"), WebUtility.UrlEncode(arg1?.ToString() ?? "null"), WebUtility.UrlEncode(arg2?.ToString() ?? "null"));
             }
             catch (FormatException e)
             {
-                LootLockerLogger.Log($"Error formatting endpoint \"{endPoint}\" with path parameters \"{WebUtility.UrlEncode(arg0.ToString())}\", \"{WebUtility.UrlEncode(arg1.ToString())}\", \"{WebUtility.UrlEncode(arg2.ToString())}\": {e}", LootLockerLogger.LogLevel.Error);
+                LootLockerLogger.Log($"Error formatting endpoint \"{endPoint}\" with path parameters \"{WebUtility.UrlEncode(arg0?.ToString() ?? "null")}\", \"{WebUtility.UrlEncode(arg1?.ToString() ?? "null")}\", \"{WebUtility.UrlEncode(arg2?.ToString() ?? "null")}\": {e}", LootLockerLogger.LogLevel.Error);
                 return endPoint;
             }
         }
 
         public string WithPathParameters(object arg0, object arg1, object arg2, object arg3)
         {
             try {
-                return string.Format(endPoint, WebUtility.UrlEncode(arg0.ToString()), WebUtility.UrlEncode(arg1.ToString()), WebUtility.UrlEncode(arg2.ToString()), WebUtility.UrlEncode(arg3.ToString()));
+                return string.Format(endPoint, WebUtility.UrlEncode(arg0?.ToString() ?? "null"), WebUtility.UrlEncode(arg1?.ToString() ?? "null"), WebUtility.UrlEncode(arg2?.ToString() ?? "null"), WebUtility.UrlEncode(arg3?.ToString() ?? "null"));
             }
             catch (FormatException e)
             {
-                LootLockerLogger.Log($"Error formatting endpoint \"{endPoint}\" with path parameters \"{WebUtility.UrlEncode(arg0.ToString())}\", \"{WebUtility.UrlEncode(arg1.ToString())}\", \"{WebUtility.UrlEncode(arg2.ToString())}\", \"{WebUtility.UrlEncode(arg3.ToString())}\": {e}", LootLockerLogger.LogLevel.Error);
+                LootLockerLogger.Log($"Error formatting endpoint \"{endPoint}\" with path parameters \"{WebUtility.UrlEncode(arg0?.ToString() ?? "null")}\", \"{WebUtility.UrlEncode(arg1?.ToString() ?? "null")}\", \"{WebUtility.UrlEncode(arg2?.ToString() ?? "null")}\", \"{WebUtility.UrlEncode(arg3?.ToString() ?? "null")}\": {e}", LootLockerLogger.LogLevel.Error);
                 return endPoint;
             }
         }
diff --git a/Runtime/Client/LootLockerHTTPClient.cs b/Runtime/Client/LootLockerHTTPClient.cs
@@ -566,7 +566,8 @@ private void CallListenersAndMarkDone(LootLockerHTTPExecutionQueueItem execution
             executionItem.Done = true;
             response.requestContext = new LootLockerRequestContext(executionItem.RequestData.ForPlayerWithUlid, executionItem.RequestData.RequestStartTime);
             executionItem.Response = response;
-            if(!CompletedRequestIDs.Contains(executionItem.RequestData.RequestId)) {
+            if (!CompletedRequestIDs.Contains(executionItem.RequestData.RequestId)) 
+            {
                 CompletedRequestIDs.Add(executionItem.RequestData.RequestId);
             }
             executionItem.RequestData.CallListenersWithResult(response);
diff --git a/Runtime/Game/Utilities/LootLockerHttpUtilities.cs b/Runtime/Game/Utilities/LootLockerHttpUtilities.cs
@@ -59,7 +59,7 @@ public string Build()
 
             foreach (KeyValuePair<string, string> pair in _queryParams)
             {
-                if (string.IsNullOrEmpty(pair.Value))
+                if (string.IsNullOrEmpty(pair.Key) || string.IsNullOrEmpty(pair.Value))
                     continue;
 
                 if (query.Length > 1)

Original file line number	Diff line number	Diff line change
`@@ -28,47 +28,47 @@ public EndPointClass(string endPoint, LootLockerHTTPMethod httpMethod, LootLocke`
`28`	`28`	`public string WithPathParameter(object arg0)`
`29`	`29`	`{`
`30`	`30`	`try {`
`31`		`- return string.Format(endPoint, WebUtility.UrlEncode(arg0.ToString()));`
	`31`	`+ return string.Format(endPoint, WebUtility.UrlEncode(arg0?.ToString() ?? "null"));`
`32`	`32`	`}`
`33`	`33`	`catch (FormatException e)`
`34`	`34`	`{`
`35`		`- LootLockerLogger.Log($"Error formatting endpoint \"{endPoint}\" with path parameter \"{WebUtility.UrlEncode(arg0.ToString())}\": {e}", LootLockerLogger.LogLevel.Error);`
	`35`	`+ LootLockerLogger.Log($"Error formatting endpoint \"{endPoint}\" with path parameter \"{WebUtility.UrlEncode(arg0?.ToString() ?? "null")}\": {e}", LootLockerLogger.LogLevel.Error);`
`36`	`36`	`return endPoint;`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public string WithPathParameters(object arg0, object arg1)`
`41`	`41`	`{`
`42`	`42`	`try {`
`43`		`- return string.Format(endPoint, WebUtility.UrlEncode(arg0.ToString()), WebUtility.UrlEncode(arg1.ToString()));`
	`43`	`+ return string.Format(endPoint, WebUtility.UrlEncode(arg0?.ToString() ?? "null"), WebUtility.UrlEncode(arg1?.ToString() ?? "null"));`
`44`	`44`	`}`
`45`	`45`	`catch (FormatException e)`
`46`	`46`	`{`
`47`		`- LootLockerLogger.Log($"Error formatting endpoint \"{endPoint}\" with path parameters \"{WebUtility.UrlEncode(arg0.ToString())}\", \"{WebUtility.UrlEncode(arg1.ToString())}\": {e}", LootLockerLogger.LogLevel.Error);`
	`47`	`+ LootLockerLogger.Log($"Error formatting endpoint \"{endPoint}\" with path parameters \"{WebUtility.UrlEncode(arg0?.ToString() ?? "null")}\", \"{WebUtility.UrlEncode(arg1?.ToString() ?? "null")}\": {e}", LootLockerLogger.LogLevel.Error);`
`48`	`48`	`return endPoint;`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`public string WithPathParameters(object arg0, object arg1, object arg2)`
`53`	`53`	`{`
`54`	`54`	`try {`
`55`		`- return string.Format(endPoint, WebUtility.UrlEncode(arg0.ToString()), WebUtility.UrlEncode(arg1.ToString()), WebUtility.UrlEncode(arg2.ToString()));`
	`55`	`+ return string.Format(endPoint, WebUtility.UrlEncode(arg0?.ToString() ?? "null"), WebUtility.UrlEncode(arg1?.ToString() ?? "null"), WebUtility.UrlEncode(arg2?.ToString() ?? "null"));`
`56`	`56`	`}`
`57`	`57`	`catch (FormatException e)`
`58`	`58`	`{`
`59`		`- LootLockerLogger.Log($"Error formatting endpoint \"{endPoint}\" with path parameters \"{WebUtility.UrlEncode(arg0.ToString())}\", \"{WebUtility.UrlEncode(arg1.ToString())}\", \"{WebUtility.UrlEncode(arg2.ToString())}\": {e}", LootLockerLogger.LogLevel.Error);`
	`59`	`+ LootLockerLogger.Log($"Error formatting endpoint \"{endPoint}\" with path parameters \"{WebUtility.UrlEncode(arg0?.ToString() ?? "null")}\", \"{WebUtility.UrlEncode(arg1?.ToString() ?? "null")}\", \"{WebUtility.UrlEncode(arg2?.ToString() ?? "null")}\": {e}", LootLockerLogger.LogLevel.Error);`
`60`	`60`	`return endPoint;`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`public string WithPathParameters(object arg0, object arg1, object arg2, object arg3)`
`65`	`65`	`{`
`66`	`66`	`try {`
`67`		`- return string.Format(endPoint, WebUtility.UrlEncode(arg0.ToString()), WebUtility.UrlEncode(arg1.ToString()), WebUtility.UrlEncode(arg2.ToString()), WebUtility.UrlEncode(arg3.ToString()));`
	`67`	`+ return string.Format(endPoint, WebUtility.UrlEncode(arg0?.ToString() ?? "null"), WebUtility.UrlEncode(arg1?.ToString() ?? "null"), WebUtility.UrlEncode(arg2?.ToString() ?? "null"), WebUtility.UrlEncode(arg3?.ToString() ?? "null"));`
`68`	`68`	`}`
`69`	`69`	`catch (FormatException e)`
`70`	`70`	`{`
`71`		`- LootLockerLogger.Log($"Error formatting endpoint \"{endPoint}\" with path parameters \"{WebUtility.UrlEncode(arg0.ToString())}\", \"{WebUtility.UrlEncode(arg1.ToString())}\", \"{WebUtility.UrlEncode(arg2.ToString())}\", \"{WebUtility.UrlEncode(arg3.ToString())}\": {e}", LootLockerLogger.LogLevel.Error);`
	`71`	`+ LootLockerLogger.Log($"Error formatting endpoint \"{endPoint}\" with path parameters \"{WebUtility.UrlEncode(arg0?.ToString() ?? "null")}\", \"{WebUtility.UrlEncode(arg1?.ToString() ?? "null")}\", \"{WebUtility.UrlEncode(arg2?.ToString() ?? "null")}\", \"{WebUtility.UrlEncode(arg3?.ToString() ?? "null")}\": {e}", LootLockerLogger.LogLevel.Error);`
`72`	`72`	`return endPoint;`
`73`	`73`	`}`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public string Build()`
`59`	`59`
`60`	`60`	`foreach (KeyValuePair<string, string> pair in _queryParams)`
`61`	`61`	`{`
`62`		`- if (string.IsNullOrEmpty(pair.Value))`
	`62`	`+ if (string.IsNullOrEmpty(pair.Key) \|\| string.IsNullOrEmpty(pair.Value))`
`63`	`63`	`continue;`
`64`	`64`
`65`	`65`	`if (query.Length > 1)`