From 7b8274789c4ae7b98dcd01c5fccbda9908b37055 Mon Sep 17 00:00:00 2001
From: Youngteac Hong <susukang98@gmail.com>
Date: Mon, 17 Feb 2025 09:43:33 +0900
Subject: [PATCH] Send UserEvent Message if userID exists (#1154)

---
 server/rpc/yorkie_server.go | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/server/rpc/yorkie_server.go b/server/rpc/yorkie_server.go
index a1ec6e5cb..d49388161 100644
--- a/server/rpc/yorkie_server.go
+++ b/server/rpc/yorkie_server.go
@@ -64,11 +64,6 @@ func (s *yorkieServer) ActivateClient(
 		return nil, clients.ErrInvalidClientKey
 	}
 
-	userID, exist := req.Msg.Metadata["userID"]
-	if !exist {
-		userID = req.Msg.ClientKey
-	}
-
 	if err := auth.VerifyAccess(ctx, s.backend, &types.AccessInfo{
 		Method: types.ActivateClient,
 	}); err != nil {
@@ -81,17 +76,19 @@ func (s *yorkieServer) ActivateClient(
 		return nil, err
 	}
 
-	if err := s.backend.MsgBroker.Produce(
-		ctx,
-		messagebroker.UserEventMessage{
-			UserID:    userID,
-			Timestamp: gotime.Now(),
-			EventType: events.ClientActivatedEvent,
-			ProjectID: project.ID.String(),
-			UserAgent: req.Header().Get("x-yorkie-user-agent"),
-		},
-	); err != nil {
-		logging.From(ctx).Error(err)
+	if userID, exist := req.Msg.Metadata["userID"]; exist {
+		if err := s.backend.MsgBroker.Produce(
+			ctx,
+			messagebroker.UserEventMessage{
+				UserID:    userID,
+				Timestamp: gotime.Now(),
+				EventType: events.ClientActivatedEvent,
+				ProjectID: project.ID.String(),
+				UserAgent: req.Header().Get("x-yorkie-user-agent"),
+			},
+		); err != nil {
+			logging.From(ctx).Error(err)
+		}
 	}
 
 	return connect.NewResponse(&api.ActivateClientResponse{