extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-05-01 23:04:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

use "ok" convention for check variables throughout files_store

Browse Source
This commit is contained in:
Pascal Fischer 2023-03-21 14:00:59 +01:00
parent 311b67fe5a
commit 82af60838e
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
management/server/file_store.go
View File

@ -313,8 +313,8 @@ func (s *FileStore) GetAccountByPrivateDomain(domain string) (*Account, error) {
s.mux.Lock() s.mux.Lock()
defer s.mux.Unlock() defer s.mux.Unlock()
accountID, accountIDFound := s.PrivateDomain2AccountID[strings.ToLower(domain)] accountID, ok := s.PrivateDomain2AccountID[strings.ToLower(domain)]
if !accountIDFound { if !ok {
return nil, status.Errorf(status.NotFound, "account not found: provided domain is not registered or is not private") return nil, status.Errorf(status.NotFound, "account not found: provided domain is not registered or is not private")
} }
@ -331,8 +331,8 @@ func (s *FileStore) GetAccountBySetupKey(setupKey string) (*Account, error) {
s.mux.Lock() s.mux.Lock()
defer s.mux.Unlock() defer s.mux.Unlock()
accountID, accountIDFound := s.SetupKeyID2AccountID[strings.ToUpper(setupKey)] accountID, ok := s.SetupKeyID2AccountID[strings.ToUpper(setupKey)]
if !accountIDFound { if !ok {
return nil, status.Errorf(status.NotFound, "account not found: provided setup key doesn't exists") return nil, status.Errorf(status.NotFound, "account not found: provided setup key doesn't exists")
} }
@ -349,8 +349,8 @@ func (s *FileStore) GetTokenIDByHashedToken(token string) (string, error) {
s.mux.Lock() s.mux.Lock()
defer s.mux.Unlock() defer s.mux.Unlock()
tokenID, tokenIDFound := s.HashedPAT2TokenID[token] tokenID, ok := s.HashedPAT2TokenID[token]
if !tokenIDFound { if !ok {
return "", status.Errorf(status.NotFound, "tokenID not found: provided token doesn't exists") return "", status.Errorf(status.NotFound, "tokenID not found: provided token doesn't exists")
} }
@ -362,13 +362,13 @@ func (s *FileStore) GetUserByTokenID(tokenID string) (*User, error) {
s.mux.Lock() s.mux.Lock()
defer s.mux.Unlock() defer s.mux.Unlock()
userID, userIDFound := s.TokenID2UserID[tokenID] userID, ok := s.TokenID2UserID[tokenID]
if !userIDFound { if !ok {
return nil, status.Errorf(status.NotFound, "user not found: provided tokenID doesn't exists") return nil, status.Errorf(status.NotFound, "user not found: provided tokenID doesn't exists")
} }
accountID, accountIDFound := s.UserID2AccountID[userID] accountID, ok := s.UserID2AccountID[userID]
if !accountIDFound { if !ok {
return nil, status.Errorf(status.NotFound, "accountID not found: provided userID doesn't exists") return nil, status.Errorf(status.NotFound, "accountID not found: provided userID doesn't exists")
} }
@ -393,8 +393,8 @@ func (s *FileStore) GetAllAccounts() (all []*Account) {
// getAccount returns a reference to the Account. Should not return a copy. // getAccount returns a reference to the Account. Should not return a copy.
func (s *FileStore) getAccount(accountID string) (*Account, error) { func (s *FileStore) getAccount(accountID string) (*Account, error) {
account, accountFound := s.Accounts[accountID] account, ok := s.Accounts[accountID]
if !accountFound { if !ok {
return nil, status.Errorf(status.NotFound, "account not found") return nil, status.Errorf(status.NotFound, "account not found")
} }
@ -419,8 +419,8 @@ func (s *FileStore) GetAccountByUser(userID string) (*Account, error) {
s.mux.Lock() s.mux.Lock()
defer s.mux.Unlock() defer s.mux.Unlock()
accountID, accountIDFound := s.UserID2AccountID[userID] accountID, ok := s.UserID2AccountID[userID]
if !accountIDFound { if !ok {
return nil, status.Errorf(status.NotFound, "account not found") return nil, status.Errorf(status.NotFound, "account not found")
} }
@ -437,8 +437,8 @@ func (s *FileStore) GetAccountByPeerID(peerID string) (*Account, error) {
s.mux.Lock() s.mux.Lock()
defer s.mux.Unlock() defer s.mux.Unlock()
accountID, accountIDFound := s.PeerID2AccountID[peerID] accountID, ok := s.PeerID2AccountID[peerID]
if !accountIDFound { if !ok {
return nil, status.Errorf(status.NotFound, "provided peer ID doesn't exists %s", peerID) return nil, status.Errorf(status.NotFound, "provided peer ID doesn't exists %s", peerID)
} }
@ -463,8 +463,8 @@ func (s *FileStore) GetAccountByPeerPubKey(peerKey string) (*Account, error) {
s.mux.Lock() s.mux.Lock()
defer s.mux.Unlock() defer s.mux.Unlock()
accountID, accountIDFound := s.PeerKeyID2AccountID[peerKey] accountID, ok := s.PeerKeyID2AccountID[peerKey]
if !accountIDFound { if !ok {
return nil, status.Errorf(status.NotFound, "provided peer key doesn't exists %s", peerKey) return nil, status.Errorf(status.NotFound, "provided peer key doesn't exists %s", peerKey)
} }