InvalidMessageException -> InvalidWebsocketMessageException

fsprojects · Mar 17, 2024 · 0cfd55c · 0cfd55c
1 parent 38fed3c
commit 0cfd55c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/FSharp.Data.GraphQL.Server.AspNetCore/Exceptions.fs b/src/FSharp.Data.GraphQL.Server.AspNetCore/Exceptions.fs
@@ -1,4 +1,4 @@
 namespace FSharp.Data.GraphQL.Server.AspNetCore
 
-type InvalidMessageException (explanation : string) =
+type InvalidWebsocketMessageException (explanation : string) =
     inherit System.Exception (explanation)
diff --git a/src/FSharp.Data.GraphQL.Server.AspNetCore/GraphQLWebsocketMiddleware.fs b/src/FSharp.Data.GraphQL.Server.AspNetCore/GraphQLWebsocketMiddleware.fs
@@ -48,7 +48,7 @@ type GraphQLWebSocketMiddleware<'Root>
         try
             return JsonSerializer.Deserialize<ClientMessage> (msg, serializerOptions)
         with
-        | :? InvalidMessageException as e -> return! Result.Error <| InvalidMessage (4400, e.Message.ToString ())
+        | :? InvalidWebsocketMessageException as e -> return! Result.Error <| InvalidMessage (4400, e.Message.ToString ())
         | :? JsonException as e ->
             if logger.IsEnabled (LogLevel.Debug) then
                 logger.LogDebug (e.ToString ())

diff --git a/src/FSharp.Data.GraphQL.Server.AspNetCore/Serialization/JsonConverters.fs b/src/FSharp.Data.GraphQL.Server.AspNetCore/Serialization/JsonConverters.fs
@@ -11,7 +11,7 @@ open FSharp.Data.GraphQL.Server.AspNetCore.WebSockets
 type ClientMessageConverter () =
     inherit JsonConverter<ClientMessage> ()
 
-    let raiseInvalidMsg explanation = raise <| InvalidMessageException explanation
+    let raiseInvalidMsg explanation = raise <| InvalidWebsocketMessageException explanation
 
     /// From the spec: "Receiving a message of a type or format which is not specified in this document will result in an immediate socket closure with the event 4400: &lt;error-message&gt;.
     /// The &lt;error-message&gt; can be vaguely descriptive on why the received message is invalid."

diff --git a/tests/FSharp.Data.GraphQL.Tests/AspNetCore/InvalidMessageTests.fs b/tests/FSharp.Data.GraphQL.Tests/AspNetCore/InvalidMessageTests.fs
@@ -15,7 +15,7 @@ let willResultInInvalidMessage expectedExplanation input =
         Assert.Fail (sprintf "should have failed, but succeeded with result: '%A'" result)
     with
     | :? JsonException as ex -> Assert.Equal (expectedExplanation, ex.Message)
-    | :? InvalidMessageException as ex -> Assert.Equal (expectedExplanation, ex.Message)
+    | :? InvalidWebsocketMessageException as ex -> Assert.Equal (expectedExplanation, ex.Message)
 
 let willResultInJsonException input =
     try