sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-19 08:46:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor new account handling

Browse Source 
Signed-off-by: bcmmbaga <bethuelmbaga12@gmail.com>
This commit is contained in:
bcmmbaga
2024-11-25 17:43:39 +03:00
parent e17d8127e3
commit 71af7edd05
5 changed files with 164 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
management/server/sql_store.go
View File

@@ -332,24 +332,27 @@ func (s *SqlStore) SavePeer(ctx context.Context, lockStrength LockingStrength, a
return nil
}
func (s *SqlStore) UpdateAccountDomainAttributes(ctx context.Context, accountID string, domain string, category string, isPrimaryDomain bool) error {
func (s *SqlStore) UpdateAccountDomainAttributes(ctx context.Context, lockStrength LockingStrength, accountID string, domain string, category string, isPrimaryDomain *bool) error {
accountCopy := Account{
Domain: domain,
DomainCategory: category,
IsDomainPrimaryAccount: isPrimaryDomain,
Domain: domain,
DomainCategory: category,
}
fieldsToUpdate := []string{"domain", "domain_category", "is_domain_primary_account"}
result := s.db.Model(&Account{}).
Select(fieldsToUpdate).
Where(idQueryCondition, accountID).
Updates(&accountCopy)
fieldsToUpdate := []string{"domain", "domain_category"}
if isPrimaryDomain != nil {
accountCopy.IsDomainPrimaryAccount = *isPrimaryDomain
fieldsToUpdate = append(fieldsToUpdate, "is_domain_primary_account")
}
result := s.db.Clauses(clause.Locking{Strength: string(lockStrength)}).Model(&Account{}).Select(fieldsToUpdate).
Where(idQueryCondition, accountID).Updates(&accountCopy)
if result.Error != nil {
return result.Error
log.WithContext(ctx).Errorf("failed to update account domain attributes in store: %v", result.Error)
return status.Errorf(status.Internal, "failed to update account domain attributes in store")
}
if result.RowsAffected == 0 {
return status.Errorf(status.NotFound, "account %s", accountID)
return status.NewAccountNotFoundError(accountID)
}
return nil
@@ -1728,6 +1731,15 @@ func (s *SqlStore) SaveAccountSettings(ctx context.Context, lockStrength Locking
return nil
}
func (s *SqlStore) CreateAccount(ctx context.Context, lockStrength LockingStrength, account *Account) error {
result := s.db.Clauses(clause.Locking{Strength: string(lockStrength)}).Create(&account)
if result.Error != nil {
log.WithContext(ctx).Errorf("failed to save new account in store: %v", result.Error)
return status.Errorf(status.Internal, "failed to save new account in store")
}
return nil
}
// GetPATByHashedToken returns a PersonalAccessToken by its hashed token.
func (s *SqlStore) GetPATByHashedToken(ctx context.Context, lockStrength LockingStrength, hashedToken string) (*PersonalAccessToken, error) {
var pat PersonalAccessToken