From 66d8bbf8e2cc5f5d2bb7bfd7d2f5cc6248fedf12 Mon Sep 17 00:00:00 2001 From: bcmmbaga Date: Wed, 20 Nov 2024 22:45:14 +0300 Subject: [PATCH] Fix database transaction locking issue Signed-off-by: bcmmbaga --- management/server/user.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/management/server/user.go b/management/server/user.go index f16192d14..0ed2be480 100644 --- a/management/server/user.go +++ b/management/server/user.go @@ -711,7 +711,7 @@ func (am *DefaultAccountManager) SaveOrAddUsers(ctx context.Context, accountID, updateAccountPeers = true } - updatedUserInfo, err := getUserInfo(ctx, am, updatedUser, accountID) + updatedUserInfo, err := am.getUserInfo(ctx, transaction, updatedUser, accountID) if err != nil { return fmt.Errorf("failed to get user info: %w", err) } @@ -891,8 +891,8 @@ func handleOwnerRoleTransfer(ctx context.Context, transaction Store, initiatorUs // getUserInfo retrieves the UserInfo for a given User and Account. // If the AccountManager has a non-nil idpManager and the User is not a service user, // it will attempt to look up the UserData from the cache. -func getUserInfo(ctx context.Context, am *DefaultAccountManager, user *User, accountID string) (*UserInfo, error) { - settings, err := am.Store.GetAccountSettings(ctx, LockingStrengthShare, accountID) +func (am *DefaultAccountManager) getUserInfo(ctx context.Context, transaction Store, user *User, accountID string) (*UserInfo, error) { + settings, err := transaction.GetAccountSettings(ctx, LockingStrengthShare, accountID) if err != nil { return nil, err }