Merge pull request #21 from zitadel/metadata-http-client

fix(saml): add http client to metadata call for testing
zitadel · Aug 31, 2022 · 902acc6 · 902acc6
2 parents 325db04 + 69b0bf7
commit 902acc6
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 49 deletions.
diff --git a/pkg/provider/serviceprovider/serviceprovider.go b/pkg/provider/serviceprovider/serviceprovider.go
@@ -15,13 +15,11 @@ import (
 
 type Config struct {
 	Metadata []byte
-	URL      string
 }
 
 type ServiceProvider struct {
 	ID              string
 	Metadata        *md.EntityDescriptorType
-	url             string
 	signerPublicKey interface{}
 	defaultLoginURL string
 }
@@ -35,17 +33,7 @@ func (sp *ServiceProvider) LoginURL(id string) string {
 }
 
 func NewServiceProvider(id string, config *Config, defaultLoginURL string) (*ServiceProvider, error) {
-	metadataData := make([]byte, 0)
-	if config.URL != "" {
-		body, err := xml.ReadMetadataFromURL(config.URL)
-		if err != nil {
-			return nil, err
-		}
-		metadataData = body
-	} else {
-		metadataData = config.Metadata
-	}
-	metadata, err := xml.ParseMetadataXmlIntoStruct(metadataData)
+	metadata, err := xml.ParseMetadataXmlIntoStruct(config.Metadata)
 	if err != nil {
 		return nil, err
 	}
@@ -65,7 +53,6 @@ func NewServiceProvider(id string, config *Config, defaultLoginURL string) (*Ser
 	return &ServiceProvider{
 		ID:              id,
 		Metadata:        metadata,
-		url:             config.URL,
 		signerPublicKey: signerPublicKey,
 		defaultLoginURL: defaultLoginURL,
 	}, nil

diff --git a/pkg/provider/xml/metadata.go b/pkg/provider/xml/metadata.go
@@ -9,8 +9,8 @@ import (
 	"github.com/zitadel/saml/pkg/provider/xml/md"
 )
 
-func ReadMetadataFromURL(url string) ([]byte, error) {
-	resp, err := http.Get(url)
+func ReadMetadataFromURL(client *http.Client, url string) ([]byte, error) {
+	resp, err := client.Get(url)
 	if err != nil {
 		return nil, err
 	}