Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-15 14:56:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GODT-2022: Fix change between address modes

Browse Source
This commit is contained in:
James Houlahan
2022-11-02 12:49:40 +01:00
parent 0812491f09
commit bc7912e8fb
10 changed files with 83 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/bridge/imap.go
View File

@ -113,10 +113,16 @@ func (bridge *Bridge) addIMAPUser(ctx context.Context, user *user.User) error {
// removeIMAPUser disconnects the given user from gluon, optionally also removing its files.
func (bridge *Bridge) removeIMAPUser(ctx context.Context, user *user.User, withFiles bool) error {
for _, gluonID := range user.GetGluonIDs() {
for addrID, gluonID := range user.GetGluonIDs() {
if err := bridge.imapServer.RemoveUser(ctx, gluonID, withFiles); err != nil {
return fmt.Errorf("failed to remove IMAP user: %w", err)
}
if withFiles {
if err := user.RemoveGluonID(addrID, gluonID); err != nil {
return fmt.Errorf("failed to remove IMAP user ID: %w", err)
}
}
}
return nil

6
internal/bridge/user.go
View File

@ -258,10 +258,14 @@ func (bridge *Bridge) SetAddressMode(ctx context.Context, userID string, mode va
return fmt.Errorf("address mode is already %q", mode)
}
for _, gluonID := range user.GetGluonIDs() {
for addrID, gluonID := range user.GetGluonIDs() {
if err := bridge.imapServer.RemoveUser(ctx, gluonID, true); err != nil {
return fmt.Errorf("failed to remove user from IMAP server: %w", err)
}
if err := user.RemoveGluonID(addrID, gluonID); err != nil {
return fmt.Errorf("failed to remove gluon ID from user: %w", err)
}
}
if err := user.SetAddressMode(ctx, mode); err != nil {

4
internal/bridge/user_events.go
View File

@ -93,6 +93,10 @@ func (bridge *Bridge) handleUserAddressDeleted(ctx context.Context, user *user.U
if err := bridge.imapServer.RemoveUser(ctx, gluonID, true); err != nil {
return fmt.Errorf("failed to remove user from IMAP server: %w", err)
}
if err := user.RemoveGluonID(event.AddressID, gluonID); err != nil {
return fmt.Errorf("failed to remove gluon ID for address: %w", err)
}
}
return nil

25
internal/bridge/user_test.go
View File

@ -462,15 +462,26 @@ func TestBridge_AddressMode(t *testing.T) {
// The user is in combined mode by default.
require.Equal(t, vault.CombinedMode, info.AddressMode)
// Put the user in split mode.
require.NoError(t, bridge.SetAddressMode(ctx, userID, vault.SplitMode))
// Repeatedly switch between address modes.
for i := 1; i <= 10; i++ {
var target vault.AddressMode
// Get the user's info.
info, err = bridge.GetUserInfo(userID)
require.NoError(t, err)
if i%2 == 0 {
target = vault.CombinedMode
} else {
target = vault.SplitMode
}
// The user is in split mode.
require.Equal(t, vault.SplitMode, info.AddressMode)
// Put the user in the target mode.
require.NoError(t, bridge.SetAddressMode(ctx, userID, target))
// Get the user's info.
info, err = bridge.GetUserInfo(userID)
require.NoError(t, err)
// The user is in the target mode.
require.Equal(t, target, info.AddressMode)
}
})
})
}