sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-22 02:06:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge

Browse Source 
Signed-off-by: bcmmbaga <bethuelmbaga12@gmail.com>
This commit is contained in:
bcmmbaga
2025-08-12 13:33:46 +03:00
parent 9deff6f06b
commit 2b86463e96
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
management/server/account.go
View File

@@ -581,7 +581,7 @@ func (am *DefaultAccountManager) newAccount(ctx context.Context, userID, domain
continue
}
newAccount := newAccountWithId(ctx, accountId, userID, domain)
newAccount := newAccountWithId(ctx, accountId, userID, domain, am.disableDefaultPolicy)
am.StoreEvent(ctx, userID, newAccount.Id, accountId, activity.AccountCreated, nil)
return newAccount, nil
}
@@ -1148,7 +1148,7 @@ func (am *DefaultAccountManager) addNewUserToDomainAccount(ctx context.Context,
if sErr, ok := status.FromError(err); ok && sErr.Type() == status.NotFound {
newUser := types.NewRegularUser(userAuth.UserId)
newUser.AccountID = domainAccountID
err = am.Store.SaveUser(ctx, store.LockingStrengthUpdate, newUser)
err = am.Store.SaveUser(ctx, newUser)
if err != nil {
return "", err
}