carddav: expose supported address data in client

carddav/carddav.go

@@ -9,11 +9,29 @@ import (
 	"github.com/emersion/go-vcard"
 )
 
+type AddressDataType struct {
+	ContentType string
+	Version     string
+}
+
 type AddressBook struct {
-	Path            string
+	Path                 string
-	Name            string
+	Name                 string
-	Description     string
+	Description          string
-	MaxResourceSize int64
+	MaxResourceSize      int64
+	SupportedAddressData []AddressDataType
+}
+
+func (ab *AddressBook) SupportsAddressData(contentType, version string) bool {
+	if len(ab.SupportedAddressData) == 0 {
+		return contentType == "text/vcard" && version == "3.0"
+	}
+	for _, t := range ab.SupportedAddressData {
+		if t.ContentType == contentType && t.Version == version {
+			return true
+		}
+	}
+	return false
 }
 
 type AddressBookQuery struct {

carddav/client.go

@@ -94,12 +94,21 @@ func (c *Client) FindAddressBookHomeSet(principal string) (string, error) {
 	return prop.Href.Path, nil
 }
 
+func decodeSupportedAddressData(supported *supportedAddressData) []AddressDataType {
+	l := make([]AddressDataType, len(supported.Types))
+	for i, t := range supported.Types {
+		l[i] = AddressDataType{t.ContentType, t.Version}
+	}
+	return l
+}
+
 func (c *Client) FindAddressBooks(addressBookHomeSet string) ([]AddressBook, error) {
 	propfind := internal.NewPropNamePropfind(
 		internal.ResourceTypeName,
 		internal.DisplayNameName,
 		addressBookDescriptionName,
 		maxResourceSizeName,
+		supportedAddressDataName,
 	)
 	ms, err := c.ic.Propfind(addressBookHomeSet, internal.DepthOne, propfind)
 	if err != nil {
@@ -139,11 +148,17 @@ func (c *Client) FindAddressBooks(addressBookHomeSet string) ([]AddressBook, err
 			return nil, fmt.Errorf("carddav: max-resource-size must be a positive integer")
 		}
 
+		var supported supportedAddressData
+		if err := resp.DecodeProp(&supported); err != nil && !internal.IsNotFound(err) {
+			return nil, err
+		}
+
 		l = append(l, AddressBook{
-			Path:            path,
+			Path:                 path,
-			Name:            dispName.Name,
+			Name:                 dispName.Name,
-			Description:     desc.Description,
+			Description:          desc.Description,
-			MaxResourceSize: maxResSize.Size,
+			MaxResourceSize:      maxResSize.Size,
+			SupportedAddressData: decodeSupportedAddressData(&supported),
 		})
 	}
 

carddav/elements.go

@@ -12,10 +12,10 @@ const namespace = "urn:ietf:params:xml:ns:carddav"
 var (
 	addressBookHomeSetName = xml.Name{namespace, "addressbook-home-set"}
 
-	addressBookName                 = xml.Name{namespace, "addressbook"}
+	addressBookName            = xml.Name{namespace, "addressbook"}
-	addressBookDescriptionName      = xml.Name{namespace, "addressbook-description"}
+	addressBookDescriptionName = xml.Name{namespace, "addressbook-description"}
-	addressBookSupportedAddressData = xml.Name{namespace, "addressbook-supported-address-data"}
+	supportedAddressDataName   = xml.Name{namespace, "supported-address-data"}
-	maxResourceSizeName             = xml.Name{namespace, "max-resource-size"}
+	maxResourceSizeName        = xml.Name{namespace, "max-resource-size"}
 
 	addressBookQueryName    = xml.Name{namespace, "addressbook-query"}
 	addressBookMultigetName = xml.Name{namespace, "addressbook-multiget"}
@@ -35,8 +35,8 @@ type addressbookDescription struct {
 }
 
 // https://tools.ietf.org/html/rfc6352#section-6.2.2
-type addressbookSupportedAddressData struct {
+type supportedAddressData struct {
-	XMLName xml.Name          `xml:"urn:ietf:params:xml:ns:carddav addressbook-supported-address-data"`
+	XMLName xml.Name          `xml:"urn:ietf:params:xml:ns:carddav supported-address-data"`
 	Types   []addressDataType `xml:"address-data-type"`
 }
 

carddav/server.go

@@ -321,8 +321,8 @@ func (b *backend) propfindAddressBook(propfind *internal.Propfind, ab *AddressBo
 		addressBookDescriptionName: func(*internal.RawXMLValue) (interface{}, error) {
 			return &addressbookDescription{Description: ab.Description}, nil
 		},
-		addressBookSupportedAddressData: func(*internal.RawXMLValue) (interface{}, error) {
+		supportedAddressDataName: func(*internal.RawXMLValue) (interface{}, error) {
-			return &addressbookSupportedAddressData{
+			return &supportedAddressData{
 				Types: []addressDataType{
 					{ContentType: vcard.MIMEType, Version: "3.0"},
 					{ContentType: vcard.MIMEType, Version: "4.0"},