Import/Export backend prep

internal/users/user.go

@@ -359,14 +359,17 @@ func (u *User) GetAddressID(address string) (id string, err error) {
 	u.lock.RLock()
 	defer u.lock.RUnlock()
 
-	address = strings.ToLower(address)
-
-	if u.store == nil {
-		err = errors.New("store is not initialised")
-		return
+	if u.store != nil {
+		address = strings.ToLower(address)
+		return u.store.GetAddressID(address)
 	}
 
-	return u.store.GetAddressID(address)
+	addresses := u.client().Addresses()
+	pmapiAddress := addresses.ByEmail(address)
+	if pmapiAddress != nil {
+		return pmapiAddress.ID, nil
+	}
+	return "", errors.New("address not found")
 }
 
 // GetBridgePassword returns bridge password. This is not a password of the PM

internal/users/users.go

@@ -52,8 +52,14 @@ type Users struct {
 	// People are used to that and so we preserve that ordering here.
 	users []*User
 
-	// idleUpdates is a channel which the imap backend listens to and which it uses
-	// to send idle updates to the mail client (eg thunderbird).
+	// useOnlyActiveAddresses determines whether credentials keeps only active
+	// addresses or all of them. Each usage has to be consisteng, e.g., once
+	// user is added, it saves address list to credentials and next time loads
+	// as is, without requesting server again.
+	useOnlyActiveAddresses bool
+
+	// idleUpdates is a channel which the imap backend listens to and which it
+	// uses to send idle updates to the mail client (eg thunderbird).
 	// The user stores should send idle updates on this channel.
 	idleUpdates chan imapBackend.Update
 
@@ -70,19 +76,21 @@ func New(
 	clientManager ClientManager,
 	credStorer CredentialsStorer,
 	storeFactory StoreMaker,
+	useOnlyActiveAddresses bool,
 ) *Users {
 	log.Trace("Creating new users")
 
 	u := &Users{
-		config:        config,
-		panicHandler:  panicHandler,
-		events:        eventListener,
-		clientManager: clientManager,
-		credStorer:    credStorer,
-		storeFactory:  storeFactory,
-		idleUpdates:   make(chan imapBackend.Update),
-		lock:          sync.RWMutex{},
-		stopAll:       make(chan struct{}),
+		config:                 config,
+		panicHandler:           panicHandler,
+		events:                 eventListener,
+		clientManager:          clientManager,
+		credStorer:             credStorer,
+		storeFactory:           storeFactory,
+		useOnlyActiveAddresses: useOnlyActiveAddresses,
+		idleUpdates:            make(chan imapBackend.Update),
+		lock:                   sync.RWMutex{},
+		stopAll:                make(chan struct{}),
 	}
 
 	go func() {
@@ -291,9 +299,15 @@ func (u *Users) addNewUser(apiUser *pmapi.User, auth *pmapi.Auth, hashedPassphra
 		return errors.Wrap(err, "failed to update API user")
 	}
 
-	activeEmails := client.Addresses().ActiveEmails()
+	emails := []string{}
+	for _, address := range client.Addresses() {
+		if u.useOnlyActiveAddresses && address.Receive != pmapi.CanReceive {
+			continue
+		}
+		emails = append(emails, address.Email)
+	}
 
-	if _, err = u.credStorer.Add(apiUser.ID, apiUser.Name, auth.GenToken(), hashedPassphrase, activeEmails); err != nil {
+	if _, err = u.credStorer.Add(apiUser.ID, apiUser.Name, auth.GenToken(), hashedPassphrase, emails); err != nil {
 		return errors.Wrap(err, "failed to add user to credentials store")
 	}
 

internal/users/users_test.go

@@ -238,7 +238,7 @@ func testNewUsers(t *testing.T, m mocks) *Users { //nolint[unparam]
 	m.eventListener.EXPECT().Add(events.UpgradeApplicationEvent, gomock.Any())
 	m.clientManager.EXPECT().GetAuthUpdateChannel().Return(make(chan pmapi.ClientAuth))
 
-	users := New(m.config, m.PanicHandler, m.eventListener, m.clientManager, m.credentialsStore, m.storeMaker)
+	users := New(m.config, m.PanicHandler, m.eventListener, m.clientManager, m.credentialsStore, m.storeMaker, true)
 
 	waitForEvents()