fix(GODT-2619): Ensure mailbox deletions from connector unsubscribe

When a mailbox is deleted from the connector, make sure it is also
removed from the subscription list.

internal/backend/connector_updates.go

@@ -126,7 +126,7 @@ func (user *user) applyMailboxDeleted(ctx context.Context, update *imap.MailboxD
 	}
 
 	stateUpdate, err := db.WriteResult(ctx, user.db, func(ctx context.Context, tx *ent.Tx) (state.Update, error) {
-		internalMailboxID, err := db.GetMailboxIDFromRemoteID(ctx, tx.Client(), update.MailboxID)
+		mailbox, err := db.GetMailboxByRemoteID(ctx, tx.Client(), update.MailboxID)
 		if err != nil {
 			if ent.IsNotFound(err) {
 				return nil, nil
@@ -139,7 +139,11 @@ func (user *user) applyMailboxDeleted(ctx context.Context, update *imap.MailboxD
 			return nil, err
 		}
 
-		return state.NewMailboxDeletedStateUpdate(internalMailboxID), nil
+		if _, err := db.RemoveDeletedSubscriptionWithName(ctx, tx, mailbox.Name); err != nil {
+			return nil, err
+		}
+
+		return state.NewMailboxDeletedStateUpdate(mailbox.ID), nil
 	})
 	if err != nil {
 		return err

tests/updates_test.go

@@ -427,3 +427,18 @@ func TestUpdatedMessageFetchSucceedsOnSecondTry(t *testing.T) {
 		c.OK("A005")
 	})
 }
+
+func TestDeleteMailboxFromConnectorAlsoRemoveSubscriptionStatus(t *testing.T) {
+	runOneToOneTestWithAuth(t, defaultServerOptions(t), func(c *testConnection, s *testSession) {
+		mailboxID := s.mailboxCreated("user", []string{"mbox1"})
+		s.flush("user")
+		s.mailboxDeleted("user", mailboxID)
+		s.flush("user")
+
+		c.C(`S001 LSUB "" "*"`)
+		c.S(
+			`* LSUB (\Unmarked) "/" "INBOX"`,
+		)
+		c.S("S001 OK LSUB")
+	})
+}