From d27a07f3e82db6442915c77eef9783cf4f8d0ca0 Mon Sep 17 00:00:00 2001
From: Jona Walpert <jona.walpert@stud.unibas.ch>
Date: Wed, 15 Apr 2026 21:05:40 +0200
Subject: [PATCH] Fix: Canonicalized outgoing chat sender name from
 authenticated session user

---
 .../app/commands/send_message/SendMessageHandler.java       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageHandler.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageHandler.java
index a2bd3ad..680819a 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageHandler.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/app/commands/send_message/SendMessageHandler.java
@@ -9,6 +9,7 @@ import ch.unibas.dmi.dbis.cs108.casono.server.domain.user.UserRegistry;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.command.execution.CommandHandler;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.OkResponse;
 import ch.unibas.dmi.dbis.cs108.casono.server.network.protocol.response.dispatcher.ResponseDispatcher;
+import java.util.Optional;
 
 public class SendMessageHandler extends CommandHandler<SendMessageRequest> {
     private final UserRegistry userRegistry;
@@ -39,6 +40,11 @@ public class SendMessageHandler extends CommandHandler<SendMessageRequest> {
     @Override
     public void execute(SendMessageRequest request) {
         Message message = request.getMessage();
+        Optional<ch.unibas.dmi.dbis.cs108.casono.server.domain.user.User> senderUser =
+                userRegistry.getBySessionId(request.getSessionId());
+        if (senderUser.isPresent()) {
+            message.sender = senderUser.get().getName();
+        }
         broadcast(request, message);
         OkResponse response = new OkResponse(request.getContext());
         responseDispatcher.dispatch(response);