fix: Add missing state update for connector mailbox delete update

States were not notified that the mailbox was removed from the
connector.

internal/backend/connector_updates.go

@@ -87,15 +87,18 @@ func (user *user) applyMailboxCreated(ctx context.Context, update *imap.MailboxC
 
 // applyMailboxDeleted applies a MailboxDeleted update.
 func (user *user) applyMailboxDeleted(ctx context.Context, update *imap.MailboxDeleted) error {
-	if exists, err := db.ReadResult(ctx, user.db, func(ctx context.Context, client *ent.Client) (bool, error) {
-		return db.MailboxExistsWithRemoteID(ctx, client, update.MailboxID)
-	}); err != nil {
+	internalMailboxID, err := db.ReadResult(ctx, user.db, func(ctx context.Context, client *ent.Client) (imap.InternalMailboxID, error) {
+		return db.GetMailboxIDFromRemoteID(ctx, client, update.MailboxID)
+	})
+	if err != nil {
+		if ent.IsNotFound(err) {
+			return nil
+		}
+
 		return err
-	} else if !exists {
-		return nil
 	}
 
-	return user.db.Write(ctx, func(ctx context.Context, tx *ent.Tx) error {
+	if err := user.db.Write(ctx, func(ctx context.Context, tx *ent.Tx) error {
 		uidValidity, increased, err := db.DeleteMailboxWithRemoteID(ctx, tx, update.MailboxID)
 		if err != nil {
 			return err
@@ -108,7 +111,13 @@ func (user *user) applyMailboxDeleted(ctx context.Context, update *imap.MailboxD
 		}
 
 		return nil
-	})
+	}); err != nil {
+		return err
+	}
+
+	user.queueStateUpdate(state.NewMailboxDeletedStateUpdate(internalMailboxID))
+
+	return nil
 }
 
 // applyMailboxUpdated applies a MailboxUpdated update.

internal/db/mailbox.go

@@ -70,6 +70,15 @@ func MailboxExistsWithRemoteID(ctx context.Context, client *ent.Client, mboxID i
 	return client.Mailbox.Query().Where(mailbox.RemoteID(mboxID)).Exist(ctx)
 }
 
+func GetMailboxIDFromRemoteID(ctx context.Context, client *ent.Client, mboxID imap.MailboxID) (imap.InternalMailboxID, error) {
+	mbox, err := client.Mailbox.Query().Where(mailbox.RemoteID(mboxID)).Select(mailbox.FieldID).Only(ctx)
+	if err != nil {
+		return 0, err
+	}
+
+	return mbox.ID, nil
+}
+
 func MailboxExistsWithName(ctx context.Context, client *ent.Client, name string) (bool, error) {
 	return client.Mailbox.Query().Where(mailbox.Name(name)).Exist(ctx)
 }

tests/delete_test.go

@@ -164,3 +164,18 @@ func TestDeleteExaminedMailboxCausesDisconnectOnOtherClients(t *testing.T) {
 		c[2].S(response.Bye().WithInconsistentState().String())
 	})
 }
+
+func TestDeleteSelectedMailboxWithRemoteUpdateCausesDisconnect(t *testing.T) {
+	runOneToOneTestWithAuth(t, defaultServerOptions(t), func(c *testConnection, s *testSession) {
+		mailboxID := s.mailboxCreated("user", []string{"mbox1"})
+		s.flush("user")
+
+		c.C("b002 SELECT mbox1").OK("b002")
+
+		s.mailboxDeleted("user", mailboxID)
+		s.flush("user")
+
+		c.C("b003 NOOP")
+		c.S(response.Bye().WithInconsistentState().String())
+	})
+}

tests/session_test.go

@@ -120,6 +120,10 @@ func (s *testSession) mailboxCreated(user string, name []string, withData ...str
 	return s.mailboxCreatedWithAttributes(user, name, defaultAttributes, withData...)
 }
 
+func (s *testSession) mailboxDeleted(user string, id imap.MailboxID) {
+	require.NoError(s.tb, s.conns[s.userIDs[user]].MailboxDeleted(id))
+}
+
 func (s *testSession) mailboxCreatedWithAttributes(user string, name []string, attributes imap.FlagSet, withData ...string) imap.MailboxID {
 	mboxID := imap.MailboxID(utils.NewRandomMailboxID())