Skip to content

Commit

Permalink
Send UserEvent Message if userID exists (#1154)
Browse files Browse the repository at this point in the history
  • Loading branch information
hackerwins authored Feb 17, 2025
1 parent f1c5710 commit 7b82747
Showing 1 changed file with 13 additions and 16 deletions.
29 changes: 13 additions & 16 deletions server/rpc/yorkie_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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{
Expand Down

0 comments on commit 7b82747

Please sign in to comment.