Remove unused custom error and refactor unset account id into constant

netbirdio · Oct 1, 2023 · cc215ac · cc215ac
1 parent e04fb2e
commit cc215ac
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 21 deletions.
diff --git a/management/server/idp/authentik.go b/management/server/idp/authentik.go
@@ -312,9 +312,7 @@ func (am *AuthentikManager) GetAllAccounts() (map[string][]*UserData, error) {
 	indexedUsers := make(map[string][]*UserData)
 	for _, user := range userList.Results {
 		userData := parseAuthentikUser(user)
-
-		accountID := "unset"
-		indexedUsers[accountID] = append(indexedUsers[accountID], userData)
+		indexedUsers[unsetAccountID] = append(indexedUsers[unsetAccountID], userData)
 	}
 
 	return indexedUsers, nil

diff --git a/management/server/idp/azure.go b/management/server/idp/azure.go
@@ -319,9 +319,7 @@ func (am *AzureManager) GetAllAccounts() (map[string][]*UserData, error) {
 	indexedUsers := make(map[string][]*UserData)
 	for _, profile := range profiles.Value {
 		userData := profile.userData()
-
-		accountID := "unset"
-		indexedUsers[accountID] = append(indexedUsers[accountID], userData)
+		indexedUsers[unsetAccountID] = append(indexedUsers[unsetAccountID], userData)
 	}
 
 	return indexedUsers, nil

diff --git a/management/server/idp/google_workspace.go b/management/server/idp/google_workspace.go
@@ -143,8 +143,8 @@ func (gm *GoogleWorkspaceManager) GetAllAccounts() (map[string][]*UserData, erro
 
 	indexedUsers := make(map[string][]*UserData)
 	for _, user := range usersList.Users {
-		accountID := "unset"
-		indexedUsers[accountID] = append(indexedUsers[accountID], parseGoogleWorkspaceUser(user))
+		userData := parseGoogleWorkspaceUser(user)
+		indexedUsers[unsetAccountID] = append(indexedUsers[unsetAccountID], userData)
 	}
 
 	return indexedUsers, nil

diff --git a/management/server/idp/idp.go b/management/server/idp/idp.go
@@ -9,13 +9,9 @@ import (
 	"github.com/netbirdio/netbird/management/server/telemetry"
 )
 
-type Error struct {
-	message string
-}
-
-func (e *Error) Error() string {
-	return e.message
-}
+const (
+	unsetAccountID = "unset"
+)
 
 // Manager idp manager interface
 type Manager interface {

diff --git a/management/server/idp/keycloak.go b/management/server/idp/keycloak.go
@@ -295,8 +295,8 @@ func (km *KeycloakManager) GetAllAccounts() (map[string][]*UserData, error) {
 
 	indexedUsers := make(map[string][]*UserData)
 	for _, profile := range profiles {
-		accountID := "unset"
-		indexedUsers[accountID] = append(indexedUsers[accountID], profile.userData())
+		userData := profile.userData()
+		indexedUsers[unsetAccountID] = append(indexedUsers[unsetAccountID], userData)
 	}
 
 	return indexedUsers, nil

diff --git a/management/server/idp/okta.go b/management/server/idp/okta.go
@@ -216,8 +216,7 @@ func (om *OktaManager) GetAllAccounts() (map[string][]*UserData, error) {
 			return nil, err
 		}
 
-		accountID := "unset"
-		indexedUsers[accountID] = append(indexedUsers[accountID], userData)
+		indexedUsers[unsetAccountID] = append(indexedUsers[unsetAccountID], userData)
 	}
 
 	return indexedUsers, nil

diff --git a/management/server/idp/zitadel.go b/management/server/idp/zitadel.go
@@ -341,8 +341,8 @@ func (zm *ZitadelManager) GetAllAccounts() (map[string][]*UserData, error) {
 
 	indexedUsers := make(map[string][]*UserData)
 	for _, profile := range profiles.Result {
-		accountID := "unset"
-		indexedUsers[accountID] = append(indexedUsers[accountID], profile.userData())
+		userData := profile.userData()
+		indexedUsers[unsetAccountID] = append(indexedUsers[unsetAccountID], userData)
 	}
 
 	return indexedUsers, nil