(GH-220) Improve how we check for errors in Zoom API responses to ac…

…count for the fact that error JSON from Contact Center is slightly different
Jericho · Oct 26, 2024 · 7cc82ea · 7cc82ea
1 parent 427af4a
commit 7cc82ea
Showing 1 changed file with 27 additions and 6 deletions.
diff --git a/Source/ZoomNet/Extensions/Internal.cs b/Source/ZoomNet/Extensions/Internal.cs
@@ -733,6 +733,14 @@ internal static DiagnosticInfo GetDiagnosticInfo(this IResponse response)
 						}
 					]
 				}
+
+				There are some cases where error information is returned in a JSON string structured slightly differently.
+				For instance, ContactCenter endpoints return error information like this:
+				{
+					"status":false,
+					"errorCode":"401", <-- Notice this node contains a string
+					"errorMessage":"Contact Center has not been enabled for this account."
+				}
 			*/
 
 			try
@@ -744,12 +752,25 @@ internal static DiagnosticInfo GetDiagnosticInfo(this IResponse response)
 					errorMessage = jsonResponse.TryGetProperty("message", out JsonElement jsonErrorMessage) ? jsonErrorMessage.GetString() : errorCode.HasValue ? $"Error code: {errorCode}" : errorMessage;
 					if (jsonResponse.TryGetProperty("errors", out JsonElement jsonErrorDetails))
 					{
-						var errorDetails = string.Join(
-							" ",
-							jsonErrorDetails
-								.EnumerateArray()
-								.Select(jsonErrorDetail => jsonErrorDetail.TryGetProperty("message", out JsonElement jsonErrorMessage) ? jsonErrorMessage.GetString() : string.Empty)
-								.Where(message => !string.IsNullOrEmpty(message)));
+						if (rootJsonElement.TryGetProperty("code", out JsonElement codeJsonProperty)) errorCode = codeJsonProperty.GetInt32();
+						else if (rootJsonElement.TryGetProperty("errorCode", out JsonElement errorCodeJsonProperty)) errorCode = int.Parse(errorCodeJsonProperty.GetString());
+
+						if (rootJsonElement.TryGetProperty("message", out JsonElement messageJsonProperty)) errorMessage = messageJsonProperty.GetString();
+						else if (rootJsonElement.TryGetProperty("errorMessage", out JsonElement errorMessageJsonProperty)) errorMessage = errorMessageJsonProperty.GetString();
+						else if (errorCode.HasValue) errorMessage = $"Error code: {errorCode}";
+
+						if (rootJsonElement.TryGetProperty("errors", out JsonElement jsonErrorDetails))
+						{
+							var errorDetails = string.Join(
+								" ",
+								jsonErrorDetails
+									.EnumerateArray()
+									.Select(jsonErrorDetail =>
+									{
+										var errorDetail = jsonErrorDetail.TryGetProperty("message", out JsonElement jsonErrorMessage) ? jsonErrorMessage.GetString() : string.Empty;
+										return errorDetail;
+									})
+									.Where(message => !string.IsNullOrEmpty(message)));
 
 						if (!string.IsNullOrEmpty(errorDetails)) errorMessage += $" {errorDetails}";
 					}