Try adding contact persons dinamically

.gitignore

@@ -14,3 +14,8 @@
 example/example
 
 .vscode
+/.idea/.gitignore
+/.idea/dbnavigator.xml
+/.idea/modules.xml
+/.idea/spid-go.iml
+/.idea/vcs.xml

spidsaml/go.mod

@@ -3,11 +3,13 @@ module github.com/nicolasvac/spid-go/spidsaml
 go 1.17
 
 require (
-	github.com/beevik/etree v1.0.1
+	github.com/beevik/etree v1.1.0
 	github.com/crewjam/go-xmlsec v0.0.0-20170116132012-1aa2f9374afa
+	github.com/ma314smith/signedxml v0.0.0-20210628192057-abc5b481ae1c
 )
 
 require (
 	github.com/crewjam/errset v0.0.0-20160219153700-f78d65de925c // indirect
-	github.com/ma314smith/signedxml v0.0.0-20210628192057-abc5b481ae1c // indirect
+	github.com/smartystreets/goconvey v1.7.2 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 )

spidsaml/go.sum

@@ -1,8 +1,30 @@
 github.com/beevik/etree v1.0.1 h1:lWzdj5v/Pj1X360EV7bUudox5SRipy4qZLjY0rhb0ck=
 github.com/beevik/etree v1.0.1/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A=
+github.com/beevik/etree v1.1.0 h1:T0xke/WvNtMoCqgzPhkX2r4rjY3GDZFi+FjpRZY2Jbs=
+github.com/beevik/etree v1.1.0/go.mod h1:r8Aw8JqVegEf0w2fDnATrX9VpkMcyFeM0FhwO62wh+A=
 github.com/crewjam/errset v0.0.0-20160219153700-f78d65de925c h1:dCJ9oZ0VgnzJHR5BjkSrwkXA1USu483qlxBd0u29P8s=
 github.com/crewjam/errset v0.0.0-20160219153700-f78d65de925c/go.mod h1:XhiWL7J86xoqJ8+x2OA+AM2l9skQP2DZ0UOXQYVg7uI=
 github.com/crewjam/go-xmlsec v0.0.0-20170116132012-1aa2f9374afa h1:P3H7u0mfn9zEniDEKN50Yos1m60AM2PNOcyrInUjRFM=
 github.com/crewjam/go-xmlsec v0.0.0-20170116132012-1aa2f9374afa/go.mod h1:M9eHnKpImgRwzOFdlFQnbgJRqFwW/eX1cKAVobv03uE=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/ma314smith/signedxml v0.0.0-20210628192057-abc5b481ae1c h1:UPJygtyk491bJJ/DnRJFuzcq9Dl9NSeFrJ7VdiRzMxc=
 github.com/ma314smith/signedxml v0.0.0-20210628192057-abc5b481ae1c/go.mod h1:KEgVcb43+f5KFUH/x6Vd3NROG0AIL2CuKMrIqYsmx6E=
+github.com/smartystreets/assertions v1.2.0 h1:42S6lae5dvLc7BrLu/0ugRtcFVjoJNMC/N3yZFZkDFs=
+github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
+github.com/smartystreets/goconvey v1.7.2 h1:9RBaZCeXEQ3UselpuwUQHltGVXvdwm6cv1hgR6gDIPg=
+github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

spidsaml/spid.go

