reconstruct the graph url and update tests

Author: abbyck

provider_azure.go

@@ -28,6 +28,9 @@ const (
 	microsoftGraphUSHost     = "graph.microsoft.us"
 	microsoftGraphAPIVersion = "/v1.0"
 
+	// Microsoft Graph API paths for group membership information
+	getMemberObjectsPath = "/me/getMemberObjects"
+
 	// Distributed claim fields
 	claimNamesField   = "_claim_names"
 	claimSourcesField = "_claim_sources"
@@ -70,10 +73,11 @@ func (a *AzureProvider) FetchGroups(_ context.Context, b *jwtAuthBackend, allCla
 		if err != nil {
 			return nil, fmt.Errorf("unable to create CA Context: %s", err)
 		}
-		groups, err := a.getAzureGroups(a.buildGraphEndpoint("me/getMemberObjects"), tokenSource)
+		groups, err := a.getAzureGroups(fmt.Sprintf("https://%s%s%s", microsoftGraphHost, microsoftGraphAPIVersion, getMemberObjectsPath), tokenSource)
 		if err != nil {
 			return nil, fmt.Errorf("unable to fetch groups from Microsoft Graph API: %s", err)
 		}
+		b.Logger().Debug(fmt.Sprintf("groups from Microsoft Graph API: %v", groups))
 		return groups, nil
 	}
 
@@ -158,11 +162,6 @@ func (a *AzureProvider) getClaimSource(logger log.Logger, allClaims map[string]i
 	return urlParsed.String(), nil
 }
 
-// buildGraphEndpoint constructs a Microsoft Graph API endpoint URL
-func (a *AzureProvider) buildGraphEndpoint(path string) string {
-	return fmt.Sprintf("https://%s%s/%s", microsoftGraphHost, microsoftGraphAPIVersion, path)
-}
-
 // Fetch user groups from the Microsoft Graph API
 func (a *AzureProvider) getAzureGroups(groupsURL string, tokenSource oauth2.TokenSource) (interface{}, error) {
 	urlParsed, err := url.Parse(groupsURL)

provider_azure_test.go

@@ -441,39 +441,6 @@ func TestAzureProvider_Initialize(t *testing.T) {
 	})
 }
 
-func TestAzureProvider_BuildGraphEndpoint(t *testing.T) {
-	a := &AzureProvider{}
-
-	tests := []struct {
-		name     string
-		path     string
-		expected string
-	}{
-		{
-			name:     "getMemberObjects endpoint",
-			path:     "me/getMemberObjects",
-			expected: "https://graph.microsoft.com/v1.0/me/getMemberObjects",
-		},
-		{
-			name:     "memberOf endpoint",
-			path:     "me/memberOf",
-			expected: "https://graph.microsoft.com/v1.0/me/memberOf",
-		},
-		{
-			name:     "transitiveMemberOf endpoint",
-			path:     "me/transitiveMemberOf",
-			expected: "https://graph.microsoft.com/v1.0/me/transitiveMemberOf",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			result := a.buildGraphEndpoint(tt.path)
-			assert.Equal(t, tt.expected, result)
-		})
-	}
-}
-
 func Test_getClaimSources(t *testing.T) {
 	t.Run("normal case", func(t *testing.T) {
 		a := &AzureProvider{}