yves/meowlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix invitation answer message building with inv_id
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
ycc
2024-03-31 18:22:17 +02:00
parent caab80f346
commit 54c36c68ad
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/helpers/invitationAnswerHelper.go
View File

@@ -119,7 +119,7 @@ func InvitationAnswerMessage(invitationId string, invitationServerUid string, ti
return nil, "InvitationAnswerMessage: ProcessOutboundUserMessage", err return nil, "InvitationAnswerMessage: ProcessOutboundUserMessage", err
} }
// Creating Server message for transporting the user message // Creating Server message for transporting the user message
toServerMessage, err := invitationServer.BuildToServerMessageInvitationAnswer(packedMsg, peer.MyIdentity.Public, timeout) toServerMessage, err := invitationServer.BuildToServerMessageInvitationAnswer(packedMsg, peer.MyIdentity.Public, invitationId, timeout)
if err != nil { if err != nil {
return nil, "InvitationAnswerMessage: BuildToServerMessageInvitationAnswer", err return nil, "InvitationAnswerMessage: BuildToServerMessageInvitationAnswer", err
} }

7
client/server.go
View File

@@ -167,7 +167,7 @@ func (ints *Server) BuildMessageRequestMessage(lookupKeys []string) ([]byte, err
// BuildToServerMessageInvitation creates an invitation message to server and returns it as a meowlib.ToServerMessage // BuildToServerMessageInvitation creates an invitation message to server and returns it as a meowlib.ToServerMessage
// it takes as input a contactcard generated by Identity.InvitePeer // it takes as input a contactcard generated by Identity.InvitePeer
func (ints *Server) BuildToServerMessageInvitationCreation(invitation *meowlib.ContactCard, password string, timeout int, invitationIdLen int) (*meowlib.ToServerMessage, error) { func (ints *Server) BuildToServerMessageInvitationCreation(invitation *meowlib.ContactCard, password string, timeout int, shortCodeLen int) (*meowlib.ToServerMessage, error) {
var msg meowlib.ToServerMessage var msg meowlib.ToServerMessage
var inv meowlib.Invitation var inv meowlib.Invitation
payload, err := invitation.Compress() payload, err := invitation.Compress()
@@ -179,7 +179,7 @@ func (ints *Server) BuildToServerMessageInvitationCreation(invitation *meowlib.C
inv.Step = 1 inv.Step = 1
inv.Password = password inv.Password = password
inv.Timeout = int32(timeout) inv.Timeout = int32(timeout)
inv.ShortcodeLen = int32(invitationIdLen) inv.ShortcodeLen = int32(shortCodeLen)
inv.Payload = payload inv.Payload = payload
msg.Invitation = &inv msg.Invitation = &inv
return &msg, nil return &msg, nil
@@ -200,7 +200,7 @@ func (ints *Server) BuildToServerMessageInvitationRequest(shortcode string, pass
// BuildToServerMessageInvitationAnswer creates an invitation answer to server and returns it as a meowlib.ToServerMessage // BuildToServerMessageInvitationAnswer creates an invitation answer to server and returns it as a meowlib.ToServerMessage
// it takes as input a contactcard generated by Identity.InvitePeer // it takes as input a contactcard generated by Identity.InvitePeer
func (ints *Server) BuildToServerMessageInvitationAnswer(invitationAnswer *meowlib.PackedUserMessage, myPublicKeyForThatPeer string, timeout int) (*meowlib.ToServerMessage, error) { func (ints *Server) BuildToServerMessageInvitationAnswer(invitationAnswer *meowlib.PackedUserMessage, myPublicKeyForThatPeer string, invitation_id string, timeout int) (*meowlib.ToServerMessage, error) {
var msg meowlib.ToServerMessage var msg meowlib.ToServerMessage
var inv meowlib.Invitation var inv meowlib.Invitation
invitationPayload, err := proto.Marshal(invitationAnswer) invitationPayload, err := proto.Marshal(invitationAnswer)
@@ -208,6 +208,7 @@ func (ints *Server) BuildToServerMessageInvitationAnswer(invitationAnswer *meowl
return nil, err return nil, err
} }
inv.Step = 3 inv.Step = 3
inv.Uuid = invitation_id
msg.Type = "1" msg.Type = "1"
msg.From = ints.UserKp.Public msg.From = ints.UserKp.Public
inv.From = myPublicKeyForThatPeer inv.From = myPublicKeyForThatPeer