move splituserid

pkg/auth/authtools/tools.go

@@ -0,0 +1,14 @@
+package authtools
+
+import (
+	"fmt"
+	"strings"
+)
+
+func SplitUserId(userId string) (string, string, error) {
+	parts := strings.Split(userId, "@")
+	if len(parts) != 2 {
+		return "", "", fmt.Errorf("invalid userId: %s", userId)
+	}
+	return parts[0], parts[1], nil
+}

pkg/auth/userauth/activedirectory/ad.go

@@ -9,9 +9,9 @@ import (
 	"net"
 	"regexp"
 	"strconv"
-	"strings"
 	"time"
 
+	"github.com/NorskHelsenett/ror/pkg/auth/authtools"
 	identitymodels "github.com/NorskHelsenett/ror/pkg/models/identity"
 	"github.com/NorskHelsenett/ror/pkg/rlog"
 	newhealth "github.com/dotse/go-health"
@@ -149,7 +149,7 @@ func (l *AdClient) search(basedn, filter string, attributes []string) (*ldap.Sea
 
 func (l *AdClient) GetUser(userId string) (*identitymodels.User, error) {
 
-	userpart, domainpart, err := splitUserId(userId)
+	userpart, domainpart, err := authtools.SplitUserId(userId)
 	if err != nil {
 		return nil, err
 	}
@@ -201,14 +201,6 @@ func (l *AdClient) GetUser(userId string) (*identitymodels.User, error) {
 	return &user, nil
 }
 
-func splitUserId(userId string) (string, string, error) {
-	parts := strings.Split(userId, "@")
-	if len(parts) != 2 {
-		return "", "", fmt.Errorf("invalid userId: %s", userId)
-	}
-	return parts[0], parts[1], nil
-}
-
 func checkUserAccountControl(userAccountControl string) error {
 	intuac, err := strconv.ParseUint(userAccountControl, 10, 64)
 	if err != nil {

pkg/auth/userauth/ldaps/openldap.go

@@ -6,8 +6,8 @@ import (
 	"errors"
 	"fmt"
 	"strconv"
-	"strings"
 
+	"github.com/NorskHelsenett/ror/pkg/auth/authtools"
 	identitymodels "github.com/NorskHelsenett/ror/pkg/models/identity"
 	"github.com/NorskHelsenett/ror/pkg/rlog"
 	newhealth "github.com/dotse/go-health"
@@ -110,7 +110,7 @@ func (l *LdapsClient) search(basedn, filter string, attributes []string) (*ldap.
 
 func (l *LdapsClient) GetUser(userId string) (*identitymodels.User, error) {
 
-	_, domainpart, err := splitUserId(userId)
+	_, domainpart, err := authtools.SplitUserId(userId)
 	if err != nil {
 		return nil, err
 	}
@@ -157,14 +157,6 @@ func (l *LdapsClient) GetUser(userId string) (*identitymodels.User, error) {
 	return &user, nil
 }
 
-func splitUserId(userId string) (string, string, error) {
-	parts := strings.Split(userId, "@")
-	if len(parts) != 2 {
-		return "", "", fmt.Errorf("invalid userId: %s", userId)
-	}
-	return parts[0], parts[1], nil
-}
-
 // TODO: Implement
 func (l *LdapsClient) CheckHealth() []newhealth.Check {
 	return []newhealth.Check{

pkg/auth/userauth/msgraph/msgraph.go

@@ -6,6 +6,7 @@ import (
 	"context"
 
 	"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
+	"github.com/NorskHelsenett/ror/pkg/auth/authtools"
 	"github.com/NorskHelsenett/ror/pkg/helpers/kvcachehelper"
 	"github.com/NorskHelsenett/ror/pkg/helpers/kvcachehelper/memorycache"
 	identitymodels "github.com/NorskHelsenett/ror/pkg/models/identity"
@@ -105,7 +106,7 @@ func (g *MsGraphClient) GetUser(userId string) (*identitymodels.User, error) {
 
 func addDomainpartToGroups(groupnames *[]string, userId string) {
 
-	_, domain, err := splitUserId(userId)
+	_, domain, err := authtools.SplitUserId(userId)
 	if err != nil {
 		domain = ""
 	}

pkg/auth/userauth/userauth.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"strconv"
-	"strings"
 
+	"github.com/NorskHelsenett/ror/pkg/auth/authtools"
 	"github.com/NorskHelsenett/ror/pkg/auth/userauth/activedirectory"
 	"github.com/NorskHelsenett/ror/pkg/auth/userauth/ldaps"
 	"github.com/NorskHelsenett/ror/pkg/auth/userauth/msgraph"
@@ -35,7 +35,7 @@ type DomainResolvers struct {
 }
 
 func (d DomainResolvers) GetUser(userId string) (*identitymodels.User, error) {
-	domain, _, err := splitUserId(userId)
+	_, domain, err := authtools.SplitUserId(userId)
 	if err != nil {
 		return nil, err
 	}
@@ -69,14 +69,6 @@ func (d DomainResolvers) RegisterHealthChecks() {
 	}
 }
 
-func splitUserId(userId string) (string, string, error) {
-	parts := strings.Split(userId, "@")
-	if len(parts) != 2 {
-		return "", "", fmt.Errorf("invalid userId: %s", userId)
-	}
-	return parts[1], parts[0], nil
-}
-
 func NewDomainResolversFromJson(jsonBytes []byte) (*DomainResolvers, error) {
 	var domainResolverConfigs DomainResolverConfigs
 	var domainResolvers *DomainResolvers = &DomainResolvers{}