Added tests for mixed query or form parameters

Author: DanielVanNoord

ASCOM.Alpaca.Simulators/Controllers/BaseController.cs

@@ -37,12 +37,29 @@ internal bool BadRequestAlpacaProtocol(out BadRequestObjectResult Result)
                     Logging.Log.LogError($"Error on request {HttpContext.Request.Path} with details: {Result.Value?.ToString()}");
                     return true;
                 }
+
+
+                if (HttpContext.Request.Query.Any())
+                {
+                    var keys = HttpContext.Request.Query.Keys;
+                    Result = BadRequest(Strings.FormWithQueryDescription + string.Join(", ", keys));
+                    Logging.Log.LogError($"Error on request {HttpContext.Request.Path} with details: {Result.Value?.ToString()}");
+                    return true;
+                }
             }
 
             if (HttpContext.Request.Query.Keys.Any(key => !ValidAlpacaKeys.ValidParameterKeys.Contains(key)))
             {
                 var keys = HttpContext.Request.Query.Keys.Where(key => !ValidAlpacaKeys.ValidParameterKeys.Contains(key));
-                Result = BadRequest(Strings.QueryCapitalizationDescription + string.Join(", ", keys));
+                Result = BadRequest(Strings.FormCapitalizationDescription + string.Join(", ", keys));
+                Logging.Log.LogError($"Error on request {HttpContext.Request.Path} with details: {Result.Value?.ToString()}");
+                return true;
+            }
+
+            if (HttpContext.Request.Method == "GET" && HttpContext.Request.HasFormContentType && HttpContext.Request.Form.Keys.Any())
+            {
+                var keys = HttpContext.Request.Form.Keys;
+                Result = BadRequest(Strings.QueryWithFormDescription + string.Join(", ", keys));
                 Logging.Log.LogError($"Error on request {HttpContext.Request.Path} with details: {Result.Value?.ToString()}");
                 return true;
             }

ASCOM.Alpaca.Simulators/Documentation/Strings.cs

@@ -10,5 +10,7 @@ public class Strings
         public const string URLCapitalizationDescription = @"The API URL is required to be lowercase. Supplied URL: ";
         public const string FormCapitalizationDescription = @"The API Form is required to match the Alpaca Specification. Unknown Form Key(s): ";
         public const string QueryCapitalizationDescription = @"The API Query is required to match the Alpaca Specification. Unknown Query Key(s): ";
+        public const string FormWithQueryDescription = @"A Form request should not have any Query Keys. Unknown Query Key(s): ";
+        public const string QueryWithFormDescription = @"A Query request should not have any Form Keys. Unknown Form Key(s): ";
     }
 }