Merge branch 'master' into discard_after_close

graphql-dotnet · Oct 20, 2024 · d470353 · d470353
2 parents 6f7d462 + 2d2ab4c
commit d470353
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/Transports.AspNetCore/WebSockets/GraphQLWs/SubscriptionServer.cs b/src/Transports.AspNetCore/WebSockets/GraphQLWs/SubscriptionServer.cs
@@ -123,7 +123,9 @@ public override async Task OnMessageReceivedAsync(OperationMessage message)
     /// Executes when a ping message is received.
     /// </summary>
     protected virtual Task OnPingAsync(OperationMessage message)
-        => Connection.SendMessageAsync(_pongMessage);
+        => message.Payload == null
+        ? Connection.SendMessageAsync(_pongMessage)
+        : Connection.SendMessageAsync(new OperationMessage { Type = MessageType.Pong, Payload = message.Payload });
 
     /// <summary>
     /// Executes when a pong message is received.