status-im/status-go
2
0
Fork 0
mirror of https://github.com/status-im/status-go.git synced 2025-02-20 10:48:36 +00:00
Code Issues Projects Releases Wiki Activity

update account name if necessary (#3072)

Browse Source
This commit is contained in:
frank 2023-01-12 11:00:24 +08:00 committed by GitHub
parent 880a201037
commit a29511b921
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
protocol/messenger_handler.go
View File

@ -1750,13 +1750,19 @@ func (m *Messenger) handleSyncSetting(messageState *ReceivedMessageState, messag
if err != nil { if err != nil {
return err return err
} }
if message.GetType() == protobuf.SyncSetting_DISPLAY_NAME { if message.GetType() == protobuf.SyncSetting_DISPLAY_NAME && settingField != nil {
oldDisplayName, err := m.settings.DisplayName()
if err != nil {
return err
}
if oldDisplayName != message.GetValueString() {
m.account.Name = message.GetValueString() m.account.Name = message.GetValueString()
err = m.multiAccounts.SaveAccount(*m.account) err = m.multiAccounts.SaveAccount(*m.account)
if err != nil { if err != nil {
return err return err
} }
} }
}
messageState.Response.AddSetting(settingField) messageState.Response.AddSetting(settingField)
return nil return nil
} }

22
server/pairing/sync_device_test.go
View File

@ -83,6 +83,8 @@ func (s *SyncDeviceSuite) prepareBackendWithAccount(tmpdir string) *api.GethStat
settings, err := defaultSettings(generatedAccountInfo.GeneratedAccountInfo, derivedAddresses, nil) settings, err := defaultSettings(generatedAccountInfo.GeneratedAccountInfo, derivedAddresses, nil)
require.NoError(s.T(), err) require.NoError(s.T(), err)
account.Name = settings.Name
nodeConfig, err := defaultNodeConfig(tmpdir, settings.InstallationID, account.KeyUID) nodeConfig, err := defaultNodeConfig(tmpdir, settings.InstallationID, account.KeyUID)
require.NoError(s.T(), err) require.NoError(s.T(), err)
@ -146,12 +148,12 @@ func (s *SyncDeviceSuite) TestPairingSyncDeviceClientAsSender() {
}) })
require.NoError(s.T(), err) require.NoError(s.T(), err)
activeAccount, err := clientBackend.GetActiveAccount() clientActiveAccount, err := clientBackend.GetActiveAccount()
require.NoError(s.T(), err) require.NoError(s.T(), err)
clientKeystorePath := filepath.Join(clientTmpDir, keystoreDir, activeAccount.KeyUID) clientKeystorePath := filepath.Join(clientTmpDir, keystoreDir, clientActiveAccount.KeyUID)
var config = PayloadSourceConfig{ var config = PayloadSourceConfig{
KeystorePath: clientKeystorePath, KeystorePath: clientKeystorePath,
KeyUID: activeAccount.KeyUID, KeyUID: clientActiveAccount.KeyUID,
Password: s.password, Password: s.password,
} }
configBytes, err := json.Marshal(config) configBytes, err := json.Marshal(config)
@ -165,6 +167,10 @@ func (s *SyncDeviceSuite) TestPairingSyncDeviceClientAsSender() {
require.NoError(s.T(), err) require.NoError(s.T(), err)
require.Equal(s.T(), 1, len(bookmarks)) require.Equal(s.T(), 1, len(bookmarks))
require.Equal(s.T(), "status.im", bookmarks[0].Name) require.Equal(s.T(), "status.im", bookmarks[0].Name)
serverActiveAccount, err := serverBackend.GetActiveAccount()
require.NoError(s.T(), err)
require.Equal(s.T(), serverActiveAccount.Name, clientActiveAccount.Name)
} }
func (s *SyncDeviceSuite) TestPairingSyncDeviceClientAsReceiver() { func (s *SyncDeviceSuite) TestPairingSyncDeviceClientAsReceiver() {
@ -177,12 +183,12 @@ func (s *SyncDeviceSuite) TestPairingSyncDeviceClientAsReceiver() {
require.NoError(s.T(), clientBackend.Logout()) require.NoError(s.T(), clientBackend.Logout())
}() }()
activeAccount, err := serverBackend.GetActiveAccount() serverActiveAccount, err := serverBackend.GetActiveAccount()
require.NoError(s.T(), err) require.NoError(s.T(), err)
serverKeystorePath := filepath.Join(serverTmpDir, keystoreDir, activeAccount.KeyUID) serverKeystorePath := filepath.Join(serverTmpDir, keystoreDir, serverActiveAccount.KeyUID)
var config = PayloadSourceConfig{ var config = PayloadSourceConfig{
KeystorePath: serverKeystorePath, KeystorePath: serverKeystorePath,
KeyUID: activeAccount.KeyUID, KeyUID: serverActiveAccount.KeyUID,
Password: s.password, Password: s.password,
} }
configBytes, err := json.Marshal(config) configBytes, err := json.Marshal(config)
@ -214,6 +220,10 @@ func (s *SyncDeviceSuite) TestPairingSyncDeviceClientAsReceiver() {
require.NoError(s.T(), err) require.NoError(s.T(), err)
require.Equal(s.T(), 1, len(bookmarks)) require.Equal(s.T(), 1, len(bookmarks))
require.Equal(s.T(), "status.im", bookmarks[0].Name) require.Equal(s.T(), "status.im", bookmarks[0].Name)
clientActiveAccount, err := clientBackend.GetActiveAccount()
require.NoError(s.T(), err)
require.Equal(s.T(), serverActiveAccount.Name, clientActiveAccount.Name)
} }
func defaultSettings(generatedAccountInfo generator.GeneratedAccountInfo, derivedAddresses map[string]generator.AccountInfo, mnemonic *string) (*settings.Settings, error) { func defaultSettings(generatedAccountInfo generator.GeneratedAccountInfo, derivedAddresses map[string]generator.AccountInfo, mnemonic *string) (*settings.Settings, error) {