protonmail: Fetch user addresses using new API.

This commit is contained in:
Brandon McDonnell 2018-10-20 13:28:02 +00:00
parent 35f64bc7ef
commit ba4caffa08
2 changed files with 19 additions and 3 deletions

View File

@ -31,6 +31,7 @@ type Address struct {
Receive int Receive int
Status AddressStatus Status AddressStatus
Type AddressType Type AddressType
Order int
DisplayName string DisplayName string
Signature string // HTML Signature string // HTML
HasKeys int HasKeys int

View File

@ -70,13 +70,28 @@ func (c *Client) GetCurrentUser() (*User, error) {
return nil, err return nil, err
} }
var respData struct { var userData struct {
resp resp
User *User User *User
} }
if err := c.doJSON(req, &respData); err != nil { if err := c.doJSON(req, &userData); err != nil {
return nil, err return nil, err
} }
return respData.User, nil req2, err := c.newRequest(http.MethodGet, "/addresses", nil)
if err != nil {
return nil, err
}
var addrData struct {
resp
Addresses []*Address
}
if err := c.doJSON(req2, &addrData); err != nil {
return nil, err
}
userData.User.Addresses = addrData.Addresses
return userData.User, nil
} }