IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-17 15:29:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun

Browse Source
This commit is contained in:
wangchuxiao
2022-03-16 18:02:33 +08:00
parent b0aa168c9a 367888968b
commit 17fad47ca1
4 changed files with 271 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/msg_gateway/gate/open_im_media/room.go
+3 -2
View File
@@ -2,6 +2,7 @@ package open_im_media
import (
pbRtc "Open_IM/pkg/proto/rtc"
open_im_sdk "Open_IM/pkg/proto/sdk_ws"
"context"
"errors"
"google.golang.org/grpc"
@@ -32,14 +33,14 @@ func (m *Media) GetUrl() string {
return m.MediaAddress
}
func (m *Media) GetJoinToken(room, identity string, operationID string) (string, error) {
func (m *Media) GetJoinToken(room, identity string, operationID string, data *open_im_sdk.ParticipantMetaData) (string, error) {
conn, err := grpc.Dial(Address, grpc.WithInsecure())
if err != nil {
return "", err
}
defer conn.Close()
c := pbRtc.NewRtcServiceClient(conn)
req := &pbRtc.GetJoinTokenReq{ApiKey: m.ApiKey, ApiSecret: m.ApiSecret, Room: room, OperationID: operationID, Identity: identity}
req := &pbRtc.GetJoinTokenReq{ApiKey: m.ApiKey, ApiSecret: m.ApiSecret, Room: room, OperationID: operationID, Identity: identity, MetaData: data}
resp, err := c.GetJoinToken(context.Background(), req)
if err != nil {
return "", err
internal/msg_gateway/gate/validate.go
+12 -12
View File
@@ -145,9 +145,9 @@ func (ws *WServer) signalMessageAssemble(s *open_im_sdk.SignalReq, operationID s
//
//}
token, err2 := media.GetJoinToken(payload.Invite.Invitation.RoomID, payload.Invite.Invitation.InviterUserID, operationID)
token, err2 := media.GetJoinToken(payload.Invite.Invitation.RoomID, payload.Invite.Invitation.InviterUserID, operationID, payload.Invite.Participant)
if err2 != nil {
return false, 201, err2.Error(), nil, nil
return false, 202, err2.Error(), nil, nil
}
invite := open_im_sdk.SignalResp_Invite{&open_im_sdk.SignalInviteReply{
Token: token,
@@ -162,7 +162,7 @@ func (ws *WServer) signalMessageAssemble(s *open_im_sdk.SignalReq, operationID s
if len(payload.Invite.Invitation.InviteeUserIDList) > 0 {
msg.RecvID = payload.Invite.Invitation.InviteeUserIDList[0]
} else {
return false, 201, errors.New("InviteeUserIDList is null").Error(), nil, nil
return false, 203, errors.New("InviteeUserIDList is null").Error(), nil, nil
}
msg.ClientMsgID = utils.GetMsgID(payload.Invite.Invitation.InviterUserID)
return true, 0, "", &resp, &msg
@@ -172,9 +172,9 @@ func (ws *WServer) signalMessageAssemble(s *open_im_sdk.SignalReq, operationID s
// return false, 201, err.Error(), nil, nil
//
//}
token, err2 := media.GetJoinToken(payload.InviteInGroup.Invitation.RoomID, payload.InviteInGroup.Invitation.InviterUserID, operationID)
token, err2 := media.GetJoinToken(payload.InviteInGroup.Invitation.RoomID, payload.InviteInGroup.Invitation.InviterUserID, operationID, payload.InviteInGroup.Participant)
if err2 != nil {
return false, 201, err2.Error(), nil, nil
return false, 204, err2.Error(), nil, nil
}
inviteGroup := open_im_sdk.SignalResp_InviteInGroup{&open_im_sdk.SignalInviteInGroupReply{
RoomID: payload.InviteInGroup.Invitation.RoomID,
@@ -189,7 +189,7 @@ func (ws *WServer) signalMessageAssemble(s *open_im_sdk.SignalReq, operationID s
if len(payload.InviteInGroup.Invitation.InviteeUserIDList) > 0 {
msg.GroupID = payload.InviteInGroup.Invitation.GroupID
} else {
return false, 201, errors.New("InviteeUserIDList is null").Error(), nil, nil
return false, 205, errors.New("InviteeUserIDList is null").Error(), nil, nil
}
msg.ClientMsgID = utils.GetMsgID(payload.InviteInGroup.Invitation.InviterUserID)
@@ -209,14 +209,14 @@ func (ws *WServer) signalMessageAssemble(s *open_im_sdk.SignalReq, operationID s
msg.GroupID = payload.Cancel.Invitation.GroupID
}
} else {
return false, 201, errors.New("InviteeUserIDList is null").Error(), nil, nil
return false, 206, errors.New("InviteeUserIDList is null").Error(), nil, nil
}
msg.ClientMsgID = utils.GetMsgID(payload.Cancel.OpUserID)
return true, 0, "", &resp, &msg
case *open_im_sdk.SignalReq_Accept:
token, err2 := media.GetJoinToken(payload.Accept.Invitation.RoomID, payload.Accept.OpUserID, operationID)
token, err2 := media.GetJoinToken(payload.Accept.Invitation.RoomID, payload.Accept.OpUserID, operationID, payload.Accept.Participant)
if err2 != nil {
return false, 201, err2.Error(), nil, nil
return false, 207, err2.Error(), nil, nil
}
accept := open_im_sdk.SignalResp_Accept{&open_im_sdk.SignalAcceptReply{
Token: token,
@@ -236,7 +236,7 @@ func (ws *WServer) signalMessageAssemble(s *open_im_sdk.SignalReq, operationID s
msg.GroupID = payload.Accept.Invitation.GroupID
}
} else {
return false, 201, errors.New("InviteeUserIDList is null").Error(), nil, nil
return false, 208, errors.New("InviteeUserIDList is null").Error(), nil, nil
}
msg.ClientMsgID = utils.GetMsgID(payload.Accept.OpUserID)
return true, 0, "", &resp, &msg
@@ -256,10 +256,10 @@ func (ws *WServer) signalMessageAssemble(s *open_im_sdk.SignalReq, operationID s
msg.GroupID = payload.Reject.Invitation.GroupID
}
} else {
return false, 201, errors.New("InviteeUserIDList is null").Error(), nil, nil
return false, 209, errors.New("InviteeUserIDList is null").Error(), nil, nil
}
msg.ClientMsgID = utils.GetMsgID(payload.Reject.OpUserID)
return true, 0, "", &resp, &msg
}
return false, 201, errors.New("InviteeUserIDList is null").Error(), nil, nil
return false, 210, errors.New("InviteeUserIDList is null").Error(), nil, nil
}