sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-07-19 15:01:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

do not use user group add

Browse Source
This commit is contained in:
pascal
2026-01-09 01:55:18 +01:00
parent 71d98940dc
commit e33e5673c5
2 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
management/server/account.go
View File

@@ -1402,22 +1402,7 @@ func (am *DefaultAccountManager) SyncUserJWTGroups(ctx context.Context, userAuth
return fmt.Errorf("error saving groups: %w", err)
}
addNewGroups = util.Difference(updatedAutoGroups, user.AutoGroups)
for _, group := range addNewGroups {
err = transaction.AddUserToGroup(ctx, userAuth.AccountId, user.Id, group)
if err != nil {
return fmt.Errorf("error adding user to group: %w", err)
}
}
removeOldGroups = util.Difference(user.AutoGroups, updatedAutoGroups)
for _, group := range removeOldGroups {
err = transaction.RemoveUserFromGroup(ctx, user.Id, group)
if err != nil {
return fmt.Errorf("error removing user from group: %w", err)
}
}
user.AutoGroups = updatedAutoGroups
if err = transaction.SaveUser(ctx, user); err != nil {
return fmt.Errorf("error saving user: %w", err)
}

2
management/server/store/sql_store.go
View File

@@ -511,7 +511,7 @@ func (s *SqlStore) SaveUser(ctx context.Context, user *types.User) error {
return status.Errorf(status.Internal, "failed to delete user groups from store: %v", result.Error)
}
if len(user.Groups) != 0 {
if len(userCopy.Groups) != 0 {
result = tx.Save(userCopy.Groups)
if result.Error != nil {
return status.Errorf(status.Internal, "failed to save user groups to store: %v", result.Error)