@@ -8,6 +8,7 @@ import (
 	"encoding/base64"
 	"encoding/pem"
 	"errors"
+	"github.com/beevik/etree"
 	"io/ioutil"
 	"math/big"
 	"text/template"
@@ -37,20 +38,20 @@ type SPOrganization struct {
 	OrganizationURL         string
 }
 
-// SPContactPerson ContactPerson metadata about sp full
+// SPContactPerson ContactPerson metadata
 type SPContactPerson struct {
-	ContactType             string
-	EntityType              string
-	IpaCode                 string
-	VatNumber               string
-	FiscalCode              string
-	Company                 string
-	EmailAddress            string
-	TelephoneNumber         string
-	IsPrivate               bool
-	IsPublic                bool
-	IsPrivateFullAggregator bool
-	IsPublicFullAggregator  bool
+	ContactType     string
+	Company         string
+	EmailAddress    string
+	TelephoneNumber string
+	Extensions      []SPContactPersonExtension
+}
+
+// SPContactPersonExtension extensions for contact person
+type SPContactPersonExtension struct {
+	Tag        string
+	Value      string
+	Extensions []SPContactPersonExtension
 }
 
 // SP represents our Service Provider
@@ -229,37 +230,6 @@ func (sp *SP) Metadata() string {
         <md:OrganizationURL xml:lang="it">{{ .Organization.OrganizationURL }}</md:OrganizationURL>
     </md:Organization>
 
-	{{ range $index, $contact := .ContactPersons }}
-	<md:ContactPerson contactType="{{ $contact.ContactType }}" spid:entityType="{{ $contact.EntityType }}"> 
-		<md:Extensions> 
-			{{ if ne $contact.IpaCode "" }}
-			<spid:IPACode>{{ $contact.IpaCode }}</spid:IPACode>
-			{{ end }}
-			{{ if ne $contact.VatNumber "" }}
-			<spid:VATNumber>{{ $contact.VatNumber }}</spid:VATNumber>
-			{{ end }}
-			{{ if ne $contact.FiscalCode "" }}
-            <spid:FiscalCode>{{ $contact.FiscalCode }}</spid:FiscalCode>
-			{{ end }}
-			{{ if $contact.IsPrivate }}
-            <spid:Private/>
-			{{ end }}
-			{{ if $contact.IsPublic }}
-            <spid:Public/>
-			{{ end }}
-			{{ if $contact.IsPublicFullAggregator }}
-            <spid:PublicServicesFullOperator/>
-			{{ end }}
-			{{ if $contact.IsPrivateFullAggregator }}
-            <spid:PrivateServicesFullAggregator/>
-			{{ end }}
-        </md:Extensions> 
-        <md:Company>{{ $contact.Company }}</md:Company> 
-        <md:EmailAddress>{{ $contact.EmailAddress }}</md:EmailAddress> 
-        <md:TelephoneNumber>{{ $contact.TelephoneNumber }}</md:TelephoneNumber> 
-    </md:ContactPerson>
-	{{ end }}
-
 </md:EntityDescriptor>
 `
 	aux := struct {
@@ -295,5 +265,66 @@ func (sp *SP) Metadata() string {
 		return ""
 	}
 
+	completeXML, err = addContactPersons(completeXML, sp.ContactPersons)
+
+	if err != nil {
+		return ""
+	}
+
 	return completeXML
 }
+
+func addContactPersons(signedXML string, persons []SPContactPerson) (string, error) {
+	xmlDoc := etree.NewDocument()
+
+	if xmlDoc.ReadFromString(signedXML) != nil {
+		return "", nil
+	}
+
+	// Get the basic entity descriptor element
+	entityDescriptor := xmlDoc.FindElement("EntityDescriptor")
+
+	for _, contactPerson := range persons {
+		// Create basic contact person element
+		contactPersonXML := entityDescriptor.CreateElement("md:ContactPerson")
+		// Add the specified contact type
+		contactPersonXML.CreateAttr("contactType", contactPerson.ContactType)
+
+		// Add company data
+		if contactPerson.Company != "" {
+			contactPersonXML.CreateElement("md:Company").CreateText(contactPerson.Company)
+		}
+
+		// Add email address data
+		if contactPerson.EmailAddress != "" {
+			contactPersonXML.CreateElement("md:EmailAddress").CreateText(contactPerson.EmailAddress)
+		}
+
+		// Add telephone number data
+		if contactPerson.TelephoneNumber != "" {
+			contactPersonXML.CreateElement("md:TelephoneNumber").CreateText(contactPerson.TelephoneNumber)
+		}
+
+		// Add extensions data
+		contactPersonExtensionsXML := contactPersonXML.CreateElement("md:Extensions")
+
+		addContactPersonExtensions(contactPersonExtensionsXML, contactPerson.Extensions)
+	}
+
+	return xmlDoc.WriteToString()
+}
+
+func addContactPersonExtensions(xml *etree.Element, extensions []SPContactPersonExtension) {
+
+	for _, extension := range extensions {
+		xmlElement := xml.CreateElement(extension.Tag)
+
+		if extension.Value != "" {
+			xmlElement.CreateText(extension.Value)
+		}
+
+		if len(extension.Extensions) > 0 {
+			addContactPersonExtensions(xmlElement, extension.Extensions)
+		}
+	}
+}