From 7aa2ca87f21bf175625b9214355e46e7c3fdf356 Mon Sep 17 00:00:00 2001
From: Maycon Santos <mlsmaycon@gmail.com>
Date: Tue, 8 Jul 2025 01:41:07 +0200
Subject: [PATCH] split call to BufferUpdateAccountPeers when system user
 initiates

---
 management/server/account/manager.go          | 1 +
 management/server/ephemeral.go                | 7 +++++++
 management/server/mock_server/account_mock.go | 4 ++++
 management/server/peer.go                     | 2 +-
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/management/server/account/manager.go b/management/server/account/manager.go
index ed17fa5ec..f8aa2756a 100644
--- a/management/server/account/manager.go
+++ b/management/server/account/manager.go
@@ -112,6 +112,7 @@ type Manager interface {
 	GetAccountSettings(ctx context.Context, accountID string, userID string) (*types.Settings, error)
 	DeleteSetupKey(ctx context.Context, accountID, userID, keyID string) error
 	UpdateAccountPeers(ctx context.Context, accountID string)
+	BufferUpdateAccountPeers(ctx context.Context, accountID string)
 	BuildUserInfosForAccount(ctx context.Context, accountID, initiatorUserID string, accountUsers []*types.User) (map[string]*types.UserInfo, error)
 	SyncUserJWTGroups(ctx context.Context, userAuth nbcontext.UserAuth) error
 	GetStore() store.Store
diff --git a/management/server/ephemeral.go b/management/server/ephemeral.go
index 3cb9b7536..7cdfb51ce 100644
--- a/management/server/ephemeral.go
+++ b/management/server/ephemeral.go
@@ -164,13 +164,20 @@ func (e *EphemeralManager) cleanup(ctx context.Context) {
 
 	e.peersLock.Unlock()
 
+	bufferAccountCall := make(map[string]struct{})
+
 	for id, p := range deletePeers {
 		log.WithContext(ctx).Debugf("delete ephemeral peer: %s", id)
 		err := e.accountManager.DeletePeer(ctx, p.accountID, id, activity.SystemInitiator)
 		if err != nil {
 			log.WithContext(ctx).Errorf("failed to delete ephemeral peer: %s", err)
+		} else {
+			bufferAccountCall[p.accountID] = struct{}{}
 		}
 	}
+	for accountID := range bufferAccountCall {
+		e.accountManager.BufferUpdateAccountPeers(ctx, accountID)
+	}
 }
 
 func (e *EphemeralManager) addPeer(accountID string, peerID string, deadline time.Time) {
diff --git a/management/server/mock_server/account_mock.go b/management/server/mock_server/account_mock.go
index 8837f9f50..4004f1b57 100644
--- a/management/server/mock_server/account_mock.go
+++ b/management/server/mock_server/account_mock.go
@@ -126,6 +126,10 @@ func (am *MockAccountManager) UpdateAccountPeers(ctx context.Context, accountID
 	// do nothing
 }
 
+func (am *MockAccountManager) BufferUpdateAccountPeers(ctx context.Context, accountID string) {
+	// do nothing
+}
+
 func (am *MockAccountManager) DeleteSetupKey(ctx context.Context, accountID, userID, keyID string) error {
 	if am.DeleteSetupKeyFunc != nil {
 		return am.DeleteSetupKeyFunc(ctx, accountID, userID, keyID)
diff --git a/management/server/peer.go b/management/server/peer.go
index 254048a96..77e69d370 100644
--- a/management/server/peer.go
+++ b/management/server/peer.go
@@ -391,7 +391,7 @@ func (am *DefaultAccountManager) DeletePeer(ctx context.Context, accountID, peer
 		storeEvent()
 	}
 
-	if updateAccountPeers {
+	if updateAccountPeers && userID != activity.SystemInitiator {
 		am.BufferUpdateAccountPeers(ctx, accountID)
 	}