2022-01-18 16:31:34 +00:00
|
|
|
package protocol
|
|
|
|
|
|
|
|
|
|
import (
|
|
|
|
|
"context"
|
|
|
|
|
"crypto/ecdsa"
|
|
|
|
|
"testing"
|
|
|
|
|
|
|
|
|
|
"github.com/stretchr/testify/suite"
|
|
|
|
|
"go.uber.org/zap"
|
|
|
|
|
|
|
|
|
|
gethbridge "github.com/status-im/status-go/eth-node/bridge/geth"
|
|
|
|
|
"github.com/status-im/status-go/eth-node/crypto"
|
|
|
|
|
"github.com/status-im/status-go/eth-node/types"
|
2022-06-08 16:18:56 +00:00
|
|
|
"github.com/status-im/status-go/multiaccounts/settings"
|
2022-01-18 16:31:34 +00:00
|
|
|
"github.com/status-im/status-go/protocol/common"
|
|
|
|
|
"github.com/status-im/status-go/protocol/protobuf"
|
|
|
|
|
"github.com/status-im/status-go/protocol/requests"
|
|
|
|
|
"github.com/status-im/status-go/protocol/tt"
|
|
|
|
|
"github.com/status-im/status-go/waku"
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
func TestMessengerContactRequestSuite(t *testing.T) {
|
|
|
|
|
suite.Run(t, new(MessengerContactRequestSuite))
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
type MessengerContactRequestSuite struct {
|
|
|
|
|
suite.Suite
|
|
|
|
|
m *Messenger // main instance of Messenger
|
|
|
|
|
privateKey *ecdsa.PrivateKey // private key for the main instance of Messenger
|
|
|
|
|
// If one wants to send messages between different instances of Messenger,
|
|
|
|
|
// a single waku service should be shared.
|
|
|
|
|
shh types.Waku
|
|
|
|
|
logger *zap.Logger
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (s *MessengerContactRequestSuite) SetupTest() {
|
|
|
|
|
s.logger = tt.MustCreateTestLogger()
|
|
|
|
|
|
|
|
|
|
config := waku.DefaultConfig
|
|
|
|
|
config.MinimumAcceptedPoW = 0
|
|
|
|
|
shh := waku.New(&config, s.logger)
|
|
|
|
|
s.shh = gethbridge.NewGethWakuWrapper(shh)
|
|
|
|
|
s.Require().NoError(shh.Start())
|
|
|
|
|
|
|
|
|
|
s.m = s.newMessenger(s.shh)
|
|
|
|
|
s.privateKey = s.m.identity
|
|
|
|
|
_, err := s.m.Start()
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (s *MessengerContactRequestSuite) TearDownTest() {
|
|
|
|
|
s.Require().NoError(s.m.Shutdown())
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (s *MessengerContactRequestSuite) newMessenger(shh types.Waku) *Messenger {
|
|
|
|
|
privateKey, err := crypto.GenerateKey()
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
messenger, err := newMessengerWithKey(s.shh, privateKey, s.logger, nil)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
return messenger
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (s *MessengerContactRequestSuite) TestReceiveAndAcceptContactRequest() {
|
|
|
|
|
|
|
|
|
|
messageText := "hello!"
|
|
|
|
|
|
|
|
|
|
theirMessenger := s.newMessenger(s.shh)
|
|
|
|
|
_, err := theirMessenger.Start()
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
contactID := types.EncodeHex(crypto.FromECDSAPub(&theirMessenger.identity.PublicKey))
|
|
|
|
|
request := &requests.SendContactRequest{
|
|
|
|
|
ID: types.Hex2Bytes(contactID),
|
|
|
|
|
Message: messageText,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Send contact request
|
|
|
|
|
resp, err := s.m.SendContactRequest(context.Background(), request)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
s.Require().NotNil(resp)
|
|
|
|
|
s.Require().Len(resp.Messages(), 1)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStatePending, resp.Messages()[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Make sure it's not returned as coming from us
|
|
|
|
|
contactRequests, _, err := s.m.PendingContactRequests("", 10)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
s.Require().Len(contactRequests, 0)
|
|
|
|
|
|
|
|
|
|
// Make sure contact is added on the sender side
|
|
|
|
|
contacts := s.m.AddedContacts()
|
|
|
|
|
s.Require().Len(contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateSent, contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Wait for the message to reach its destination
|
|
|
|
|
resp, err = WaitOnMessengerResponse(
|
|
|
|
|
theirMessenger,
|
|
|
|
|
func(r *MessengerResponse) bool {
|
|
|
|
|
return len(r.Contacts) > 0 && len(r.Messages()) > 0 && len(r.ActivityCenterNotifications()) > 0
|
|
|
|
|
},
|
|
|
|
|
"no messages",
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
// Check contact request has been received
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Check activity center notification is of the right type
|
|
|
|
|
s.Require().Len(resp.ActivityCenterNotifications(), 1)
|
|
|
|
|
s.Require().Equal(ActivityCenterNotificationTypeContactRequest, resp.ActivityCenterNotifications()[0].Type)
|
|
|
|
|
s.Require().NotNil(resp.ActivityCenterNotifications()[0].Message)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStatePending, resp.ActivityCenterNotifications()[0].Message.ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Check the contact state is correctly set
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateReceived, resp.Contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Make sure it's the pending contact requests
|
|
|
|
|
contactRequests, _, err = theirMessenger.PendingContactRequests("", 10)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
s.Require().Len(contactRequests, 1)
|
|
|
|
|
s.Require().Equal(contactRequests[0].ContactRequestState, common.ContactRequestStatePending)
|
|
|
|
|
|
|
|
|
|
// Accept contact request, receiver side
|
|
|
|
|
resp, err = theirMessenger.AcceptContactRequest(context.Background(), &requests.AcceptContactRequest{ID: types.Hex2Bytes(contactRequests[0].ID)})
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Make sure the message is updated
|
|
|
|
|
s.Require().NotNil(resp)
|
|
|
|
|
s.Require().Len(resp.Messages(), 1)
|
|
|
|
|
s.Require().Equal(resp.Messages()[0].ID, contactRequests[0].ID)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStateAccepted, resp.Messages()[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
s.Require().Len(resp.ActivityCenterNotifications(), 1)
|
|
|
|
|
s.Require().Equal(resp.ActivityCenterNotifications()[0].ID.String(), contactRequests[0].ID)
|
|
|
|
|
s.Require().NotNil(resp.ActivityCenterNotifications()[0].Message)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStateAccepted, resp.ActivityCenterNotifications()[0].Message.ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Check the contact state is correctly set
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateMutual, resp.Contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Make sure the sender is added to our contacts
|
|
|
|
|
contacts = theirMessenger.AddedContacts()
|
|
|
|
|
s.Require().Len(contacts, 1)
|
|
|
|
|
|
|
|
|
|
// Make sure we consider them a mutual contact, receiver side
|
|
|
|
|
mutualContacts := theirMessenger.MutualContacts()
|
|
|
|
|
s.Require().Len(mutualContacts, 1)
|
|
|
|
|
|
|
|
|
|
// Wait for the message to reach its destination
|
|
|
|
|
resp, err = WaitOnMessengerResponse(
|
|
|
|
|
s.m,
|
|
|
|
|
func(r *MessengerResponse) bool {
|
|
|
|
|
return len(r.Contacts) > 0 && len(r.Messages()) > 0 && len(r.ActivityCenterNotifications()) > 0
|
|
|
|
|
},
|
|
|
|
|
"no messages",
|
|
|
|
|
)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Check activity center notification is of the right type
|
|
|
|
|
s.Require().Equal(ActivityCenterNotificationTypeContactRequest, resp.ActivityCenterNotifications()[0].Type)
|
|
|
|
|
s.Require().NotNil(resp.ActivityCenterNotifications()[0].Message)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStateAccepted, resp.ActivityCenterNotifications()[0].Message.ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Make sure the message is updated, sender s2de
|
|
|
|
|
s.Require().NotNil(resp)
|
|
|
|
|
s.Require().Len(resp.Messages(), 1)
|
|
|
|
|
s.Require().Equal(resp.Messages()[0].ID, contactRequests[0].ID)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStateAccepted, resp.Messages()[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Make sure we consider them a mutual contact, sender side
|
|
|
|
|
mutualContacts = s.m.MutualContacts()
|
|
|
|
|
s.Require().Len(mutualContacts, 1)
|
|
|
|
|
|
|
|
|
|
// Check the contact state is correctly set
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateMutual, resp.Contacts[0].ContactRequestState)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (s *MessengerContactRequestSuite) TestReceiveAndDismissContactRequest() {
|
|
|
|
|
|
|
|
|
|
messageText := "hello!"
|
|
|
|
|
|
|
|
|
|
theirMessenger := s.newMessenger(s.shh)
|
|
|
|
|
_, err := theirMessenger.Start()
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
contactID := types.EncodeHex(crypto.FromECDSAPub(&theirMessenger.identity.PublicKey))
|
|
|
|
|
request := &requests.SendContactRequest{
|
|
|
|
|
ID: types.Hex2Bytes(contactID),
|
|
|
|
|
Message: messageText,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Send contact request
|
|
|
|
|
resp, err := s.m.SendContactRequest(context.Background(), request)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
s.Require().NotNil(resp)
|
|
|
|
|
s.Require().Len(resp.Messages(), 1)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStatePending, resp.Messages()[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Check the contact state is correctly set
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateSent, resp.Contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Make sure it's not returned as coming from us
|
|
|
|
|
contactRequests, _, err := s.m.PendingContactRequests("", 10)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
s.Require().Len(contactRequests, 0)
|
|
|
|
|
|
|
|
|
|
// Make sure contact is added on the sender side
|
|
|
|
|
contacts := s.m.AddedContacts()
|
|
|
|
|
s.Require().Len(contacts, 1)
|
|
|
|
|
|
|
|
|
|
// Wait for the message to reach its destination
|
|
|
|
|
resp, err = WaitOnMessengerResponse(
|
|
|
|
|
theirMessenger,
|
|
|
|
|
func(r *MessengerResponse) bool {
|
|
|
|
|
return len(r.Contacts) > 0 && len(r.ActivityCenterNotifications()) > 0
|
|
|
|
|
},
|
|
|
|
|
"no messages",
|
|
|
|
|
)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Check activity center notification is of the right type
|
|
|
|
|
s.Require().Equal(ActivityCenterNotificationTypeContactRequest, resp.ActivityCenterNotifications()[0].Type)
|
|
|
|
|
s.Require().NotNil(resp.ActivityCenterNotifications()[0].Message)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStatePending, resp.ActivityCenterNotifications()[0].Message.ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Check the contact state is correctly set
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateReceived, resp.Contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Check contact request has been received
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Make sure it's the pending contact requests
|
|
|
|
|
contactRequests, _, err = theirMessenger.PendingContactRequests("", 10)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
s.Require().Len(contactRequests, 1)
|
|
|
|
|
s.Require().Equal(contactRequests[0].ContactRequestState, common.ContactRequestStatePending)
|
|
|
|
|
|
|
|
|
|
// Dismiss contact request, receiver side
|
|
|
|
|
resp, err = theirMessenger.DismissContactRequest(context.Background(), &requests.DismissContactRequest{ID: types.Hex2Bytes(contactRequests[0].ID)})
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Check the contact state is correctly set
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateDismissed, resp.Contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Make sure the message is updated
|
|
|
|
|
s.Require().NotNil(resp)
|
|
|
|
|
s.Require().Len(resp.Messages(), 1)
|
|
|
|
|
s.Require().Equal(resp.Messages()[0].ID, contactRequests[0].ID)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStateDismissed, resp.Messages()[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
s.Require().Len(resp.ActivityCenterNotifications(), 1)
|
|
|
|
|
s.Require().Equal(resp.ActivityCenterNotifications()[0].ID.String(), contactRequests[0].ID)
|
|
|
|
|
s.Require().NotNil(resp.ActivityCenterNotifications()[0].Message)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStateDismissed, resp.ActivityCenterNotifications()[0].Message.ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Make sure the sender is not added to our contacts
|
|
|
|
|
contacts = theirMessenger.AddedContacts()
|
|
|
|
|
s.Require().Len(contacts, 0)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (s *MessengerContactRequestSuite) TestReceiveAcceptAndRetractContactRequest() {
|
|
|
|
|
|
|
|
|
|
messageText := "hello!"
|
|
|
|
|
|
|
|
|
|
theirMessenger := s.newMessenger(s.shh)
|
|
|
|
|
_, err := theirMessenger.Start()
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
2022-06-08 16:18:56 +00:00
|
|
|
s.Require().NoError(theirMessenger.settings.SaveSettingField(settings.MutualContactEnabled, true))
|
|
|
|
|
|
2022-01-18 16:31:34 +00:00
|
|
|
contactID := types.EncodeHex(crypto.FromECDSAPub(&theirMessenger.identity.PublicKey))
|
|
|
|
|
request := &requests.SendContactRequest{
|
|
|
|
|
ID: types.Hex2Bytes(contactID),
|
|
|
|
|
Message: messageText,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Send contact request
|
|
|
|
|
resp, err := s.m.SendContactRequest(context.Background(), request)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Check the contact state is correctly set
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateSent, resp.Contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
s.Require().NotNil(resp)
|
|
|
|
|
s.Require().Len(resp.Messages(), 1)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStatePending, resp.Messages()[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Make sure it's not returned as coming from us
|
|
|
|
|
contactRequests, _, err := s.m.PendingContactRequests("", 10)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
s.Require().Len(contactRequests, 0)
|
|
|
|
|
|
|
|
|
|
// Make sure contact is added on the sender side
|
|
|
|
|
contacts := s.m.AddedContacts()
|
|
|
|
|
s.Require().Len(contacts, 1)
|
|
|
|
|
|
|
|
|
|
// Wait for the message to reach its destination
|
|
|
|
|
resp, err = WaitOnMessengerResponse(
|
|
|
|
|
theirMessenger,
|
|
|
|
|
func(r *MessengerResponse) bool {
|
|
|
|
|
return len(r.Messages()) > 0 && len(r.ActivityCenterNotifications()) > 0
|
|
|
|
|
},
|
|
|
|
|
"no messages",
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
// Check contact request has been received
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Check the contact state is correctly set
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateReceived, resp.Contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Check activity center notification is of the right type
|
|
|
|
|
s.Require().Len(resp.ActivityCenterNotifications(), 1)
|
|
|
|
|
s.Require().Equal(ActivityCenterNotificationTypeContactRequest, resp.ActivityCenterNotifications()[0].Type)
|
|
|
|
|
s.Require().NotNil(resp.ActivityCenterNotifications()[0].Message)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStatePending, resp.ActivityCenterNotifications()[0].Message.ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Make sure it's the pending contact requests
|
|
|
|
|
contactRequests, _, err = theirMessenger.PendingContactRequests("", 10)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
s.Require().Len(contactRequests, 1)
|
|
|
|
|
s.Require().Equal(contactRequests[0].ContactRequestState, common.ContactRequestStatePending)
|
|
|
|
|
|
2022-06-13 10:57:51 +00:00
|
|
|
cid := resp.ActivityCenterNotifications()[0].Message.ID
|
2022-01-18 16:31:34 +00:00
|
|
|
// Accept contact request, receiver side
|
2022-06-13 10:57:51 +00:00
|
|
|
resp, err = theirMessenger.AcceptContactRequest(context.Background(), &requests.AcceptContactRequest{ID: types.Hex2Bytes(cid)})
|
2022-01-18 16:31:34 +00:00
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Make sure the message is updated
|
|
|
|
|
s.Require().NotNil(resp)
|
|
|
|
|
s.Require().Len(resp.Messages(), 1)
|
|
|
|
|
s.Require().Equal(resp.Messages()[0].ID, contactRequests[0].ID)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStateAccepted, resp.Messages()[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Check the contact state is correctly set
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateMutual, resp.Contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
s.Require().Len(resp.ActivityCenterNotifications(), 1)
|
|
|
|
|
s.Require().Equal(resp.ActivityCenterNotifications()[0].ID.String(), contactRequests[0].ID)
|
|
|
|
|
s.Require().NotNil(resp.ActivityCenterNotifications()[0].Message)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStateAccepted, resp.ActivityCenterNotifications()[0].Message.ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Make sure the sender is added to our contacts
|
|
|
|
|
contacts = theirMessenger.AddedContacts()
|
|
|
|
|
s.Require().Len(contacts, 1)
|
|
|
|
|
|
|
|
|
|
// Make sure we consider them a mutual contact, receiver side
|
|
|
|
|
mutualContacts := theirMessenger.MutualContacts()
|
|
|
|
|
s.Require().Len(mutualContacts, 1)
|
|
|
|
|
|
|
|
|
|
// Wait for the message to reach its destination
|
|
|
|
|
resp, err = WaitOnMessengerResponse(
|
|
|
|
|
s.m,
|
|
|
|
|
func(r *MessengerResponse) bool {
|
|
|
|
|
return len(r.Messages()) > 0 && len(r.ActivityCenterNotifications()) > 0 && len(r.Contacts) > 0
|
|
|
|
|
},
|
|
|
|
|
"no messages",
|
|
|
|
|
)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Check activity center notification is of the right type
|
|
|
|
|
s.Require().Equal(ActivityCenterNotificationTypeContactRequest, resp.ActivityCenterNotifications()[0].Type)
|
|
|
|
|
s.Require().NotNil(resp.ActivityCenterNotifications()[0].Message)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStateAccepted, resp.ActivityCenterNotifications()[0].Message.ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Check the contact state is correctly set
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateMutual, resp.Contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Make sure the message is updated, sender side
|
|
|
|
|
s.Require().NotNil(resp)
|
|
|
|
|
s.Require().Len(resp.Messages(), 1)
|
|
|
|
|
s.Require().Equal(resp.Messages()[0].ID, contactRequests[0].ID)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStateAccepted, resp.Messages()[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Make sure we consider them a mutual contact, sender side
|
|
|
|
|
mutualContacts = s.m.MutualContacts()
|
|
|
|
|
s.Require().Len(mutualContacts, 1)
|
|
|
|
|
|
|
|
|
|
resp, err = s.m.RetractContactRequest(&requests.RetractContactRequest{ContactID: types.Hex2Bytes(contactID)})
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
s.Require().NotNil(resp)
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
s.Require().False(resp.Contacts[0].HasAddedUs)
|
|
|
|
|
s.Require().False(resp.Contacts[0].Added)
|
|
|
|
|
|
|
|
|
|
// Check the contact state is correctly set
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateNone, resp.Contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Wait for the message to reach its destination
|
|
|
|
|
resp, err = WaitOnMessengerResponse(
|
|
|
|
|
theirMessenger,
|
|
|
|
|
func(r *MessengerResponse) bool {
|
|
|
|
|
return len(r.Contacts) > 0
|
|
|
|
|
},
|
|
|
|
|
"no messages",
|
|
|
|
|
)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
s.Require().NotNil(resp)
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
|
|
|
|
|
myID := types.EncodeHex(crypto.FromECDSAPub(&s.m.identity.PublicKey))
|
|
|
|
|
s.Require().Equal(myID, resp.Contacts[0].ID)
|
|
|
|
|
|
|
|
|
|
s.Require().False(resp.Contacts[0].Added)
|
|
|
|
|
s.Require().False(resp.Contacts[0].HasAddedUs)
|
|
|
|
|
|
|
|
|
|
// Check the contact state is correctly set
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateNone, resp.Contacts[0].ContactRequestState)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (s *MessengerContactRequestSuite) TestReceiveAcceptAndRetractContactRequestOutOfOrder() {
|
|
|
|
|
message := protobuf.ChatMessage{
|
|
|
|
|
Clock: 4,
|
|
|
|
|
Timestamp: 1,
|
|
|
|
|
Text: "some text",
|
|
|
|
|
ChatId: common.PubkeyToHex(&s.m.identity.PublicKey),
|
|
|
|
|
MessageType: protobuf.MessageType_ONE_TO_ONE,
|
|
|
|
|
ContentType: protobuf.ChatMessage_CONTACT_REQUEST,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
contactKey, err := crypto.GenerateKey()
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
contact, err := BuildContactFromPublicKey(&contactKey.PublicKey)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
state := s.m.buildMessageState()
|
|
|
|
|
|
|
|
|
|
state.CurrentMessageState = &CurrentMessageState{
|
|
|
|
|
PublicKey: &contactKey.PublicKey,
|
|
|
|
|
MessageID: "0xa",
|
|
|
|
|
Message: message,
|
|
|
|
|
Contact: contact,
|
|
|
|
|
WhisperTimestamp: 1,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
response := state.Response
|
|
|
|
|
err = s.m.HandleChatMessage(state)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
s.Require().Len(response.ActivityCenterNotifications(), 1)
|
|
|
|
|
contacts := s.m.Contacts()
|
|
|
|
|
s.Require().Len(contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateReceived, contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
retract := protobuf.RetractContactRequest{
|
|
|
|
|
Clock: 2,
|
|
|
|
|
}
|
|
|
|
|
err = s.m.HandleRetractContactRequest(state, retract)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Nothing should have changed
|
|
|
|
|
contacts = s.m.Contacts()
|
|
|
|
|
s.Require().Len(contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateReceived, contacts[0].ContactRequestState)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (s *MessengerContactRequestSuite) TestReceiveAndAcceptContactRequestTwice() {
|
|
|
|
|
|
|
|
|
|
messageText := "hello!"
|
|
|
|
|
|
|
|
|
|
theirMessenger := s.newMessenger(s.shh)
|
|
|
|
|
_, err := theirMessenger.Start()
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
contactID := types.EncodeHex(crypto.FromECDSAPub(&theirMessenger.identity.PublicKey))
|
|
|
|
|
request := &requests.SendContactRequest{
|
|
|
|
|
ID: types.Hex2Bytes(contactID),
|
|
|
|
|
Message: messageText,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Send contact request
|
|
|
|
|
resp, err := s.m.SendContactRequest(context.Background(), request)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
s.Require().NotNil(resp)
|
|
|
|
|
s.Require().Len(resp.Messages(), 1)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStatePending, resp.Messages()[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Make sure it's not returned as coming from us
|
|
|
|
|
contactRequests, _, err := s.m.PendingContactRequests("", 10)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
s.Require().Len(contactRequests, 0)
|
|
|
|
|
|
|
|
|
|
// Make sure contact is added on the sender side
|
|
|
|
|
contacts := s.m.AddedContacts()
|
|
|
|
|
s.Require().Len(contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateSent, contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Wait for the message to reach its destination
|
|
|
|
|
resp, err = WaitOnMessengerResponse(
|
|
|
|
|
theirMessenger,
|
|
|
|
|
func(r *MessengerResponse) bool {
|
|
|
|
|
return len(r.Contacts) > 0 && len(r.Messages()) > 0 && len(r.ActivityCenterNotifications()) > 0
|
|
|
|
|
},
|
|
|
|
|
"no messages",
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
// Check contact request has been received
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Check activity center notification is of the right type
|
|
|
|
|
s.Require().Len(resp.ActivityCenterNotifications(), 1)
|
|
|
|
|
s.Require().Equal(ActivityCenterNotificationTypeContactRequest, resp.ActivityCenterNotifications()[0].Type)
|
|
|
|
|
s.Require().NotNil(resp.ActivityCenterNotifications()[0].Message)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStatePending, resp.ActivityCenterNotifications()[0].Message.ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Check the contact state is correctly set
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateReceived, resp.Contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Make sure it's the pending contact requests
|
|
|
|
|
contactRequests, _, err = theirMessenger.PendingContactRequests("", 10)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
s.Require().Len(contactRequests, 1)
|
|
|
|
|
s.Require().Equal(contactRequests[0].ContactRequestState, common.ContactRequestStatePending)
|
|
|
|
|
|
|
|
|
|
// Accept contact request, receiver side
|
|
|
|
|
resp, err = theirMessenger.AcceptContactRequest(context.Background(), &requests.AcceptContactRequest{ID: types.Hex2Bytes(contactRequests[0].ID)})
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Make sure the message is updated
|
|
|
|
|
s.Require().NotNil(resp)
|
|
|
|
|
s.Require().Len(resp.Messages(), 1)
|
|
|
|
|
s.Require().Equal(resp.Messages()[0].ID, contactRequests[0].ID)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStateAccepted, resp.Messages()[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
s.Require().Len(resp.ActivityCenterNotifications(), 1)
|
|
|
|
|
s.Require().Equal(resp.ActivityCenterNotifications()[0].ID.String(), contactRequests[0].ID)
|
|
|
|
|
s.Require().NotNil(resp.ActivityCenterNotifications()[0].Message)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStateAccepted, resp.ActivityCenterNotifications()[0].Message.ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Check the contact state is correctly set
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateMutual, resp.Contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Make sure the sender is added to our contacts
|
|
|
|
|
contacts = theirMessenger.AddedContacts()
|
|
|
|
|
s.Require().Len(contacts, 1)
|
|
|
|
|
|
|
|
|
|
// Make sure we consider them a mutual contact, receiver side
|
|
|
|
|
mutualContacts := theirMessenger.MutualContacts()
|
|
|
|
|
s.Require().Len(mutualContacts, 1)
|
|
|
|
|
|
|
|
|
|
// Wait for the message to reach its destination
|
|
|
|
|
resp, err = WaitOnMessengerResponse(
|
|
|
|
|
s.m,
|
|
|
|
|
func(r *MessengerResponse) bool {
|
|
|
|
|
return len(r.Contacts) > 0 && len(r.Messages()) > 0 && len(r.ActivityCenterNotifications()) > 0
|
|
|
|
|
},
|
|
|
|
|
"no messages",
|
|
|
|
|
)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Check activity center notification is of the right type
|
|
|
|
|
s.Require().Equal(ActivityCenterNotificationTypeContactRequest, resp.ActivityCenterNotifications()[0].Type)
|
|
|
|
|
s.Require().NotNil(resp.ActivityCenterNotifications()[0].Message)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStateAccepted, resp.ActivityCenterNotifications()[0].Message.ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Make sure the message is updated, sender s2de
|
|
|
|
|
s.Require().NotNil(resp)
|
|
|
|
|
s.Require().Len(resp.Messages(), 1)
|
|
|
|
|
s.Require().Equal(resp.Messages()[0].ID, contactRequests[0].ID)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStateAccepted, resp.Messages()[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Make sure we consider them a mutual contact, sender side
|
|
|
|
|
mutualContacts = s.m.MutualContacts()
|
|
|
|
|
s.Require().Len(mutualContacts, 1)
|
|
|
|
|
|
|
|
|
|
// Check the contact state is correctly set
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateMutual, resp.Contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Resend contact request with higher clock value
|
|
|
|
|
resp, err = s.m.SendContactRequest(context.Background(), request)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Wait for the message to reach its destination
|
|
|
|
|
resp, err = WaitOnMessengerResponse(
|
|
|
|
|
theirMessenger,
|
|
|
|
|
func(r *MessengerResponse) bool {
|
|
|
|
|
return len(r.Messages()) == 1 && r.Messages()[0].ID == resp.Messages()[0].ID
|
|
|
|
|
},
|
|
|
|
|
"no messages",
|
|
|
|
|
)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Nothing should have changed, on both sides
|
|
|
|
|
mutualContacts = s.m.MutualContacts()
|
|
|
|
|
s.Require().Len(mutualContacts, 1)
|
|
|
|
|
|
|
|
|
|
mutualContacts = theirMessenger.MutualContacts()
|
|
|
|
|
s.Require().Len(mutualContacts, 1)
|
|
|
|
|
}
|
|
|
|
|
|
2022-06-17 16:20:43 +00:00
|
|
|
func (s *MessengerContactRequestSuite) TestAcceptLatestContactRequestForContact() {
|
|
|
|
|
|
|
|
|
|
messageText := "hello!"
|
|
|
|
|
|
|
|
|
|
theirMessenger := s.newMessenger(s.shh)
|
|
|
|
|
_, err := theirMessenger.Start()
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
contactID := types.EncodeHex(crypto.FromECDSAPub(&theirMessenger.identity.PublicKey))
|
|
|
|
|
myID := types.EncodeHex(crypto.FromECDSAPub(&s.m.identity.PublicKey))
|
|
|
|
|
|
|
|
|
|
request := &requests.SendContactRequest{
|
|
|
|
|
ID: types.Hex2Bytes(contactID),
|
|
|
|
|
Message: messageText,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Send contact request
|
|
|
|
|
resp, err := s.m.SendContactRequest(context.Background(), request)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
s.Require().NotNil(resp)
|
|
|
|
|
s.Require().Len(resp.Messages(), 1)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStatePending, resp.Messages()[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Make sure it's not returned as coming from us
|
|
|
|
|
contactRequests, _, err := s.m.PendingContactRequests("", 10)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
s.Require().Len(contactRequests, 0)
|
|
|
|
|
|
|
|
|
|
// Make sure contact is added on the sender side
|
|
|
|
|
contacts := s.m.AddedContacts()
|
|
|
|
|
s.Require().Len(contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateSent, contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Wait for the message to reach its destination
|
|
|
|
|
resp, err = WaitOnMessengerResponse(
|
|
|
|
|
theirMessenger,
|
|
|
|
|
func(r *MessengerResponse) bool {
|
|
|
|
|
return len(r.Contacts) > 0 && len(r.Messages()) > 0 && len(r.ActivityCenterNotifications()) > 0
|
|
|
|
|
},
|
|
|
|
|
"no messages",
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
// Check contact request has been received
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Check activity center notification is of the right type
|
|
|
|
|
s.Require().Len(resp.ActivityCenterNotifications(), 1)
|
|
|
|
|
s.Require().Equal(ActivityCenterNotificationTypeContactRequest, resp.ActivityCenterNotifications()[0].Type)
|
|
|
|
|
s.Require().NotNil(resp.ActivityCenterNotifications()[0].Message)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStatePending, resp.ActivityCenterNotifications()[0].Message.ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Check the contact state is correctly set
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateReceived, resp.Contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Make sure it's the pending contact requests
|
|
|
|
|
contactRequests, _, err = theirMessenger.PendingContactRequests("", 10)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
s.Require().Len(contactRequests, 1)
|
|
|
|
|
s.Require().Equal(contactRequests[0].ContactRequestState, common.ContactRequestStatePending)
|
|
|
|
|
|
|
|
|
|
// Accept latest contact request, receiver side
|
|
|
|
|
resp, err = theirMessenger.AcceptLatestContactRequestForContact(context.Background(), &requests.AcceptLatestContactRequestForContact{ID: types.Hex2Bytes(myID)})
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Make sure the message is updated
|
|
|
|
|
s.Require().NotNil(resp)
|
|
|
|
|
s.Require().Len(resp.Messages(), 1)
|
|
|
|
|
s.Require().Equal(resp.Messages()[0].ID, contactRequests[0].ID)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStateAccepted, resp.Messages()[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
s.Require().Len(resp.ActivityCenterNotifications(), 1)
|
|
|
|
|
s.Require().Equal(resp.ActivityCenterNotifications()[0].ID.String(), contactRequests[0].ID)
|
|
|
|
|
s.Require().NotNil(resp.ActivityCenterNotifications()[0].Message)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStateAccepted, resp.ActivityCenterNotifications()[0].Message.ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Check the contact state is correctly set
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateMutual, resp.Contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Make sure the sender is added to our contacts
|
|
|
|
|
contacts = theirMessenger.AddedContacts()
|
|
|
|
|
s.Require().Len(contacts, 1)
|
|
|
|
|
|
|
|
|
|
// Make sure we consider them a mutual contact, receiver side
|
|
|
|
|
mutualContacts := theirMessenger.MutualContacts()
|
|
|
|
|
s.Require().Len(mutualContacts, 1)
|
|
|
|
|
|
|
|
|
|
// Wait for the message to reach its destination
|
|
|
|
|
resp, err = WaitOnMessengerResponse(
|
|
|
|
|
s.m,
|
|
|
|
|
func(r *MessengerResponse) bool {
|
|
|
|
|
return len(r.Contacts) > 0 && len(r.Messages()) > 0 && len(r.ActivityCenterNotifications()) > 0
|
|
|
|
|
},
|
|
|
|
|
"no messages",
|
|
|
|
|
)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Check activity center notification is of the right type
|
|
|
|
|
s.Require().Equal(ActivityCenterNotificationTypeContactRequest, resp.ActivityCenterNotifications()[0].Type)
|
|
|
|
|
s.Require().NotNil(resp.ActivityCenterNotifications()[0].Message)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStateAccepted, resp.ActivityCenterNotifications()[0].Message.ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Make sure the message is updated, sender s2de
|
|
|
|
|
s.Require().NotNil(resp)
|
|
|
|
|
s.Require().Len(resp.Messages(), 1)
|
|
|
|
|
s.Require().Equal(resp.Messages()[0].ID, contactRequests[0].ID)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStateAccepted, resp.Messages()[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Make sure we consider them a mutual contact, sender side
|
|
|
|
|
mutualContacts = s.m.MutualContacts()
|
|
|
|
|
s.Require().Len(mutualContacts, 1)
|
|
|
|
|
|
|
|
|
|
// Check the contact state is correctly set
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateMutual, resp.Contacts[0].ContactRequestState)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (s *MessengerContactRequestSuite) TestDismissLatestContactRequestForContact() {
|
|
|
|
|
|
|
|
|
|
messageText := "hello!"
|
|
|
|
|
|
|
|
|
|
theirMessenger := s.newMessenger(s.shh)
|
|
|
|
|
_, err := theirMessenger.Start()
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
contactID := types.EncodeHex(crypto.FromECDSAPub(&theirMessenger.identity.PublicKey))
|
|
|
|
|
myID := types.EncodeHex(crypto.FromECDSAPub(&s.m.identity.PublicKey))
|
|
|
|
|
|
|
|
|
|
request := &requests.SendContactRequest{
|
|
|
|
|
ID: types.Hex2Bytes(contactID),
|
|
|
|
|
Message: messageText,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Send contact request
|
|
|
|
|
resp, err := s.m.SendContactRequest(context.Background(), request)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
s.Require().NotNil(resp)
|
|
|
|
|
s.Require().Len(resp.Messages(), 1)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStatePending, resp.Messages()[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Make sure it's not returned as coming from us
|
|
|
|
|
contactRequests, _, err := s.m.PendingContactRequests("", 10)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
s.Require().Len(contactRequests, 0)
|
|
|
|
|
|
|
|
|
|
// Make sure contact is added on the sender side
|
|
|
|
|
contacts := s.m.AddedContacts()
|
|
|
|
|
s.Require().Len(contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateSent, contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Wait for the message to reach its destination
|
|
|
|
|
resp, err = WaitOnMessengerResponse(
|
|
|
|
|
theirMessenger,
|
|
|
|
|
func(r *MessengerResponse) bool {
|
|
|
|
|
return len(r.Contacts) > 0 && len(r.Messages()) > 0 && len(r.ActivityCenterNotifications()) > 0
|
|
|
|
|
},
|
|
|
|
|
"no messages",
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
// Check contact request has been received
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Check activity center notification is of the right type
|
|
|
|
|
s.Require().Len(resp.ActivityCenterNotifications(), 1)
|
|
|
|
|
s.Require().Equal(ActivityCenterNotificationTypeContactRequest, resp.ActivityCenterNotifications()[0].Type)
|
|
|
|
|
s.Require().NotNil(resp.ActivityCenterNotifications()[0].Message)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStatePending, resp.ActivityCenterNotifications()[0].Message.ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Check the contact state is correctly set
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateReceived, resp.Contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Make sure it's the pending contact requests
|
|
|
|
|
contactRequests, _, err = theirMessenger.PendingContactRequests("", 10)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
s.Require().Len(contactRequests, 1)
|
|
|
|
|
s.Require().Equal(contactRequests[0].ContactRequestState, common.ContactRequestStatePending)
|
|
|
|
|
|
|
|
|
|
// Dismiss latest contact request, receiver side
|
|
|
|
|
resp, err = theirMessenger.DismissLatestContactRequestForContact(context.Background(), &requests.DismissLatestContactRequestForContact{ID: types.Hex2Bytes(myID)})
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Make sure the message is updated
|
|
|
|
|
s.Require().NotNil(resp)
|
|
|
|
|
s.Require().Len(resp.Messages(), 1)
|
|
|
|
|
s.Require().Equal(resp.Messages()[0].ID, contactRequests[0].ID)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStateDismissed, resp.Messages()[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
s.Require().Len(resp.ActivityCenterNotifications(), 1)
|
|
|
|
|
s.Require().Equal(resp.ActivityCenterNotifications()[0].ID.String(), contactRequests[0].ID)
|
|
|
|
|
s.Require().NotNil(resp.ActivityCenterNotifications()[0].Message)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStateDismissed, resp.ActivityCenterNotifications()[0].Message.ContactRequestState)
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
2022-01-18 16:31:34 +00:00
|
|
|
func (s *MessengerContactRequestSuite) TestReceiveAndAcceptLegacyContactRequest() {
|
|
|
|
|
|
|
|
|
|
theirMessenger := s.newMessenger(s.shh)
|
|
|
|
|
_, err := theirMessenger.Start()
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
contactID := types.EncodeHex(crypto.FromECDSAPub(&theirMessenger.identity.PublicKey))
|
|
|
|
|
request := &requests.AddContact{
|
|
|
|
|
ID: types.Hex2Bytes(contactID),
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Send contact request
|
|
|
|
|
resp, err := s.m.AddContact(context.Background(), request)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
s.Require().NotNil(resp)
|
|
|
|
|
|
|
|
|
|
// Make sure contact is added on the sender side
|
|
|
|
|
contacts := s.m.AddedContacts()
|
|
|
|
|
s.Require().Len(contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateSent, contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Wait for the message to reach its destination
|
|
|
|
|
resp, err = WaitOnMessengerResponse(
|
|
|
|
|
theirMessenger,
|
|
|
|
|
func(r *MessengerResponse) bool {
|
|
|
|
|
return len(r.Contacts) > 0 && len(r.ActivityCenterNotifications()) == 1
|
|
|
|
|
},
|
|
|
|
|
"no messages",
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
notification := resp.ActivityCenterNotifications()[0]
|
|
|
|
|
|
|
|
|
|
// Check contact request has been received
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Check activity center notification is of the right type
|
|
|
|
|
s.Require().Equal(ActivityCenterNotificationTypeContactRequest, notification.Type)
|
|
|
|
|
s.Require().NotNil(notification.Type)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStatePending, notification.Message.ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Check the contact state is correctly set
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateReceived, resp.Contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Accept contact request, receiver side
|
|
|
|
|
resp, err = theirMessenger.AcceptContactRequest(context.Background(), &requests.AcceptContactRequest{ID: types.Hex2Bytes(notification.Message.ID)})
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Make sure the message is updated
|
|
|
|
|
s.Require().NotNil(resp)
|
|
|
|
|
|
|
|
|
|
s.Require().Len(resp.ActivityCenterNotifications(), 1)
|
|
|
|
|
s.Require().Equal(resp.ActivityCenterNotifications()[0].ID.String(), notification.Message.ID)
|
|
|
|
|
s.Require().NotNil(resp.ActivityCenterNotifications()[0].Message)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStateAccepted, resp.ActivityCenterNotifications()[0].Message.ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Check the contact state is correctly set
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateMutual, resp.Contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Make sure the sender is added to our contacts
|
|
|
|
|
contacts = theirMessenger.AddedContacts()
|
|
|
|
|
s.Require().Len(contacts, 1)
|
|
|
|
|
|
|
|
|
|
// Make sure we consider them a mutual contact, receiver side
|
|
|
|
|
mutualContacts := theirMessenger.MutualContacts()
|
|
|
|
|
s.Require().Len(mutualContacts, 1)
|
2022-06-13 10:57:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (s *MessengerContactRequestSuite) TestLegacyContactRequestNotifications() {
|
|
|
|
|
|
|
|
|
|
theirMessenger := s.newMessenger(s.shh)
|
|
|
|
|
_, err := theirMessenger.Start()
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
contactID := types.EncodeHex(crypto.FromECDSAPub(&theirMessenger.identity.PublicKey))
|
|
|
|
|
request := &requests.AddContact{
|
|
|
|
|
ID: types.Hex2Bytes(contactID),
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Send legacy contact request
|
|
|
|
|
resp, err := s.m.AddContact(context.Background(), request)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
s.Require().NotNil(resp)
|
|
|
|
|
|
|
|
|
|
// Make sure contact is added on the sender side
|
|
|
|
|
contacts := s.m.AddedContacts()
|
|
|
|
|
s.Require().Len(contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateSent, contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Wait for the message to reach its destination
|
|
|
|
|
resp, err = WaitOnMessengerResponse(
|
|
|
|
|
theirMessenger,
|
|
|
|
|
func(r *MessengerResponse) bool {
|
|
|
|
|
return len(r.Contacts) > 0 && len(r.ActivityCenterNotifications()) == 1
|
|
|
|
|
},
|
|
|
|
|
"no messages",
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
notification := resp.ActivityCenterNotifications()[0]
|
|
|
|
|
|
|
|
|
|
// Check contact request has been received
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Check activity center notification is of the right type
|
|
|
|
|
s.Require().Equal(ActivityCenterNotificationTypeContactRequest, notification.Type)
|
|
|
|
|
s.Require().NotNil(notification.Type)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStatePending, notification.Message.ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Check the contact state is correctly set
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateReceived, resp.Contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Send new contact request
|
|
|
|
|
resp, err = s.m.AddContact(context.Background(), request)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
s.Require().NotNil(resp)
|
|
|
|
|
|
|
|
|
|
crRequest := &requests.SendContactRequest{
|
|
|
|
|
ID: types.Hex2Bytes(contactID),
|
|
|
|
|
Message: "hello",
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
myID := types.EncodeHex(crypto.FromECDSAPub(&s.m.identity.PublicKey))
|
|
|
|
|
|
|
|
|
|
// Send contact request
|
|
|
|
|
resp, err = s.m.SendContactRequest(context.Background(), crRequest)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
paginationResponse, err := theirMessenger.ActivityCenterNotifications("", 10)
|
|
|
|
|
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
s.Require().Len(paginationResponse.Notifications, 1)
|
|
|
|
|
|
|
|
|
|
// Wait for the message to reach its destination
|
|
|
|
|
resp, err = WaitOnMessengerResponse(
|
|
|
|
|
theirMessenger,
|
|
|
|
|
func(r *MessengerResponse) bool {
|
|
|
|
|
return len(r.ActivityCenterNotifications()) == 2
|
|
|
|
|
},
|
|
|
|
|
"no messages",
|
|
|
|
|
)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
activityCenterNotifications := resp.ActivityCenterNotifications()
|
|
|
|
|
var newNotification, oldNotification *ActivityCenterNotification
|
|
|
|
|
if activityCenterNotifications[0].Message.ID == defaultContactRequestID(myID) {
|
|
|
|
|
oldNotification = activityCenterNotifications[0]
|
|
|
|
|
newNotification = activityCenterNotifications[1]
|
|
|
|
|
} else {
|
|
|
|
|
newNotification = activityCenterNotifications[0]
|
|
|
|
|
oldNotification = activityCenterNotifications[1]
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
s.Require().True(oldNotification.Dismissed)
|
|
|
|
|
s.Require().False(newNotification.Dismissed)
|
|
|
|
|
|
|
|
|
|
paginationResponse, err = theirMessenger.ActivityCenterNotifications("", 10)
|
|
|
|
|
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
s.Require().Len(paginationResponse.Notifications, 1)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (s *MessengerContactRequestSuite) TestReceiveMultipleLegacy() {
|
|
|
|
|
|
|
|
|
|
theirMessenger := s.newMessenger(s.shh)
|
|
|
|
|
_, err := theirMessenger.Start()
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
s.Require().NoError(theirMessenger.settings.SaveSettingField(settings.MutualContactEnabled, true))
|
|
|
|
|
s.Require().NoError(s.m.settings.SaveSettingField(settings.MutualContactEnabled, true))
|
|
|
|
|
|
|
|
|
|
contactID := types.EncodeHex(crypto.FromECDSAPub(&theirMessenger.identity.PublicKey))
|
|
|
|
|
request := &requests.AddContact{
|
|
|
|
|
ID: types.Hex2Bytes(contactID),
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Send legacy contact request
|
|
|
|
|
resp, err := s.m.AddContact(context.Background(), request)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
s.Require().NotNil(resp)
|
|
|
|
|
|
|
|
|
|
// Make sure contact is added on the sender side
|
|
|
|
|
contacts := s.m.AddedContacts()
|
|
|
|
|
s.Require().Len(contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateSent, contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Wait for the message to reach its destination
|
|
|
|
|
resp, err = WaitOnMessengerResponse(
|
|
|
|
|
theirMessenger,
|
|
|
|
|
func(r *MessengerResponse) bool {
|
|
|
|
|
return len(r.Contacts) > 0 && len(r.ActivityCenterNotifications()) == 1
|
|
|
|
|
},
|
|
|
|
|
"no messages",
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
notification := resp.ActivityCenterNotifications()[0]
|
|
|
|
|
|
|
|
|
|
// Check contact request has been received
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Check activity center notification is of the right type
|
|
|
|
|
s.Require().Equal(ActivityCenterNotificationTypeContactRequest, notification.Type)
|
|
|
|
|
s.Require().NotNil(notification.Type)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStatePending, notification.Message.ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Check the contact state is correctly set
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateReceived, resp.Contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Remove contact
|
|
|
|
|
|
|
|
|
|
_, err = s.m.RetractContactRequest(&requests.RetractContactRequest{ContactID: types.Hex2Bytes(contactID)})
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Wait for the message to reach its destination
|
|
|
|
|
resp, err = WaitOnMessengerResponse(
|
|
|
|
|
theirMessenger,
|
|
|
|
|
func(r *MessengerResponse) bool {
|
|
|
|
|
return len(r.Contacts) == 1
|
|
|
|
|
},
|
|
|
|
|
"no messages",
|
|
|
|
|
)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Make sure it's not a contact anymore
|
|
|
|
|
s.Require().Equal(ContactRequestStateNone, resp.Contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Re-add user
|
|
|
|
|
resp, err = s.m.AddContact(context.Background(), request)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
s.Require().NotNil(resp)
|
|
|
|
|
|
|
|
|
|
// Wait for the message to reach its destination
|
|
|
|
|
resp, err = WaitOnMessengerResponse(
|
|
|
|
|
theirMessenger,
|
|
|
|
|
func(r *MessengerResponse) bool {
|
|
|
|
|
return len(r.Contacts) > 0 && len(r.ActivityCenterNotifications()) == 1
|
|
|
|
|
},
|
|
|
|
|
"no messages",
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
notification = resp.ActivityCenterNotifications()[0]
|
|
|
|
|
|
|
|
|
|
// Check contact request has been received
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Check activity center notification is of the right type
|
|
|
|
|
s.Require().Equal(ActivityCenterNotificationTypeContactRequest, notification.Type)
|
|
|
|
|
s.Require().NotNil(notification.Type)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStatePending, notification.Message.ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Check the contact state is correctly set
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateReceived, resp.Contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
}
|
2022-06-24 13:08:14 +00:00
|
|
|
|
|
|
|
|
func (s *MessengerContactRequestSuite) TestAcceptLatestLegacyContactRequestForContact() {
|
|
|
|
|
|
|
|
|
|
theirMessenger := s.newMessenger(s.shh)
|
|
|
|
|
_, err := theirMessenger.Start()
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
contactID := types.EncodeHex(crypto.FromECDSAPub(&theirMessenger.identity.PublicKey))
|
|
|
|
|
myID := types.EncodeHex(crypto.FromECDSAPub(&s.m.identity.PublicKey))
|
|
|
|
|
|
|
|
|
|
request := &requests.AddContact{
|
|
|
|
|
ID: types.Hex2Bytes(contactID),
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Send contact request
|
|
|
|
|
_, err = s.m.AddContact(context.Background(), request)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Wait for the message to reach its destination
|
|
|
|
|
resp, err := WaitOnMessengerResponse(
|
|
|
|
|
theirMessenger,
|
|
|
|
|
func(r *MessengerResponse) bool {
|
|
|
|
|
return len(r.Contacts) > 0 && len(r.Messages()) > 0 && len(r.ActivityCenterNotifications()) > 0
|
|
|
|
|
},
|
|
|
|
|
"no messages",
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
// Check contact request has been received
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Check activity center notification is of the right type
|
|
|
|
|
s.Require().Len(resp.ActivityCenterNotifications(), 1)
|
|
|
|
|
s.Require().Equal(ActivityCenterNotificationTypeContactRequest, resp.ActivityCenterNotifications()[0].Type)
|
|
|
|
|
s.Require().NotNil(resp.ActivityCenterNotifications()[0].Message)
|
|
|
|
|
s.Require().Equal(common.ContactRequestStatePending, resp.ActivityCenterNotifications()[0].Message.ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Check the contact state is correctly set
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateReceived, resp.Contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Accept latest contact request, receiver side
|
|
|
|
|
resp, err = theirMessenger.AcceptLatestContactRequestForContact(context.Background(), &requests.AcceptLatestContactRequestForContact{ID: types.Hex2Bytes(myID)})
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Check the contact state is correctly set
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateMutual, resp.Contacts[0].ContactRequestState)
|
|
|
|
|
|
|
|
|
|
// Make sure the sender is added to our contacts
|
|
|
|
|
contacts := theirMessenger.AddedContacts()
|
|
|
|
|
s.Require().Len(contacts, 1)
|
|
|
|
|
|
|
|
|
|
// Make sure we consider them a mutual contact, receiver side
|
|
|
|
|
mutualContacts := theirMessenger.MutualContacts()
|
|
|
|
|
s.Require().Len(mutualContacts, 1)
|
|
|
|
|
|
|
|
|
|
// Wait for the message to reach its destination
|
|
|
|
|
resp, err = WaitOnMessengerResponse(
|
|
|
|
|
s.m,
|
|
|
|
|
func(r *MessengerResponse) bool {
|
|
|
|
|
return len(r.Contacts) > 0
|
|
|
|
|
},
|
|
|
|
|
"no messages",
|
|
|
|
|
)
|
|
|
|
|
s.Require().NoError(err)
|
|
|
|
|
|
|
|
|
|
// Make sure we consider them a mutual contact, sender side
|
|
|
|
|
mutualContacts = s.m.MutualContacts()
|
|
|
|
|
s.Require().Len(mutualContacts, 1)
|
|
|
|
|
|
|
|
|
|
// Check the contact state is correctly set
|
|
|
|
|
s.Require().Len(resp.Contacts, 1)
|
|
|
|
|
s.Require().Equal(ContactRequestStateMutual, resp.Contacts[0].ContactRequestState)
|
|
|
|
|
}
|
