extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-08-18 02:50:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix tests

Browse Source 
Signed-off-by: bcmmbaga <bethuelmbaga12@gmail.com>
This commit is contained in:
bcmmbaga
2024-09-25 15:04:57 +03:00
parent b815393180
commit c384874d7d
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
management/server/file_store.go
View File

@@ -635,7 +635,16 @@ func (s *FileStore) GetUserByUserID(_ context.Context, _ LockingStrength, userID
return nil, err return nil, err
} }
return account.Users[userID].Copy(), nil user := account.Users[userID].Copy()
pat := make([]PersonalAccessToken, 0, len(user.PATs))
for _, token := range user.PATs {
if token != nil {
pat = append(pat, *token)
}
}
user.PATsG = pat
return user, nil
} }
func (s *FileStore) GetAccountGroups(ctx context.Context, accountID string) ([]*nbgroup.Group, error) { func (s *FileStore) GetAccountGroups(ctx context.Context, accountID string) ([]*nbgroup.Group, error) {

6
management/server/user_test.go
View File

@@ -199,7 +199,8 @@ func TestUser_GetPAT(t *testing.T) {
defer store.Close(context.Background()) defer store.Close(context.Background())
account := newAccountWithId(context.Background(), mockAccountID, mockUserID, "") account := newAccountWithId(context.Background(), mockAccountID, mockUserID, "")
account.Users[mockUserID] = &User{ account.Users[mockUserID] = &User{
Id: mockUserID, Id: mockUserID,
AccountID: mockAccountID,
PATs: map[string]*PersonalAccessToken{ PATs: map[string]*PersonalAccessToken{
mockTokenID1: { mockTokenID1: {
ID: mockTokenID1, ID: mockTokenID1,
@@ -231,7 +232,8 @@ func TestUser_GetAllPATs(t *testing.T) {
defer store.Close(context.Background()) defer store.Close(context.Background())
account := newAccountWithId(context.Background(), mockAccountID, mockUserID, "") account := newAccountWithId(context.Background(), mockAccountID, mockUserID, "")
account.Users[mockUserID] = &User{ account.Users[mockUserID] = &User{
Id: mockUserID, Id: mockUserID,
AccountID: mockAccountID,
PATs: map[string]*PersonalAccessToken{ PATs: map[string]*PersonalAccessToken{
mockTokenID1: { mockTokenID1: {
ID: mockTokenID1, ID: mockTokenID1,